autoxkit 2.4.1__tar.gz → 2.4.3__tar.gz

{autoxkit-2.4.1 → autoxkit-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.4.1
+Version: 2.4.3
 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.4.1 → autoxkit-2.4.3}/autoxkit/hook/hook_listener.py

@@ -232,24 +232,51 @@ class HookListener:
                 elif wParam == HHC["MWheel"]:
                     delta = ctypes.c_short(ms.mouseData >> 16).value / 120
                     if delta > 0:
+                        blocked = False
+                        event = MouseEvent("MouseDown", "MUWheel", x, y, distance=delta)
+                        for cb in self._on_mousedown:
+                            try:
+                                result = cb(event)
+                                if result is True:
+                                    blocked = True
+                            except Exception as e:
+                                print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__("sys").stderr)
+
                         event = MouseEvent("MouseUp", "MUWheel", x, y, distance=delta)
                         for cb in self._on_mouseup:
                             try:
                                 result = cb(event)
                                 if result is True:
-                                    return 1  # 截断事件传播
+                                    blocked = True
                             except Exception as e:
                                 print(f"[hook_listener] Exception in mouseup callback: {e}", file=__import__("sys").stderr)
+
+                        if blocked:
+                            return 1    # 截断事件传播
+
                     elif delta < 0:
+                        blocked = False
                         event = MouseEvent("MouseDown", "MDWheel", x, y, distance=delta)
                         for cb in self._on_mousedown:
                             try:
                                 result = cb(event)
                                 if result is True:
-                                    return 1  # 截断事件传播
+                                    blocked = True
                             except Exception as e:
                                 print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__("sys").stderr)
 
+                        event = MouseEvent("MouseUp", "MDWheel", x, y, distance=delta)
+                        for cb in self._on_mouseup:
+                            try:
+                                result = cb(event)
+                                if result is True:
+                                    blocked = True
+                            except Exception as e:
+                                print(f"[hook_listener] Exception in mouseup callback: {e}", file=__import__("sys").stderr)
+
+                        if blocked:
+                            return 1    # 截断事件传播
+
             except Exception as e:
                 print(f"[hook_listener] Exception in _mouse_proc: {e}", file=__import__("sys").stderr)
 

{autoxkit-2.4.1 → autoxkit-2.4.3}/autoxkit/mousekey/mouse.py

@@ -38,6 +38,9 @@ class Mouse:
                 x, y = self.mouse_point
             else:
                 x, y = None, None
+        elif x == -1 and y == -1:
+            x, y = self.get_mouse_position()
+            self.mouse_point = (x, y)
         else:
             self.mouse_point = (x, y)
         return x, y

{autoxkit-2.4.1 → autoxkit-2.4.3}/autoxkit/window/window_action.py

@@ -212,6 +212,8 @@ class WindowAction:
         if mode == 'global':
             if x is None or y is None:
                 self.mouse.mouse_down(button=button)
+            elif x == -1 and y == -1:
+                self.mouse.mouse_down(x, y, button)
             else:
                 self.mouse.mouse_down(self.client_point.x + x, self.client_point.y + y, button)
             return
@@ -243,6 +245,8 @@ class WindowAction:
         if mode == 'global':
             if x is None or y is None:
                 self.mouse.mouse_up(button=button)
+            elif x == -1 and y == -1:
+                self.mouse.mouse_up(x, y, button)
             else:
                 self.mouse.mouse_up(self.client_point.x + x, self.client_point.y + y, button)
             return

{autoxkit-2.4.1 → autoxkit-2.4.3}/autoxkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.4.1
+Version: 2.4.3
 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.4.1 → autoxkit-2.4.3}/pyproject.toml

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