fix daemon mouse mode

spyoungtech · Aug 21, 2021 · c0947cd · c0947cd
1 parent 689df64
commit c0947cd
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 10 deletions.
diff --git a/ahk/templates/_daemon.ahk b/ahk/templates/_daemon.ahk
@@ -83,9 +83,9 @@ MouseMove(ByRef command) {
 
 CoordMode(ByRef command) {
     if (command.Length() = 2) {
-        CoordMode, command[2]
+        CoordMode,% command[2]
     } else {
-        CoordMode, command[2], command[3]
+        CoordMode,% command[2],% command[3]
     }
 }
 
@@ -148,7 +148,7 @@ KeyWait(ByRef command) {
 }
 
 SetKeyDelay(ByRef command) {
-    SetKeyDelay, command[2]
+    SetKeyDelay, command[2], command[3]
 }
 
 Join(sep, params*) {
@@ -374,6 +374,15 @@ WindowList(ByRef command) {
 }
 
 WinSend(ByRef command) {
+    title := command[2]
+    command.RemoveAt(1)
+    command.RemoveAt(1)
+    str := Join(",", command*)
+    keys := Unescape(str)
+    ControlSend,,% keys, %title%
+}
+
+WinSendRaw(ByRef command) {
     title := command[2]
     command.RemoveAt(1)
     command.RemoveAt(1)

diff --git a/ahk/templates/daemon.ahk b/ahk/templates/daemon.ahk
@@ -83,9 +83,9 @@ MouseMove(ByRef command) {
 
 CoordMode(ByRef command) {
     if (command.Length() = 2) {
-        CoordMode, command[2]
+        CoordMode,% command[2]
     } else {
-        CoordMode, command[2], command[3]
+        CoordMode,% command[2],% command[3]
     }
 }
 
@@ -156,7 +156,7 @@ KeyWait(ByRef command) {
 }
 
 SetKeyDelay(ByRef command) {
-    SetKeyDelay, command[2]
+    SetKeyDelay, command[2], command[3]
 }
 
 Join(sep, params*) {
@@ -382,6 +382,15 @@ WindowList(ByRef command) {
 }
 
 WinSend(ByRef command) {
+    title := command[2]
+    command.RemoveAt(1)
+    command.RemoveAt(1)
+    str := Join(",", command*)
+    keys := Unescape(str)
+    ControlSend,,% keys, %title%
+}
+
+WinSendRaw(ByRef command) {
     title := command[2]
     command.RemoveAt(1)
     command.RemoveAt(1)

diff --git a/ahk/templates/daemon/mouse_position.ahk b/ahk/templates/daemon/mouse_position.ahk
@@ -0,0 +1,2 @@
+CoordMode,Mouse,{{mode}}
+MouseGetPos, xpos, ypos
diff --git a/ahk/templates/mouse/mouse_drag.ahk b/ahk/templates/mouse/mouse_drag.ahk
@@ -1,5 +1,5 @@
 {% extends "base.ahk" %}
 {% block body %}
-CoordMode, Mouse, {{mode}}
+CoordMode,Mouse,{{mode}}
 MouseClickDrag,{{button}},{{x1}},{{y1}},{{x2}},{{y2}}{% if speed %},{{speed}}{% endif %}{% if relative %},R{% endif %}
 {% endblock body %}
diff --git a/ahk/templates/mouse/mouse_move.ahk b/ahk/templates/mouse/mouse_move.ahk
@@ -1,5 +1,5 @@
 {% extends "base.ahk" %}
 {% block body %}
-CoordMode, Mouse, {{mode}}
-MouseMove, {{x}}, {{y}}, {{speed}}{% if relative %}, R{% endif %}
+CoordMode,Mouse,{{mode}}
+MouseMove,{{x}},{{y}},{{speed}}{% if relative %},R{% endif %}
 {% endblock body %}
diff --git a/ahk/templates/mouse/mouse_position.ahk b/ahk/templates/mouse/mouse_position.ahk
@@ -1,6 +1,6 @@
 {% extends "base.ahk" %}
 {% block body %}
-CoordMode, Mouse, {{mode}}
+CoordMode,Mouse,{{mode}}
 MouseGetPos, xpos, ypos
 s .= Format("({}, {})", xpos, ypos)
 FileAppend, %s%, *

diff --git a/tests/unittests/test_mouse.py b/tests/unittests/test_mouse.py
@@ -13,6 +13,7 @@
 )
 sys.path.insert(0, project_root)
 from ahk import AsyncAHK, AHK
+from ahk.daemon import AHKDaemon
 
 
 
@@ -47,17 +48,31 @@ def test_mouse_move_callable_speed(self):
 
     def test_mouse_drag(self):
         self.notepad_process = subprocess.Popen('notepad')
+        time.sleep(0.5)
         notepad = self.ahk.find_window(title=b"Untitled - Notepad")
         win_width = notepad.width
         win_height = notepad.height
+        print(*notepad.position)
         self.ahk.mouse_move(*notepad.position)
+        time.sleep(1)
         # moving the mouse to the window position puts it in a position where it can be resized by dragging ↖ ↘
         # after this, we expect the window height/width to shrink by 10px
         self.ahk.mouse_drag(10, 10, relative=True)
         assert notepad.width == win_width - 10
         assert notepad.height == win_height - 10
 
 
+class TestMouseDaemon(TestMouse):
+    def setUp(self) -> None:
+        self.ahk = AHKDaemon()
+        self.ahk.start()
+        self.original_position = self.ahk.mouse_position
+        self.notepad_process = None
+
+    def tearDown(self) -> None:
+        super().tearDown()
+        self.ahk.stop()
+
 class TestMouseAsync(IsolatedAsyncioTestCase):
     def setUp(self) -> None:
         self.ahk = AsyncAHK()