autoxkit 2.2.1__tar.gz → 2.4.0__tar.gz

{autoxkit-2.2.1 → autoxkit-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.2.1
+Version: 2.4.0
 Summary: Python library for Windows automation and Android device screen casting and control
 Author-email: YorickFin <1582456060@qq.com>
 License: GPL-3.0-or-later
@@ -91,11 +91,17 @@ def mouse_up(event: MouseEvent):
     return False
 
 
+def mouse_move(event: MouseEvent):
+    print(event.action, event.button, event.position)
+    return False
+
+
 hook_listener = HookListener()
 hook_listener.add_handler('keydown', key_down)
 hook_listener.add_handler('keyup', key_up)
 hook_listener.add_handler('mousedown', mouse_down)
 hook_listener.add_handler('mouseup', mouse_up)
+hook_listener.add_handler('mousemove', mouse_move)
 hook_listener.start()
 
 print("当前鼠标位置:", hook_listener.get_mouse_position())
@@ -105,6 +111,7 @@ if __name__ == '__main__':
         hook_listener.wait()
     except Exception:
         hook_listener.stop()
+
 ```
 
 更多示例代码请参考 [examples](examples)

{autoxkit-2.2.1 → autoxkit-2.4.0}/README.md

@@ -68,11 +68,17 @@ def mouse_up(event: MouseEvent):
     return False
 
 
+def mouse_move(event: MouseEvent):
+    print(event.action, event.button, event.position)
+    return False
+
+
 hook_listener = HookListener()
 hook_listener.add_handler('keydown', key_down)
 hook_listener.add_handler('keyup', key_up)
 hook_listener.add_handler('mousedown', mouse_down)
 hook_listener.add_handler('mouseup', mouse_up)
+hook_listener.add_handler('mousemove', mouse_move)
 hook_listener.start()
 
 print("当前鼠标位置:", hook_listener.get_mouse_position())
@@ -82,6 +88,7 @@ if __name__ == '__main__':
         hook_listener.wait()
     except Exception:
         hook_listener.stop()
+
 ```
 
 更多示例代码请参考 [examples](examples)

{autoxkit-2.2.1 → autoxkit-2.4.0}/autoxkit/constants.py

@@ -45,9 +45,10 @@ Hex_Hook_Code = {
     "Key_LL": 0x000D,
     "KeyDown": 0x0100, "KeyUp": 0x0101, "SysKeyDown": 0x0104, "SysKeyUp": 0x0105,
     "Mouse_LL": 0x000E,
+    "MWheel": 0x020A,
     "MLeftDown": 0x0201, "MLeftUp": 0x0202,
     "MRightDown": 0x0204, "MRightUp": 0x0205,
     "MiddleDown": 0x0207, "MiddleUp": 0x0208,
     "XDown": 0x020B, "XUp": 0x020C, "MSide1": 0x0001, "MSide2": 0x0002,
     "PM_REMOVE": 0x0001,
-}
+}

autoxkit-2.4.0/autoxkit/hook/event.py

@@ -0,0 +1,41 @@
+from ..constants import Hex_Key_Code
+
+class KeyEvent:
+    """
+        键盘事件
+    Args:
+        action (str): 事件类型，"keydown"或"keyup"
+        vk_code : 按键的16进制虚拟键码
+    Attributes:
+        action (str): 事件类型，"keydown"或"keyup"
+        key_code : 按键的16进制虚拟键码
+        key_name (str): 按键名称，例如"Ctrl"、"A" 等
+    """
+    def __init__(self, action, vk_code):
+        self.action = action
+        self.key_code = vk_code
+        name = next((k for k, v in Hex_Key_Code.items() if v == vk_code), None)
+        self.key_name = name if name else str(vk_code)
+
+class MouseEvent:
+    """
+        鼠标事件
+    Args:
+        action (str): 事件类型，"MouseDown"、"MouseUp"或"MouseMove"
+        button (str): 鼠标按键，"MLeft"、"MRight"、"Middle"、"MSide1"、"MSide2"、
+                      "MUWheel"或"MDWheel"，MouseMove时为None
+        x (int): 鼠标x坐标
+        y (int): 鼠标y坐标
+        distance (int): 滚轮滚动距离，正值为向上滚动，负值为向下滚动。非滚轮事件时为0
+    Attributes:
+        action (str): 事件类型，"MouseDown"、"MouseUp"或"MouseMove"
+        button (str): 鼠标按键，"MLeft"、"MRight"、"Middle"、"MSide1"、"MSide2"、
+                      "MUWheel"或"MDWheel"，MouseMove时为None
+        position (tuple): 鼠标位置，(x, y)格式
+        distance (int): 滚轮滚动距离，正值为向上滚动，负值为向下滚动。非滚轮事件时为0
+    """
+    def __init__(self, action, button, x, y, distance=0):
+        self.action = action
+        self.button = button
+        self.position = (x, y)
+        self.distance = distance

