autoxkit 2.4.9__tar.gz → 2.5.2__tar.gz

autoxkit-2.5.2/MANIFEST.in

@@ -0,0 +1,5 @@
+include csrc/*.c
+include csrc/*.h
+include csrc/build_dll.ps1
+include autoxkit/hook/_autoxhook.dll
+recursive-include scripts *.py

{autoxkit-2.4.9 → autoxkit-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoxkit
-Version: 2.4.9
+Version: 2.5.2
 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.9 → autoxkit-2.5.2}/autoxkit/__init__.py

@@ -1,3 +1,3 @@
-from .constants import Hex_Key_Code, Hex_Mouse_Code, Hex_Hook_Code
-
-__all__ = ["Hex_Key_Code", "Hex_Mouse_Code", "Hex_Hook_Code"]
+from .constants import Hex_Key_Code, Hex_Mouse_Code, Hex_Hook_Code
+
+__all__ = ["Hex_Key_Code", "Hex_Mouse_Code", "Hex_Hook_Code"]

{autoxkit-2.4.9 → autoxkit-2.5.2}/autoxkit/android/control.py

@@ -1,4 +1,4 @@
-"""scrcpy-server v4.0 的控制消息和设备消息序列化器。"""
+"""scrcpy-server v4.0 的控制消息和设备消息序列化器。"""
 
 from __future__ import annotations
 

{autoxkit-2.4.9 → autoxkit-2.5.2}/autoxkit/android/streams.py

@@ -1,4 +1,4 @@
-"""scrcpy-server v4.0 的异步流读取器和写入器。"""
+"""scrcpy-server v4.0 的异步流读取器和写入器。"""
 
 from __future__ import annotations
 

autoxkit-2.4.9/autoxkit/hook/hook_listener.py → autoxkit-2.5.2/autoxkit/hook/_ctypes_fallback.py

@@ -1,8 +1,15 @@
-# hook_listener.py
+# _ctypes_fallback.py
+"""纯 ctypes 实现的 HookListener（回退路径）。
+
+当 _autoxhook.dll 缺失、位数不匹配或加载失败时启用本实现，
+功能与原生路径等价，性能为迁移前的基线水平。
+核心事件链路迁移见项目根 优化方案.md 与 csrc/ 目录。
+"""
 import ctypes
-from ctypes import wintypes, Structure, POINTER, CFUNCTYPE, byref
+import sys
 import threading
-import time
+from ctypes import CFUNCTYPE, POINTER, Structure, byref, wintypes
+
 from .event import KeyEvent, MouseEvent
 from ..constants import Hex_Hook_Code
 
@@ -66,7 +73,7 @@ user32.GetMessageW.restype = wintypes.BOOL
 user32.PostThreadMessageW.argtypes = [wintypes.DWORD, wintypes.UINT, wintypes.WPARAM, wintypes.LPARAM]
 user32.PostThreadMessageW.restype = wintypes.BOOL
 
-# ---------- HookListener 类 ----------
+
 class HookListener:
     """
     每个实例可以独立运行、独立添加多个回调（keydown/keyup/mousedown/mouseup）
@@ -167,9 +174,9 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except ValueError as e:
-                            print(f"[hook_listener] ValueError in keydown callback: {e}", file=__import__('sys').stderr)
+                            print(f"[hook_listener] ValueError in keydown callback: {e}", file=sys.stderr)
                         except Exception as e:
-                            print(f"[hook_listener] Exception in keydown callback: {e}", file=__import__('sys').stderr)
+                            print(f"[hook_listener] Exception in keydown callback: {e}", file=sys.stderr)
                 elif wParam in (HHC["KeyUp"], HHC["SysKeyUp"]):
                     event = KeyEvent('KeyUp', kbd.vkCode)
                     for cb in self._on_keyup:
@@ -178,11 +185,11 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except ValueError as e:
-                            print(f"[hook_listener] ValueError in keyup callback: {e}", file=__import__('sys').stderr)
+                            print(f"[hook_listener] ValueError in keyup callback: {e}", file=sys.stderr)
                         except Exception as e:
-                            print(f"[hook_listener] Exception in keyup callback: {e}", file=__import__('sys').stderr)
+                            print(f"[hook_listener] Exception in keyup callback: {e}", file=sys.stderr)
             except Exception as e:
-                print(f"[hook_listener] Exception in _keyboard_proc: {e}", file=__import__('sys').stderr)
+                print(f"[hook_listener] Exception in _keyboard_proc: {e}", file=sys.stderr)
 
         return user32.CallNextHookEx(self.keyboard_hook, nCode, wParam, lParam)
 
@@ -202,7 +209,7 @@ class HookListener:
                             if result is True:
                                 return 1  # 截断事件传播
                         except Exception as e:
-                            print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__('sys').stderr)
+                            print(f"[hook_listener] Exception in mousedown callback: {e}", file=sys.stderr)
 
                 elif wParam in (HHC["MLeftUp"], HHC["MRightUp"], HHC["MiddleUp"], HHC["XUp"]):
                     button = self._get_mouse_button(wParam, ms.mouseData)
@@ -213,7 +220,7 @@ 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=sys.stderr)
 
                 elif wParam == HHC["MWheel"]:
                     delta = ctypes.c_short(ms.mouseData >> 16).value / 120
@@ -226,7 +233,7 @@ class HookListener:
                                 if result is True:
                                     blocked = True
                             except Exception as e:
-                                print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__("sys").stderr)
+                                print(f"[hook_listener] Exception in mousedown callback: {e}", file=sys.stderr)
 
                         event = MouseEvent("MouseUp", "MUWheel", x, y, distance=delta)
                         for cb in self._on_mouseup:
@@ -235,7 +242,7 @@ class HookListener:
                                 if result is True:
                                     blocked = True
                             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=sys.stderr)
 
                         if blocked:
                             return 1    # 截断事件传播
@@ -249,7 +256,7 @@ class HookListener:
                                 if result is True:
                                     blocked = True
                             except Exception as e:
-                                print(f"[hook_listener] Exception in mousedown callback: {e}", file=__import__("sys").stderr)
+                                print(f"[hook_listener] Exception in mousedown callback: {e}", file=sys.stderr)
 
                         event = MouseEvent("MouseUp", "MDWheel", x, y, distance=delta)
                         for cb in self._on_mouseup:
@@ -258,13 +265,13 @@ class HookListener:
                                 if result is True:
                                     blocked = True
                             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=sys.stderr)
 
                         if blocked:
                             return 1    # 截断事件传播
 
             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=sys.stderr)
 
         return user32.CallNextHookEx(self.mouse_hook, nCode, wParam, lParam)
 

autoxkit-2.5.2/autoxkit/hook/_native.py

@@ -0,0 +1,94 @@
+# _native.py
+"""autoxhook.dll 的 ctypes 绑定层。
+
+DLL 为纯 Win32 C 实现（源码见项目 csrc/ 目录），不链接任何 Python
+运行时，因此一份 DLL 可跨 Python 3.10~3.13+ 所有版本使用。
+
+Python 侧通过 WINFUNCTYPE 函数指针把回调交给 DLL；DLL 在 C 回调内
+完成结构体解析与订阅掩码短路后，仅以纯整数参数调用该指针，
+GIL 的获取/释放由 ctypes thunk 自动处理。
+"""
+import ctypes
+import os
+from ctypes import POINTER, WINFUNCTYPE, c_char_p, c_int, c_uint
+
+# 回调原型：返回 1 = 拦截事件（吞掉），0 = 放行
+# 键盘：(msg, vk, scan, flags, time)
+KEY_CB = WINFUNCTYPE(c_int, c_int, c_int, c_int, c_int, c_uint)
+# 鼠标：(msg, x, y, data, flags, time)
+MOUSE_CB = WINFUNCTYPE(c_int, c_int, c_int, c_int, c_int, c_int, c_uint)
+
+# 事件掩码位（必须与 csrc/autoxhook.h 保持一致）
+AXH_KEY_DOWN = 1 << 0
+AXH_KEY_UP = 1 << 1
+AXH_M_LDOWN = 1 << 0
+AXH_M_LUP = 1 << 1
+AXH_M_RDOWN = 1 << 2
+AXH_M_RUP = 1 << 3
+AXH_M_MDOWN = 1 << 4
+AXH_M_MUP = 1 << 5
+AXH_M_WHEEL = 1 << 6
+AXH_M_XDOWN = 1 << 7
+AXH_M_XUP = 1 << 8
+AXH_M_MOVE = 1 << 9
+
+# axh_start 错误码 → 说明
+START_ERRORS = {
+    -1: "无空闲监听器槽位",
+    -2: "DLL 内部创建线程失败",
+    -3: "DLL 钩子初始化超时",
+    -4: "键盘钩子安装失败",
+    -5: "鼠标钩子安装失败",
+    -6: "hook_keyboard 与 hook_mouse 不能同时为 0",
+    -7: "DLL 内部创建同步事件失败",
+}
+
+
+def load_dll():
+    """加载 _autoxhook.dll 并声明导出函数原型。
+
+    Raises:
+        OSError: DLL 缺失、位数不匹配或加载失败（调用方应回退到纯 ctypes 实现）
+    """
+    dll_path = os.path.join(
+        os.path.dirname(os.path.abspath(__file__)), "_autoxhook.dll"
+    )
+    dll = ctypes.WinDLL(dll_path)
+
+    dll.axh_start.argtypes = [c_int, c_int, KEY_CB, MOUSE_CB]
+    dll.axh_start.restype = c_int
+    dll.axh_stop.argtypes = [c_int]
+    dll.axh_stop.restype = c_int
+    dll.axh_is_running.argtypes = [c_int]
+    dll.axh_is_running.restype = c_int
+    dll.axh_set_masks.argtypes = [c_int, c_uint, c_uint]
+    dll.axh_set_masks.restype = None
+    dll.axh_get_key_state.argtypes = [c_uint]
+    dll.axh_get_key_state.restype = c_uint
+    dll.axh_get_cursor_pos.argtypes = [POINTER(c_int), POINTER(c_int)]
+    dll.axh_get_cursor_pos.restype = c_int
+    dll.axh_version.argtypes = []
+    dll.axh_version.restype = c_char_p
+    return dll
+
+
+# WM 消息值 → 掩码位（模块加载期构建，热路径零开销）
+# 与 constants.Hex_Hook_Code 对应：KeyDown=0x0100 SysKeyDown=0x0104 等
+KEY_MSG_BIT = {
+    0x0100: AXH_KEY_DOWN,  # WM_KEYDOWN
+    0x0104: AXH_KEY_DOWN,  # WM_SYSKEYDOWN
+    0x0101: AXH_KEY_UP,    # WM_KEYUP
+    0x0105: AXH_KEY_UP,    # WM_SYSKEYUP
+}
+MOUSE_MSG_BIT = {
+    0x0201: AXH_M_LDOWN,   # WM_LBUTTONDOWN
+    0x0202: AXH_M_LUP,     # WM_LBUTTONUP
+    0x0204: AXH_M_RDOWN,   # WM_RBUTTONDOWN
+    0x0205: AXH_M_RUP,     # WM_RBUTTONUP
+    0x0207: AXH_M_MDOWN,   # WM_MBUTTONDOWN
+    0x0208: AXH_M_MUP,     # WM_MBUTTONUP
+    0x020A: AXH_M_WHEEL,   # WM_MOUSEWHEEL
+    0x020B: AXH_M_XDOWN,   # WM_XBUTTONDOWN
+    0x020C: AXH_M_XUP,     # WM_XBUTTONUP
+    0x0200: AXH_M_MOVE,    # WM_MOUSEMOVE（预留）
+}

autoxkit-2.5.2/autoxkit/hook/hook_listener.py

@@ -0,0 +1,306 @@
+# hook_listener.py
+"""低级键盘/鼠标钩子监听器。
+
+核心事件链路由 _autoxhook.dll（纯 Win32 C，见项目 csrc/ 目录）承担：
+钩子安装、消息泵线程、结构体解析、订阅掩码短路、按键状态跟踪均在 C 层完成，
+Python 只接收已解析的语义化整数参数。空订阅事件完全不进入 Python/GIL。
+
+DLL 缺失、位数不匹配或加载失败时，自动回退到 _ctypes_fallback 的纯 ctypes
+实现（功能等价，性能为迁移前基线）。
+"""
+import sys
+import threading
+from ctypes import POINTER, byref, c_int
+
+from .event import KeyEvent, MouseEvent
+from ..constants import Hex_Hook_Code
+
+HHC = Hex_Hook_Code
+
+# ---------- 原生 DLL 加载（失败自动回退） ----------
+try:
+    from ._native import (
+        AXH_KEY_DOWN,
+        AXH_KEY_UP,
+        AXH_M_LDOWN,
+        AXH_M_LUP,
+        AXH_M_MDOWN,
+        AXH_M_MUP,
+        AXH_M_RDOWN,
+        AXH_M_RUP,
+        AXH_M_WHEEL,
+        AXH_M_XDOWN,
+        AXH_M_XUP,
+        KEY_CB,
+        MOUSE_CB,
+        START_ERRORS,
+        load_dll,
+    )
+    _dll = load_dll()
+    _NATIVE = True
+except OSError:
+    _dll = None
+    _NATIVE = False
+
+if not _NATIVE:
+    from ._ctypes_fallback import HookListener
+else:
+
+    class HookListener:
+        """
+        每个实例可以独立运行、独立添加多个回调（keydown/keyup/mousedown/mouseup）
+        """
+
+        def __init__(self):
+            # 回调列表（支持多个回调）
+            self._on_keydown = []
+            self._on_keyup = []
+            self._on_mousedown = []
+            self._on_mouseup = []
+
+            # 注册/启停路径的并发保护（事件热路径无锁）
+            self._handlers_lock = threading.Lock()
+
+            # DLL 监听器句柄（<0 表示未启动）
+            self._handle = -1
+            self._stop_event = threading.Event()
+
+            # 必须保存 WINFUNCTYPE 对象引用，避免被 GC 回收
+            self._key_cb = KEY_CB(self._on_key_event)
+            self._mouse_cb = MOUSE_CB(self._on_mouse_event)
+
+        # 注册回调
+        def add_handler(self, event_type: str, func):
+            """
+                注册回调
+            Args:
+                event_type (str): 事件类型，可选值为 "keydown"、"keyup"、"mousedown"、"mouseup"
+                func (callable): 回调函数，参数为 KeyEvent 或 MouseEvent 对象
+            """
+            if not callable(func):
+                raise ValueError("func must be a callable object")
+
+            with self._handlers_lock:
+                if event_type == "keydown":
+                    self._on_keydown.append(func)
+                elif event_type == "keyup":
+                    self._on_keyup.append(func)
+                elif event_type == "mousedown":
+                    self._on_mousedown.append(func)
+                elif event_type == "mouseup":
+                    self._on_mouseup.append(func)
+                else:
+                    raise ValueError("unknown event_type: " + str(event_type))
+                self._refresh_masks()
+
+        # 移除回调（可选）
+        def remove_handler(self, event_type: str, func):
+            """
+                移除回调
+            Args:
+                event_type (str): 事件类型，可选值为 "keydown"、"keyup"、"mousedown"、"mouseup"
+                func (callable): 回调函数，参数为 KeyEvent 或 MouseEvent 对象
+            """
+            if not callable(func):
+                raise ValueError("func must be a callable object")
+
+            with self._handlers_lock:
+                if event_type == "keydown":
+                    target = self._on_keydown
+                elif event_type == "keyup":
+                    target = self._on_keyup
+                elif event_type == "mousedown":
+                    target = self._on_mousedown
+                elif event_type == "mouseup":
+                    target = self._on_mouseup
+                else:
+                    raise ValueError("unknown event_type: " + str(event_type))
+                try:
+                    target.remove(func)
+                except ValueError:
+                    raise ValueError("function not found: " + str(func))
+                self._refresh_masks()
+
+        # 根据回调列表刷新 DLL 订阅掩码（须持有 _handlers_lock）
+        def _refresh_masks(self):
+            if self._handle < 0:
+                return
+            key_mask = 0
+            if self._on_keydown:
+                key_mask |= AXH_KEY_DOWN
+            if self._on_keyup:
+                key_mask |= AXH_KEY_UP
+            mouse_mask = 0
+            if self._on_mousedown:
+                mouse_mask |= (
+                    AXH_M_LDOWN | AXH_M_RDOWN | AXH_M_MDOWN | AXH_M_XDOWN
+                )
+            if self._on_mouseup:
+                mouse_mask |= AXH_M_LUP | AXH_M_RUP | AXH_M_MUP | AXH_M_XUP
+            # 滚轮同时驱动 down/up 两个回调列表，任一非空即订阅
+            if self._on_mousedown or self._on_mouseup:
+                mouse_mask |= AXH_M_WHEEL
+            _dll.axh_set_masks(self._handle, key_mask, mouse_mask)
+
+        # 获取当前鼠标位置
+        def get_mouse_position(self):
+            """
+                获取当前鼠标位置
+            Returns:
+                tuple[int, int]: 鼠标位置 (x, y)
+            """
+            x = c_int(0)
+            y = c_int(0)
+            if _dll.axh_get_cursor_pos(byref(x), byref(y)) == 0:
+                return (x.value, y.value)
+            import ctypes
+
+            raise ctypes.WinError(ctypes.get_last_error())
+
+        # 内部键盘回调（由 DLL 的 C 回调以纯整数参数调用，仅订阅事件会到达）
+        def _on_key_event(self, msg, vk_code, scan_code, flags, time):
+            if msg in (HHC["KeyDown"], HHC["SysKeyDown"]):
+                event = KeyEvent('KeyDown', vk_code)
+                for cb in self._on_keydown:
+                    try:
+                        result = cb(event)
+                        if result is True:
+                            return 1  # 截断事件传播
+                    except ValueError as e:
+                        print(f"[hook_listener] ValueError in keydown callback: {e}", file=sys.stderr)
+                    except Exception as e:
+                        print(f"[hook_listener] Exception in keydown callback: {e}", file=sys.stderr)
+            else:
+                event = KeyEvent('KeyUp', vk_code)
+                for cb in self._on_keyup:
+                    try:
+                        result = cb(event)
+                        if result is True:
+                            return 1  # 截断事件传播
+                    except ValueError as e:
+                        print(f"[hook_listener] ValueError in keyup callback: {e}", file=sys.stderr)
+                    except Exception as e:
+                        print(f"[hook_listener] Exception in keyup callback: {e}", file=sys.stderr)
+            return 0  # 放行
+
+        # 内部鼠标回调（由 DLL 的 C 回调以纯整数参数调用）
+        # data 语义由 msg 决定：滚轮=有符号原始 delta；X键=1(MSide1)/2(MSide2)；其余=0
+        def _on_mouse_event(self, msg, x, y, data, flags, time):
+            if msg == HHC["MWheel"]:
+                delta = data / 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=sys.stderr)
+
+                    event = MouseEvent("MouseUp", "MUWheel", 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=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:
+                                blocked = True
+                        except Exception as e:
+                            print(f"[hook_listener] Exception in mousedown callback: {e}", file=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=sys.stderr)
+
+                    if blocked:
+                        return 1    # 截断事件传播
+
+            elif msg in (HHC["MLeftDown"], HHC["MRightDown"], HHC["MiddleDown"], HHC["XDown"]):
+                button = self._get_mouse_button(msg, data)
+                event = MouseEvent("MouseDown", button, x, y)
+                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=sys.stderr)
+
+            elif msg in (HHC["MLeftUp"], HHC["MRightUp"], HHC["MiddleUp"], HHC["XUp"]):
+                button = self._get_mouse_button(msg, data)
+                event = MouseEvent("MouseUp", button, x, y)
+                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=sys.stderr)
+
+            return 0  # 放行
+
+        # 辅助函数：获取鼠标按键名称（C 侧已解析 X 键编号到 data）
+        @staticmethod
+        def _get_mouse_button(wParam, data):
+            if wParam in (HHC["MLeftDown"], HHC["MLeftUp"]):
+                return 'MLeft'
+            elif wParam in (HHC["MRightDown"], HHC["MRightUp"]):
+                return 'MRight'
+            elif wParam in (HHC["MiddleDown"], HHC["MiddleUp"]):
+                return 'Middle'
+            elif wParam in (HHC["XDown"], HHC["XUp"]):
+                return 'MSide1' if data == HHC["MSide1"] else 'MSide2'
+
+        # 启动监听（DLL 内部创建消息泵线程并安装钩子）
+        def start(self):
+            with self._handlers_lock:
+                if self._handle >= 0:
+                    return
+                ret = _dll.axh_start(1, 1, self._key_cb, self._mouse_cb)
+                if ret < 0:
+                    raise RuntimeError(
+                        "autoxhook 启动失败: "
+                        + START_ERRORS.get(ret, f"错误码 {ret}")
+                    )
+                self._handle = ret
+                self._stop_event.clear()
+                self._refresh_masks()
+
+        # 停止监听并取消钩子（DLL 内部时序：先断 Python 触达，再卸钩，再释放槽位）
+        def stop(self):
+            with self._handlers_lock:
+                if self._handle < 0:
+                    self._stop_event.set()
+                    return
+                _dll.axh_stop(self._handle)
+                self._handle = -1
+            self._stop_event.set()
+
+        # 阻塞等待直到停止
+        def wait(self):
+            self._stop_event.wait()
+
+        def __del__(self):
+            try:
+                self.stop()
+            except Exception:
+                pass

{autoxkit-2.4.9 → autoxkit-2.5.2}/autoxkit/window/window.py

@@ -1,4 +1,4 @@
-
+import time
 import ctypes
 from ctypes import wintypes
 from ctypes.wintypes import RECT
@@ -75,16 +75,23 @@ class Window(WindowAction, WindowMatch):
         raise ValueError("窗口句柄未设置")
 
     def activate_window(self):
-        """激活窗口到前台显示"""
-        if self.hwnd:
-            # 获取一级父窗口句柄
-            current_hwnd = self.hwnd
-            while True:
-                parent_hwnd = user32.GetParent(current_hwnd)
-                if parent_hwnd == 0:
-                    break
-                current_hwnd = parent_hwnd
-            user32.ShowWindow(current_hwnd, 9)
+        """把窗口（含父窗口链）带到前台"""
+        if not self.hwnd:
+            raise ValueError("窗口句柄未设置")
+
+        current_hwnd = self.hwnd
+        for _ in range(8):
+            parent_hwnd = user32.GetParent(current_hwnd)
+            if parent_hwnd == 0:
+                break
+            current_hwnd = parent_hwnd
+
+        # 两种都开，确保窗口可见并带前台焦点
+        user32.ShowWindow(current_hwnd, 9)
+
+        if user32.GetForegroundWindow() != current_hwnd:
+            user32.SetForegroundWindow(current_hwnd)
+            time.sleep(0.02)
 
     def bind_window(self):
         """

{autoxkit-2.4.9 → autoxkit-2.5.2}/autoxkit/window/window_action.py

@@ -33,6 +33,11 @@ GetClientRect = user32.GetClientRect
 GetClientRect.argtypes = [wintypes.HWND, ctypes.POINTER(wintypes.RECT)]
 GetClientRect.restype = wintypes.BOOL
 
+# 父窗口链（64 位 HWND 必须显式声明，否则返回值被截断、循环永不收敛）
+GetParent = user32.GetParent
+GetParent.argtypes = [wintypes.HWND]
+GetParent.restype = wintypes.HWND
+
 # 定义窗口消息常量
 WM_KEYDOWN = 0x0100
 WM_KEYUP = 0x0101
@@ -90,6 +95,38 @@ class WindowAction:
         self.global_key = False
         self.global_mouse = False
 
+    def _client_position(self):
+        """
+            返回窗口客户区位置
+        Returns:
+            tuple: (x, y) 元组，x 为窗口客户区左上角 x 轴坐标，y 为窗口客户区左上角 y 轴坐标
+        """
+        if self.hwnd:
+            client_point = wintypes.POINT(0, 0)
+            ctypes.windll.user32.ClientToScreen(self.hwnd, ctypes.byref(client_point))
+            self.client_point = client_point
+            return client_point.x, client_point.y
+        raise ValueError("窗口句柄未设置")
+
+    def _activate_window(self):
+        """把窗口（含父窗口链）带到前台"""
+        if not self.hwnd:
+            raise ValueError("窗口句柄未设置")
+
+        current_hwnd = self.hwnd
+        for _ in range(8):
+            parent_hwnd = user32.GetParent(current_hwnd)
+            if parent_hwnd == 0:
+                break
+            current_hwnd = parent_hwnd
+
+        # 两种都开，确保窗口可见并带前台焦点
+        user32.ShowWindow(current_hwnd, 9)
+
+        if user32.GetForegroundWindow() != current_hwnd:
+            user32.SetForegroundWindow(current_hwnd)
+            time.sleep(0.02)
+
     def send_activate_message(self, mode='send'):
         """
             发送虚拟激活消息，让窗口认为自己被激活
@@ -219,6 +256,7 @@ class WindowAction:
             raise ValueError("窗口句柄未设置")
 
         if mode == 'global':
+            self._client_position()
             if x is None or y is None:
                 self.mouse.mouse_down(button=button)
             elif x == -1 and y == -1:
@@ -252,6 +290,7 @@ class WindowAction:
             raise ValueError("窗口句柄未设置")
 
         if mode == 'global':
+            self._client_position()
             if x is None or y is None:
                 self.mouse.mouse_up(button=button)
             elif x == -1 and y == -1:
@@ -300,6 +339,7 @@ class WindowAction:
             raise ValueError("窗口句柄未设置")
 
         if mode == 'global':
+            self._client_position()
             self.mouse.mouse_move(self.client_point.x + x, self.client_point.y + y, duration, steps)
             return
 
@@ -355,6 +395,7 @@ class WindowAction:
             raise ValueError("窗口句柄未设置")
 
         if mode == 'global':
+            self._client_position()
             if x is None or y is None:
                 self.mouse.mouse_wheel(distance=distance)
             else: