autoxkit 2.4.4__tar.gz → 2.4.8__tar.gz

{autoxkit-2.4.4 → autoxkit-2.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.4.4
+Version: 2.4.8
 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,17 +91,11 @@ 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())

{autoxkit-2.4.4 → autoxkit-2.4.8}/README.md

@@ -68,17 +68,11 @@ 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())

{autoxkit-2.4.4 → autoxkit-2.4.8}/autoxkit/hook/event.py

@@ -1,5 +1,8 @@
 from ..constants import Hex_Key_Code
 
+# 预构建 vkCode → name 反向字典
+_VK_TO_NAME = {v: k for k, v in Hex_Key_Code.items()}
+
 class KeyEvent:
     """
         键盘事件
@@ -14,8 +17,7 @@ class KeyEvent:
     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)
+        self.key_name = _VK_TO_NAME.get(vk_code, str(vk_code))
 
 class MouseEvent:
     """

{autoxkit-2.4.4 → autoxkit-2.4.8}/autoxkit/hook/hook_listener.py

@@ -8,9 +8,6 @@ from ..constants import Hex_Hook_Code
 
 HHC = Hex_Hook_Code
 
-# 消息泵空闲轮询间隔（秒），无消息时休眠此时间以释放 CPU
-MSG_POLL_INTERVAL = 0.001
-
 # ---------- 结构体定义 ----------
 class KBDLLHOOKSTRUCT(Structure):
     _fields_ = [
@@ -80,7 +77,6 @@ class HookListener:
         self._on_keyup = []
         self._on_mousedown = []
         self._on_mouseup = []
-        self._on_mousemove = []
 
         # 钩子与线程状态
         self._thread = None
@@ -115,8 +111,6 @@ 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))
 
@@ -140,8 +134,6 @@ 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:
@@ -201,17 +193,7 @@ class HookListener:
                 ms = ctypes.cast(lParam, POINTER(MSLLHOOKSTRUCT)).contents
                 x, y = ms.pt.x, ms.pt.y
 
-                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"]):
+                if 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:
@@ -315,7 +297,7 @@ class HookListener:
         self._stop_event.set()
         # 发送 WM_QUIT 消息唤醒 GetMessageW 阻塞
         if self._thread and self._thread.is_alive():
-            user32.PostThreadMessageW(self._thread.ident, 0x0012, 0, 0)
+            user32.PostThreadMessageW(self._thread.ident, 0x0012, 0, 0)  # WM_QUIT
             self._thread.join(timeout=1.0)
         # 尝试取消钩子（若尚未取消）
         if self.keyboard_hook:
@@ -346,11 +328,9 @@ class HookListener:
             self._stop_event.set()
             return
 
+        # 消息泵循环：ctypes 调用 GetMessageW 期间会释放 GIL
         msg = wintypes.MSG()
-        while True:
-            ret = user32.GetMessageW(byref(msg), 0, 0, 0)
-            if ret <= 0:
-                break
+        while user32.GetMessageW(byref(msg), None, 0, 0) > 0:
             user32.TranslateMessage(byref(msg))
             user32.DispatchMessageW(byref(msg))
 

{autoxkit-2.4.4 → autoxkit-2.4.8}/autoxkit/mousekey/mouse.py

@@ -10,8 +10,9 @@ SendInput = user32.SendInput
 
 class Mouse:
 
-    def __init__(self):
+    def __init__(self, compat=False):
         """初始化鼠标控制器"""
+        self.compat = compat
         self.mouse_point = tuple()
         self.screen_width = user32.GetSystemMetrics(0)
         self.screen_height = user32.GetSystemMetrics(1)
@@ -23,14 +24,25 @@ class Mouse:
             4: [HMC["XDown"], HMC["XUp"], HMC["MSide2"]],
         }
 