{autoxkit-2.2.1 → autoxkit-2.4.0}/autoxkit/hook/hook_listener.py

@@ -76,6 +76,7 @@ class HookListener:
         self._on_keyup = []
         self._on_mousedown = []
         self._on_mouseup = []
+        self._on_mousemove = []
 
         # 钩子与线程状态
         self._thread = None
@@ -110,6 +111,8 @@ class HookListener:
             self._on_mousedown.append(func)
         elif event_type == "mouseup":
             self._on_mouseup.append(func)
+        elif event_type == "mousemove":
+            self._on_mousemove.append(func)
         else:
             raise ValueError("unknown event_type: " + str(event_type))
 
@@ -133,6 +136,8 @@ class HookListener:
             target = self._on_mousedown
         elif event_type == "mouseup":
             target = self._on_mouseup
+        elif event_type == "mousemove":
+            target = self._on_mousemove
         else:
             raise ValueError("unknown event_type: " + str(event_type))
         try:
@@ -192,7 +197,17 @@ class HookListener:
                 ms = ctypes.cast(lParam, POINTER(MSLLHOOKSTRUCT)).contents
                 x, y = ms.pt.x, ms.pt.y
 
-                if wParam in (HHC["MLeftDown"], HHC["MRightDown"], HHC["MiddleDown"], HHC["XDown"]):
+                if wParam == 0x0200:  # WM_MOUSEMOVE
+                    event = MouseEvent("MouseMove", None, x, y)
+                    for cb in self._on_mousemove:
+                        try:
+                            result = cb(event)
+                            if result is True:
+                                return 1  # 截断事件传播
+                        except Exception as e:
+                            print(f"[hook_listener] Exception in mousemove callback: {e}", file=__import__('sys').stderr)
+
+                elif wParam in (HHC["MLeftDown"], HHC["MRightDown"], HHC["MiddleDown"], HHC["XDown"]):
                     button = self._get_mouse_button(wParam, ms.mouseData)
                     event = MouseEvent("MouseDown", button, x, y)
                     for cb in self._on_mousedown:
@@ -212,12 +227,35 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except Exception as e:
-                            print(f"[hook_listener] Exception in mouseup callback: {e}", file=__import__('sys').stderr)
+                            print(f"[hook_listener] Exception in mouseup callback: {e}", file=__import__("sys").stderr)
+
+                elif wParam == HHC["MWheel"]:
+                    delta = ctypes.c_short(ms.mouseData >> 16).value
+                    if delta > 0:
+                        event = MouseEvent("MouseUp", "MUWheel", x, y, distance=delta)
+                        for cb in self._on_mouseup:
+                            try:
+                                result = cb(event)
+                                if result is True:
+                                    return 1
+                            except Exception as e:
+                                print(f"[hook_listener] Exception in mouseup callback: {e}", file=__import__("sys").stderr)
+                    elif delta < 0:
+                        event = MouseEvent("MouseDown", "MDWheel", x, y, distance=delta)
+                        for cb in self._on_mousedown:
+                            try:
+                                result = cb(event)
+                                if result is True:
+                                    return 1
+                            except Exception as e:
+                                print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__("sys").stderr)
+
             except Exception as e:
-                print(f"[hook_listener] Exception in _mouse_proc: {e}", file=__import__('sys').stderr)
+                print(f"[hook_listener] Exception in _mouse_proc: {e}", file=__import__("sys").stderr)
 
         return user32.CallNextHookEx(self.mouse_hook, nCode, wParam, lParam)
 
+
     # 辅助函数：获取鼠标按键名称
     def _get_mouse_button(self, wParam, mouseData):
         if wParam in (HHC["MLeftDown"], HHC["MLeftUp"]):

{autoxkit-2.2.1 → autoxkit-2.4.0}/autoxkit/mousekey/mouse.py

@@ -114,18 +114,18 @@ class Mouse:
 
             time.sleep(step_interval)
 
-    def wheel_scroll(self, amount: int, x: int=None, y: int=None):
+    def mouse_wheel(self, distance: int, x: int=None, y: int=None):
         """
             垂直滚轮滚动
         Args:
             x (int): 目标X坐标
             y (int): 目标Y坐标
-            amount (int): 滚动距离(正值向上，负值向下)
+            distance (int): 滚动距离(正值向上，负值向下)
         """
         x, y = self._verify_mouse_point(x, y)
         if x is not None and y is not None:
             self.mouse_move(x, y, steps=1)
