autoxkit 2.3.0__tar.gz → 2.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.3.0
+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

{autoxkit-2.3.0 → 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.3.0 → autoxkit-2.4.0}/autoxkit/hook/event.py

@@ -9,7 +9,7 @@ class KeyEvent:
     Attributes:
         action (str): 事件类型，"keydown"或"keyup"
         key_code : 按键的16进制虚拟键码
-        key_name (str): 按键名称，例如 "Ctrl"、"A" 等
+        key_name (str): 按键名称，例如"Ctrl"、"A" 等
     """
     def __init__(self, action, vk_code):
         self.action = action
@@ -22,15 +22,20 @@ class MouseEvent:
         鼠标事件
     Args:
         action (str): 事件类型，"MouseDown"、"MouseUp"或"MouseMove"
-        button (str): 鼠标按钮，"MLeft"、"MRight"、"MMiddle"、"MSide1"、"MSide2"，MouseMove时为None
+        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"、"MMiddle"、"MSide1"、"MSide2"，MouseMove时为None
+        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):
+    def __init__(self, action, button, x, y, distance=0):
         self.action = action
         self.button = button
-        self.position = (x, y)
+        self.position = (x, y)
+        self.distance = distance

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

@@ -227,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.3.0 → 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.3.0 → 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.3.0 → autoxkit-2.4.0}/autoxkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.3.0
+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

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

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