fix: support negative values for mouse click and drag events

Fixes #23
socsieng · Jan 6, 2021 · f50209a · f50209a
1 parent 3893313
commit f50209a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/Sources/SendKeysLib/Commands/MouseDragCommand.swift b/Sources/SendKeysLib/Commands/MouseDragCommand.swift
@@ -3,7 +3,7 @@ import Foundation
 public class MouseDragCommand: MouseMoveCommand {
     public override class var commandType: CommandType { return .mouseDrag }
 
-    private static let _expression = try! NSRegularExpression(pattern: "\\<d:((\\d+),(\\d+),)?(\\d+),(\\d+)(:([\\d.]+))?(:([a-z]+))?(:([a-z,]+))?\\>")
+    private static let _expression = try! NSRegularExpression(pattern: "\\<d:((-?\\d+),(-?\\d+),)?(-?\\d+),(-?\\d+)(:([\\d.]+))?(:([a-z]+))?(:([a-z,]+))?\\>")
     public override class var expression: NSRegularExpression { return _expression }
 
     public init(x1: Int?, y1: Int?, x2: Int, y2: Int, duration: TimeInterval, button: String?, modifiers: [String]) {

diff --git a/Sources/SendKeysLib/Commands/MouseMoveCommand.swift b/Sources/SendKeysLib/Commands/MouseMoveCommand.swift
@@ -3,7 +3,7 @@ import Foundation
 public class MouseMoveCommand: MouseClickCommand {
     public override class var commandType: CommandType { return .mouseMove }
 
-    private static let _expression = try! NSRegularExpression(pattern: "\\<m:((\\d+),(\\d+),)?(\\d+),(\\d+)(:([\\d.]+))?(:([a-z,]+))?\\>")
+    private static let _expression = try! NSRegularExpression(pattern: "\\<m:((-?\\d+),(-?\\d+),)?(-?\\d+),(-?\\d+)(:([\\d.]+))?(:([a-z,]+))?\\>")
     public override class var expression: NSRegularExpression { return _expression }
 
     var x1: Int?

diff --git a/Tests/SendKeysTests/CommandIteratorTests.swift b/Tests/SendKeysTests/CommandIteratorTests.swift
@@ -199,6 +199,15 @@ final class CommandIteratorTests: XCTestCase {
             ])
     }
 
+    func testParsesMouseMoveWithNegativeCoordinates() throws {
+        let commands = getCommands(CommandsIterator("<m:-1,-2,-3,-4:0.1>"))
+        XCTAssertEqual(
+            commands,
+            [
+                MouseMoveCommand(x1: -1, y1: -2, x2: -3, y2: -4, duration: 0.1, modifiers: [])
+            ])
+    }
+
     func testParsesMouseMoveWithDurationAndModifiers() throws {
         let commands = getCommands(CommandsIterator("<m:1,2,3,4:0.1:shift,command>"))
         XCTAssertEqual(
@@ -298,6 +307,15 @@ final class CommandIteratorTests: XCTestCase {
             ])
     }
 
+    func testParsesMouseDragWithDurationWithNegativeCoordinates() throws {
+        let commands = getCommands(CommandsIterator("<d:-1,-2,-3,-4:0.1>"))
+        XCTAssertEqual(
+            commands,
+            [
+                MouseDragCommand(x1: -1, y1: -2, x2: -3, y2: -4, duration: 0.1, button: "left", modifiers: [])
+            ])
+    }
+
     func testParsesMouseDragWithDurationAndButton() throws {
         let commands = getCommands(CommandsIterator("<d:1,2,3,4:0.1:right>"))
         XCTAssertEqual(