-        self._mouse_action(HMC["Wheel"], data=amount * 10)
+        self._mouse_action(HMC["Wheel"], data=distance * 120)
 
     def get_mouse_position(self):
         """

{autoxkit-2.2.1 → autoxkit-2.4.0}/autoxkit/window/window_action.py

@@ -331,11 +331,11 @@ class WindowAction:
             # 等待一段时间
             time.sleep(step_interval)
 
-    def send_mouse_wheel(self, amount: int, x: int=None, y: int=None, mode='send'):
+    def send_mouse_wheel(self, distance: int, x: int=None, y: int=None, mode='send'):
         """
             发送鼠标滚轮消息
         Args:
-            amount (int): 滚动距离(正值向上，负值向下)
+            distance (int): 滚动距离(正值向上，负值向下)
             mode (str): 发送模式，'send', 'post', 'global'。默认 'send'
         """
         if not self.hwnd:
@@ -343,9 +343,9 @@ class WindowAction:
 
         if mode == 'global':
             if x is None or y is None:
-                self.mouse.mouse_wheel(amount=amount)
+                self.mouse.mouse_wheel(distance=distance)
             else:
-                self.mouse.mouse_wheel(self.client_point.x + x, self.client_point.y + y, amount)
+                self.mouse.mouse_wheel(self.client_point.x + x, self.client_point.y + y, distance)
             return
 
         # 获取当前鼠标位置（使用记录的位置，如果没有则使用窗口中心）
@@ -365,7 +365,7 @@ class WindowAction:
         # 确保使用屏幕坐标
         lparam = MAKELPARAM(x, y)
         # 高16位是滚轮滚动量，低16位是鼠标状态
-        wparam = (amount << 16) | (self.mouse_state & 0xFFFF)
+        wparam = ((distance * 120) << 16) | (self.mouse_state & 0xFFFF)
 
         if mode == 'post':
             PostMessage(self.hwnd, WM_MOUSEWHEEL, wparam, lparam)

{autoxkit-2.2.1 → autoxkit-2.4.0}/autoxkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.2.1
+Version: 2.4.0
 Summary: Python library for Windows automation and Android device screen casting and control
 Author-email: YorickFin <1582456060@qq.com>
 License: GPL-3.0-or-later
@@ -91,11 +91,17 @@ def mouse_up(event: MouseEvent):
     return False
 
 
+def mouse_move(event: MouseEvent):
+    print(event.action, event.button, event.position)
+    return False
+
+
 hook_listener = HookListener()
 hook_listener.add_handler('keydown', key_down)
 hook_listener.add_handler('keyup', key_up)
 hook_listener.add_handler('mousedown', mouse_down)
 hook_listener.add_handler('mouseup', mouse_up)
+hook_listener.add_handler('mousemove', mouse_move)
 hook_listener.start()
 
 print("当前鼠标位置:", hook_listener.get_mouse_position())
@@ -105,6 +111,7 @@ if __name__ == '__main__':
         hook_listener.wait()
     except Exception:
         hook_listener.stop()
+
 ```
 
 更多示例代码请参考 [examples](examples)

{autoxkit-2.2.1 → autoxkit-2.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "autoxkit"
-version = "2.2.1"
+version = "2.4.0"
 description = "Python library for Windows automation and Android device screen casting and control"
 readme = "README.md"
 requires-python = ">=3.10"

autoxkit-2.2.1/autoxkit/hook/event.py

@@ -1,36 +0,0 @@
-from ..constants import Hex_Key_Code
-
-class KeyEvent:
-    """
-        键盘事件
-    Args:
-        action (str): 事件类型，"keydown"或"keyup"
-        vk_code : 按键的16进制虚拟键码
-    Attributes:
-        action (str): 事件类型，"keydown"或"keyup"
-        key_code : 按键的16进制虚拟键码
-        key_name (str): 按键名称，例如 "Ctrl"、"A" 等
-    """
-    def __init__(self, action, vk_code):
-        self.action = action
-        self.key_code = vk_code
-        name = next((k for k, v in Hex_Key_Code.items() if v == vk_code), None)
-        self.key_name = name if name else str(vk_code)
-
-class MouseEvent:
-    """
-        鼠标事件
-    Args:
-        action (str): 事件类型，"MouseDown"或"MouseUp"
-        button (str): 鼠标按钮，"MLeft"、"MRight"、"MMiddle"、"side1"、"side2"
-        x (int): 鼠标x坐标
-        y (int): 鼠标y坐标
-    Attributes:
-        action (str): 事件类型，"MouseDown"或"MouseUp"
-        button (str): 鼠标按钮，"MLeft"、"MRight"、"MMiddle"、"side1"、"side2"
-        position (tuple): 鼠标位置，(x, y)格式
-    """
-    def __init__(self, action, button, x, y):
-        self.action = action
-        self.button = button
-        self.position = (x, y)