-    def _mouse_action(self, flags, x=0, y=0, data=0):
-        """执行鼠标动作的底层函数"""
+    def _mouse_action_compat(self, flags, x=0, y=0, data=0):
+        """执行鼠标动作的底层函数（兼容模式，使用 mouse_event API）"""
+        user32.mouse_event(flags, x, y, data, 0)
+
+    def _mouse_action_input(self, flags, x=0, y=0, data=0):
+        """执行鼠标动作的底层函数（SendInput 模式）"""
         extra = ctypes.c_ulong(0)
         ii_ = Input_I()
         ii_.mi = MouseInput(x, y, data, flags, 0, ctypes.pointer(extra))
         input_struct = Input(ctypes.c_ulong(0), ii_)
         SendInput(1, ctypes.pointer(input_struct), ctypes.sizeof(input_struct))
 
+    def _mouse_action(self, flags, x=0, y=0, data=0):
+        """执行鼠标动作的底层函数"""
+        if self.compat:
+            self._mouse_action_compat(flags, x, y, data)
+        else:
+            self._mouse_action_input(flags, x, y, data)
+
     def _verify_mouse_point(self, x: int=None, y: int=None):
         """验证鼠标坐标是否在屏幕范围内"""
         if x is None or y is None:

{autoxkit-2.4.4 → autoxkit-2.4.8}/autoxkit/window/window_match.py

@@ -169,8 +169,13 @@ class WindowMatch:
             bmi.bmiHeader.biClrUsed = 0
             bmi.bmiHeader.biClrImportant = 0
 
-            # 分配内存
-            buffer_size = width * height * 3
+            # GDI 要求位图每行字节数（stride）必须是 4 的倍数（DWORD 对齐）
+            # 若直接用 width * height * 3，当 width * 3 不是 4 的倍数时，
+            # 每行末尾会被 GDI 填充字节，导致 reshape 后行数据错位、图像倾斜。
+            stride = ((width * 3 + 3) // 4) * 4
+
+            # 分配内存（按 stride 对齐）
+            buffer_size = stride * height
             buffer = ctypes.create_string_buffer(buffer_size)
 
             # 获取位图数据
@@ -178,8 +183,9 @@ class WindowMatch:
                 hdc_mem, hbitmap, 0, height, buffer, ctypes.byref(bmi), 0
             )
 
-            # 转换为numpy数组
-            img_array = np.frombuffer(buffer, dtype=np.uint8).reshape(height, width, 3)
+            # 转换为numpy数组：先按 stride 展开，再丢弃每行末尾的填充字节
+            img_array = np.frombuffer(buffer, dtype=np.uint8).reshape(height, stride)
+            img_array = img_array[:, :width * 3].reshape(height, width, 3)
 
             # 转为RGB格式数组
             img_array = self.data_header.image_to_numpy(img_array, to_rgb=True)
@@ -266,8 +272,11 @@ class WindowMatch:
             bmi.bmiHeader.biClrUsed = 0
             bmi.bmiHeader.biClrImportant = 0
 
-            # 分配内存
-            buffer_size = window_width * window_height * 3
+            # GDI 要求位图每行字节数（stride）必须是 4 的倍数（DWORD 对齐）
+            stride = ((window_width * 3 + 3) // 4) * 4
+
+            # 分配内存（按 stride 对齐）
+            buffer_size = stride * window_height
             buffer = ctypes.create_string_buffer(buffer_size)
 
             # 获取位图数据
@@ -275,8 +284,9 @@ class WindowMatch:
                 hdc_mem, hbitmap, 0, window_height, buffer, ctypes.byref(bmi), 0
             )
 
-            # 转换为numpy数组
-            img_array = np.frombuffer(buffer, dtype=np.uint8).reshape(window_height, window_width, 3)
+            # 转换为numpy数组：先按 stride 展开，再丢弃每行末尾的填充字节
+            img_array = np.frombuffer(buffer, dtype=np.uint8).reshape(window_height, stride)
+            img_array = img_array[:, :window_width * 3].reshape(window_height, window_width, 3)
 
             # 转为RGB格式数组
             img_array = self.data_header.image_to_numpy(img_array, to_rgb=True)

{autoxkit-2.4.4 → autoxkit-2.4.8}/autoxkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.4.4
+Version: 2.4.8
 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,17 +91,11 @@ 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())

{autoxkit-2.4.4 → autoxkit-2.4.8}/pyproject.toml

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