feat: add support for mouse move with modifier keys

socsieng · Jan 1, 2021 · 7f4c891 · 7f4c891
1 parent 1654fd7
commit 7f4c891
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/Sources/SendKeysLib/Commands/CommandExecutor.swift b/Sources/SendKeysLib/Commands/CommandExecutor.swift
@@ -47,23 +47,25 @@ public class CommandExecutor: CommandExecutorProtocol {
         let x2 = Double(command.arguments[2]!)!
         let y2 = Double(command.arguments[3]!)!
         let duration: TimeInterval = Double(command.arguments[4]!)!
+        let modifiers = command.arguments[5]
 
         mouseController.move(
             start: CGPoint(x: x1, y: y1),
             end: CGPoint(x: x2, y: y2),
-            duration: duration
+            duration: duration,
+            flags: modifiers != nil ? try! KeyPresser.getModifierFlags(modifiers!.components(separatedBy: ",")) : []
         )
     }
 
     private func executeMouseClick(_ command: Command) {
         let button = command.arguments[0]!
-        let modifiers = command.arguments[1] ?? ""
+        let modifiers = command.arguments[1]
         let clicks = Int(command.arguments[2]!)!
 
         try! mouseController.click(
             CGPoint(x: -1, y: -1),
             button: getMouseButton(button: button),
-            flags: KeyPresser.getModifierFlags(modifiers.components(separatedBy: ",")),
+            flags: modifiers != nil ? try! KeyPresser.getModifierFlags(modifiers!.components(separatedBy: ",")) : [],
             clickCount: clicks
         )
     }

diff --git a/Sources/SendKeysLib/Commands/MouseMoveCommandMatcher.swift b/Sources/SendKeysLib/Commands/MouseMoveCommandMatcher.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public class MouseMoveCommandMatcher: CommandMatcher {
     public init() {
-        super.init(try! NSRegularExpression(pattern: "\\<m:((\\d+),(\\d+),)?(\\d+),(\\d+)(:([\\d.]+))?\\>"))
+        super.init(try! NSRegularExpression(pattern: "\\<m:((\\d+),(\\d+),)?(\\d+),(\\d+)(:([\\d.]+))?(:([a-z,]+))?\\>"))
     }
 
     override public func createCommand(_ arguments: [String?]) -> Command {
@@ -11,13 +11,15 @@ public class MouseMoveCommandMatcher: CommandMatcher {
         let x2 = arguments[4]
         let y2 = arguments[5]
         let duration = arguments[7]
-
+        let modifiers = arguments[9]
+
         return Command(.mouseMove, [
             x1 ?? "-1",
             y1 ?? "-1",
             x2!,
             y2!,
-            duration ?? "0"
+            duration ?? "0",
+            modifiers
         ])
     }
 }
diff --git a/Sources/SendKeysLib/MouseController.swift b/Sources/SendKeysLib/MouseController.swift
@@ -8,15 +8,15 @@ class MouseController {
 
     let animationRefreshInterval: TimeInterval = 0.01
 
-    func move(start: CGPoint, end: CGPoint, duration: TimeInterval) {
+    func move(start: CGPoint, end: CGPoint, duration: TimeInterval, flags: CGEventFlags) {
         let resolvedStart = resolveLocation(start)
 
         let animator = Animator(duration, animationRefreshInterval, { progress in
             let location = CGPoint(
                 x: (Double(end.x - resolvedStart.x) * progress) + Double(resolvedStart.x),
                 y: (Double(end.y - resolvedStart.y) * progress) + Double(resolvedStart.y)
             )
-            self.setLocation(location)
+            self.setLocation(location, flags: flags)
         })
 
         animator.animate()
@@ -107,8 +107,9 @@ class MouseController {
         return event?.location
     }
 
-    private func setLocation(_ location: CGPoint, moveType: CGEventType = CGEventType.mouseMoved, button: CGMouseButton = CGMouseButton.left) {
+    private func setLocation(_ location: CGPoint, moveType: CGEventType = CGEventType.mouseMoved, button: CGMouseButton = CGMouseButton.left, flags: CGEventFlags = []) {
         let moveEvent = CGEvent(mouseEventSource: nil, mouseType: moveType, mouseCursorPosition: location, mouseButton: button)
+        moveEvent?.flags = flags
         moveEvent?.post(tap: CGEventTapLocation.cghidEventTap)
     }
 

diff --git a/Tests/SendKeysTests/CommandIteratorTests.swift b/Tests/SendKeysTests/CommandIteratorTests.swift
@@ -105,7 +105,16 @@ final class CommandIteratorTests: XCTestCase {
         XCTAssertEqual(
             commands,
             [
-                Command(CommandType.mouseMove, ["1", "2", "3", "4", "0"])
+                Command(CommandType.mouseMove, ["1", "2", "3", "4", "0", nil])
+            ])
+    }
+
+    func testParsesMouseMoveWithModifier() throws {
+        let commands = getCommands(CommandsIterator("<m:1,2,3,4:command>"))
+        XCTAssertEqual(
+            commands,
+            [
+                Command(CommandType.mouseMove, ["1", "2", "3", "4", "0", "command"])
             ])
     }
 
@@ -114,7 +123,16 @@ final class CommandIteratorTests: XCTestCase {
         XCTAssertEqual(
             commands,
             [
-                Command(CommandType.mouseMove, ["1", "2", "3", "4", "0.1"])
+                Command(CommandType.mouseMove, ["1", "2", "3", "4", "0.1", nil])
+            ])
+    }
+
+    func testParsesMouseMoveWithDurationAndModifiers() throws {
+        let commands = getCommands(CommandsIterator("<m:1,2,3,4:0.1:shift,command>"))
+        XCTAssertEqual(
+            commands,
+            [
+                Command(CommandType.mouseMove, ["1", "2", "3", "4", "0.1", "shift,command"])
             ])
     }
 
@@ -123,7 +141,7 @@ final class CommandIteratorTests: XCTestCase {
         XCTAssertEqual(
             commands,
             [
-                Command(CommandType.mouseMove, ["-1", "-1", "3", "4", "0"])
+                Command(CommandType.mouseMove, ["-1", "-1", "3", "4", "0", nil])
             ])
     }
 
@@ -132,7 +150,7 @@ final class CommandIteratorTests: XCTestCase {
         XCTAssertEqual(
             commands,
             [
-                Command(CommandType.mouseMove, ["-1", "-1", "3", "4", "2"])
+                Command(CommandType.mouseMove, ["-1", "-1", "3", "4", "2", nil])
             ])
     }
 

diff --git a/Tests/SendKeysTests/CommandsProcessorTests.swift b/Tests/SendKeysTests/CommandsProcessorTests.swift
@@ -126,9 +126,9 @@ final class CommandProcessorTests: XCTestCase {
         let commands = commandExecutor!.commands
 
         XCTAssertEqual(commands, [
-            Command(.mouseMove, ["-1", "-1", "20", "20", "1"]),
+            Command(.mouseMove, ["-1", "-1", "20", "20", "1", nil]),
             Command(.pause, ["0.1"]),
-            Command(.mouseMove, ["-1", "-1", "200", "200", "1"]),
+            Command(.mouseMove, ["-1", "-1", "200", "200", "1", nil]),
             Command(.pause, ["0.1"]),
             Command(.mouseClick, ["left", nil, "1"]),
         ])