autoxkit 2.2.0__tar.gz → 2.3.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.2.0
+Version: 2.3.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.0 → autoxkit-2.3.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.0 → autoxkit-2.3.0}/autoxkit/hook/event.py

@@ -21,13 +21,13 @@ class MouseEvent:
     """
         鼠标事件
     Args:
-        action (str): 事件类型，"MouseDown"或"MouseUp"
-        button (str): 鼠标按钮，"MLeft"、"MRight"、"MMiddle"、"side1"、"side2"
+        action (str): 事件类型，"MouseDown"、"MouseUp"或"MouseMove"
+        button (str): 鼠标按钮，"MLeft"、"MRight"、"MMiddle"、"MSide1"、"MSide2"，MouseMove时为None
         x (int): 鼠标x坐标
         y (int): 鼠标y坐标
     Attributes:
-        action (str): 事件类型，"MouseDown"或"MouseUp"
-        button (str): 鼠标按钮，"MLeft"、"MRight"、"MMiddle"、"side1"、"side2"
+        action (str): 事件类型，"MouseDown"、"MouseUp"或"MouseMove"
+        button (str): 鼠标按钮，"MLeft"、"MRight"、"MMiddle"、"MSide1"、"MSide2"，MouseMove时为None
         position (tuple): 鼠标位置，(x, y)格式
     """
     def __init__(self, action, button, x, y):

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

@@ -1,13 +1,16 @@
-
 # hook_listener.py
 import ctypes
 from ctypes import wintypes, Structure, POINTER, CFUNCTYPE, byref
 import threading
+import time
 from .event import KeyEvent, MouseEvent
 from ..constants import Hex_Hook_Code
 
 HHC = Hex_Hook_Code
 
+# 消息泵空闲轮询间隔（秒），无消息时休眠此时间以释放 CPU
+MSG_POLL_INTERVAL = 0.001
+
 # ---------- 结构体定义 ----------
 class KBDLLHOOKSTRUCT(Structure):
     _fields_ = [
@@ -30,7 +33,7 @@ class MSLLHOOKSTRUCT(Structure):
 # ---------- 回调类型 ----------
 HOOKPROC = CFUNCTYPE(ctypes.c_long, ctypes.c_int, wintypes.WPARAM, wintypes.LPARAM)
 
-# ---------- 加载 DLL 并声明 API 签名（你指出必须有的部分） ----------
+# ---------- 加载 DLL 并声明 API 签名 ----------
 user32 = ctypes.WinDLL('user32', use_last_error=True)
 kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
 
@@ -73,6 +76,7 @@ class HookListener:
         self._on_keyup = []
         self._on_mousedown = []
         self._on_mouseup = []
+        self._on_mousemove = []
 
         # 钩子与线程状态
         self._thread = None
@@ -107,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))
 
@@ -130,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:
@@ -163,7 +171,9 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except ValueError as e:
-                            raise e
+                            print(f"[hook_listener] ValueError in keydown callback: {e}", file=__import__('sys').stderr)
+                        except Exception as e:
+                            print(f"[hook_listener] Exception in keydown callback: {e}", file=__import__('sys').stderr)
                 elif wParam in (HHC["KeyUp"], HHC["SysKeyUp"]):
                     event = KeyEvent('KeyUp', kbd.vkCode)
                     for cb in self._on_keyup:
@@ -172,9 +182,11 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except ValueError as e:
-                            raise e
+                            print(f"[hook_listener] ValueError in keyup callback: {e}", file=__import__('sys').stderr)
+                        except Exception as e:
+                            print(f"[hook_listener] Exception in keyup callback: {e}", file=__import__('sys').stderr)
             except Exception as e:
-                raise e
+                print(f"[hook_listener] Exception in _keyboard_proc: {e}", file=__import__('sys').stderr)
 
         return user32.CallNextHookEx(self.keyboard_hook, nCode, wParam, lParam)
 
@@ -185,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:
@@ -194,7 +216,7 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except Exception as e:
-                            raise e
+                            print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__('sys').stderr)
 
                 elif wParam in (HHC["MLeftUp"], HHC["MRightUp"], HHC["MiddleUp"], HHC["XUp"]):
                     button = self._get_mouse_button(wParam, ms.mouseData)
@@ -205,9 +227,9 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except Exception as e:
-                            raise e
+                            print(f"[hook_listener] Exception in mouseup callback: {e}", file=__import__('sys').stderr)
             except Exception as e:
-                raise e
+                print(f"[hook_listener] Exception in _mouse_proc: {e}", file=__import__('sys').stderr)
 
         return user32.CallNextHookEx(self.mouse_hook, nCode, wParam, lParam)
 
@@ -276,9 +298,12 @@ class HookListener:
                 if user32.PeekMessageW(byref(msg), 0, 0, 0, 1):  # PM_REMOVE = 1
                     user32.TranslateMessage(byref(msg))
                     user32.DispatchMessageW(byref(msg))
+                else:
+                    # 无消息时休眠，避免 CPU 忙等
+                    time.sleep(MSG_POLL_INTERVAL)
             except Exception:
                 # 记录异常但不退出循环，确保钩子持续工作
-                # 回调中的异常应由上层自行处理
+                print("[hook_listener] Exception in message pump", file=__import__('sys').stderr)
                 continue
 
         # 离开循环之前确保取消钩子

{autoxkit-2.2.0 → autoxkit-2.3.0}/autoxkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.2.0
+Version: 2.3.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.0 → autoxkit-2.3.0}/pyproject.toml

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