makcu 2.2.2__py3-none-any.whl → 2.3.1__py3-none-any.whl

makcu/mouse.py

@@ -1,250 +1,275 @@
-from typing import Dict, Union
-from .enums import MouseButton
-from .connection import SerialTransport
-from .errors import MakcuCommandError
-from serial.tools import list_ports
-
-class AxisButton:
-    def __init__(self, name: str) -> None:
-        self.name = name
-
-class Mouse:
-    
-
-    _BUTTON_COMMANDS = {
-        MouseButton.LEFT: "left",
-        MouseButton.RIGHT: "right",
-        MouseButton.MIDDLE: "middle",
-        MouseButton.MOUSE4: "ms1",
-        MouseButton.MOUSE5: "ms2",
-    }
-    
-
-    _PRESS_COMMANDS = {}
-    _RELEASE_COMMANDS = {}
-    _LOCK_COMMANDS = {}
-    _UNLOCK_COMMANDS = {}
-    _LOCK_QUERY_COMMANDS = {}
-    
-    def __init__(self, transport: SerialTransport) -> None:
-        self.transport = transport
-        self._lock_states_cache: int = 0
-        self._cache_valid = False
-        
-
-        self._init_command_cache()
-    
-    def _init_command_cache(self) -> None:
-
-        for button, cmd in self._BUTTON_COMMANDS.items():
-            self._PRESS_COMMANDS[button] = f"km.{cmd}(1)"
-            self._RELEASE_COMMANDS[button] = f"km.{cmd}(0)"
-        
-
-
-        lock_targets = [
-            ("LEFT", "ml", 0),
-            ("RIGHT", "mr", 1),
-            ("MIDDLE", "mm", 2),
-            ("MOUSE4", "ms1", 3),
-            ("MOUSE5", "ms2", 4),
-            ("X", "mx", 5),
-            ("Y", "my", 6),
-        ]
-        
-        for name, cmd, bit in lock_targets:
-            self._LOCK_COMMANDS[name] = (f"km.lock_{cmd}(1)", bit)
-            self._UNLOCK_COMMANDS[name] = (f"km.lock_{cmd}(0)", bit)
-            self._LOCK_QUERY_COMMANDS[name] = (f"km.lock_{cmd}()", bit)
-
-    def _send_button_command(self, button: MouseButton, state: int) -> None:
-        if button not in self._BUTTON_COMMANDS:
-            raise MakcuCommandError(f"Unsupported button: {button}")
-        
-
-        cmd = self._PRESS_COMMANDS[button] if state else self._RELEASE_COMMANDS[button]
-        self.transport.send_command(cmd)
-
-    def press(self, button: MouseButton) -> None:
-        self.transport.send_command(self._PRESS_COMMANDS[button])
-
-    def release(self, button: MouseButton) -> None:
-        self.transport.send_command(self._RELEASE_COMMANDS[button])
-
-    def move(self, x: int, y: int) -> None:
-        self.transport.send_command(f"km.move({x},{y})")
-
-    def click(self, button: MouseButton) -> None:
-        if button not in self._BUTTON_COMMANDS:
-            raise MakcuCommandError(f"Unsupported button: {button}")
-        
-
-        press_cmd = self._PRESS_COMMANDS[button]
-        release_cmd = self._RELEASE_COMMANDS[button]
-        
-
-        transport = self.transport
-        transport.send_command(press_cmd)
-        transport.send_command(release_cmd)
-
-    def move_smooth(self, x: int, y: int, segments: int) -> None:
-        self.transport.send_command(f"km.move({x},{y},{segments})")
-
-    def move_bezier(self, x: int, y: int, segments: int, ctrl_x: int, ctrl_y: int) -> None:
-        self.transport.send_command(f"km.move({x},{y},{segments},{ctrl_x},{ctrl_y})")
-
-    def scroll(self, delta: int) -> None:
-        self.transport.send_command(f"km.wheel({delta})")
-
-
-    def _set_lock(self, name: str, lock: bool) -> None:
-        if lock:
-            cmd, bit = self._LOCK_COMMANDS[name]
-        else:
-            cmd, bit = self._UNLOCK_COMMANDS[name]
-        
-        self.transport.send_command(cmd)
-        
-
-        if lock:
-            self._lock_states_cache |= (1 << bit)
-        else:
-            self._lock_states_cache &= ~(1 << bit)
-        self._cache_valid = True
-
-    def lock_left(self, lock: bool) -> None:
-        self._set_lock("LEFT", lock)
-        
-    def lock_middle(self, lock: bool) -> None:
-        self._set_lock("MIDDLE", lock)
-
-    def lock_right(self, lock: bool) -> None:
-        self._set_lock("RIGHT", lock)
-
-    def lock_side1(self, lock: bool) -> None:
-        self._set_lock("MOUSE4", lock)
-
-    def lock_side2(self, lock: bool) -> None:
-        self._set_lock("MOUSE5", lock)
-
-    def lock_x(self, lock: bool) -> None:
-        self._set_lock("X", lock)
-
-    def lock_y(self, lock: bool) -> None:
-        self._set_lock("Y", lock)
-
-    def spoof_serial(self, serial: str) -> None:
-        self.transport.send_command(f"km.serial('{serial}')")
-
-    def reset_serial(self) -> None:
-        self.transport.send_command("km.serial(0)")
-
-    def get_device_info(self) -> Dict[str, Union[str, bool]]:
-        port_name = self.transport.port
-        is_connected = self.transport.is_connected()
-        
-        if not is_connected or not port_name:
-            return {
-                "port": port_name or "Unknown",
-                "description": "Disconnected",
-                "vid": "Unknown", 
-                "pid": "Unknown",
-                "isConnected": False
-            }
-        
-        info = {
-            "port": port_name,
-            "description": "Connected Device",
-            "vid": "Unknown", 
-            "pid": "Unknown",
-            "isConnected": True
-        }
-        
-        try:
-            for port in list_ports.comports():
-                if port.device == port_name:
-                    info["description"] = port.description or "Connected Device"
-                    if port.vid is not None:
-                        info["vid"] = f"0x{port.vid:04x}"
-                    if port.pid is not None:
-                        info["pid"] = f"0x{port.pid:04x}"
-                    break
-        except Exception:
-            pass
-        
-        return info
-
-    def get_firmware_version(self) -> str:
-        response = self.transport.send_command("km.version()", expect_response=True, timeout=0.1)
-        return response or ""
-
-    def _invalidate_cache(self) -> None:
-        self._cache_valid = False
-
-    def get_all_lock_states(self) -> Dict[str, bool]:
-
-        if self._cache_valid:
-            return {
-                "X": bool(self._lock_states_cache & (1 << 5)),
-                "Y": bool(self._lock_states_cache & (1 << 6)),
-                "LEFT": bool(self._lock_states_cache & (1 << 0)),
-                "RIGHT": bool(self._lock_states_cache & (1 << 1)),
-                "MIDDLE": bool(self._lock_states_cache & (1 << 2)),
-                "MOUSE4": bool(self._lock_states_cache & (1 << 3)),
-                "MOUSE5": bool(self._lock_states_cache & (1 << 4)),
-            }
-        
-
-        states = {}
-        targets = ["X", "Y", "LEFT", "RIGHT", "MIDDLE", "MOUSE4", "MOUSE5"]
-        
-        for target in targets:
-            cmd, bit = self._LOCK_QUERY_COMMANDS[target]
-            try:
-                result = self.transport.send_command(cmd, expect_response=True, timeout=0.05)
-                if result and result.strip() in ['0', '1']:
-                    is_locked = result.strip() == '1'
-                    states[target] = is_locked
-                    
-
-                    if is_locked:
-                        self._lock_states_cache |= (1 << bit)
-                    else:
-                        self._lock_states_cache &= ~(1 << bit)
-                else:
-                    states[target] = False
-            except Exception:
-                states[target] = False
-        
-        self._cache_valid = True
-        return states
-
-    def is_locked(self, button: Union[MouseButton, AxisButton]) -> bool:
-        try:
-            target_name = button.name if hasattr(button, 'name') else str(button)
-            
-
-            if self._cache_valid and target_name in self._LOCK_QUERY_COMMANDS:
-                _, bit = self._LOCK_QUERY_COMMANDS[target_name]
-                return bool(self._lock_states_cache & (1 << bit))
-            
-
-            cmd, bit = self._LOCK_QUERY_COMMANDS[target_name]
-            result = self.transport.send_command(cmd, expect_response=True, timeout=0.05)
-            
-            if not result:
-                return False
-            
-            result = result.strip()
-            is_locked = result == '1'
-            
-
-            if is_locked:
-                self._lock_states_cache |= (1 << bit)
-            else:
-                self._lock_states_cache &= ~(1 << bit)
-            
-            return is_locked
-            
-        except Exception:
-            return False
+from typing import Dict, Union
+from .enums import MouseButton
+from .connection import SerialTransport
+from .errors import MakcuCommandError
+from serial.tools import list_ports
+import ctypes
+import time
+
+class AxisButton:
+    def __init__(self, name: str) -> None:
+        self.name = name
+
+class Mouse:
+    _BUTTON_COMMANDS = {
+        MouseButton.LEFT: "left",
+        MouseButton.RIGHT: "right",
+        MouseButton.MIDDLE: "middle",
+        MouseButton.MOUSE4: "ms1",
+        MouseButton.MOUSE5: "ms2",
+    }
+
+    _PRESS_COMMANDS = {}
+    _RELEASE_COMMANDS = {}
+    _LOCK_COMMANDS = {}
+    _UNLOCK_COMMANDS = {}
+    _LOCK_QUERY_COMMANDS = {}
+    
+    def __init__(self, transport: SerialTransport) -> None:
+        self.transport = transport
+        self._lock_states_cache: int = 0
+        self._cache_valid = False
+        self._init_command_cache()
+    
+    def _init_command_cache(self) -> None:
+        for button, cmd in self._BUTTON_COMMANDS.items():
+            self._PRESS_COMMANDS[button] = f"km.{cmd}(1)"
+            self._RELEASE_COMMANDS[button] = f"km.{cmd}(0)"
+    
+        lock_targets = [
+            ("LEFT", "ml", 0),
+            ("RIGHT", "mr", 1),
+            ("MIDDLE", "mm", 2),
+            ("MOUSE4", "ms1", 3),
+            ("MOUSE5", "ms2", 4),
+            ("X", "mx", 5),
+            ("Y", "my", 6),
+        ]
+
+        for name, cmd, bit in lock_targets:
+            self._LOCK_COMMANDS[name] = (f"km.lock_{cmd}(1)", bit)
+            self._UNLOCK_COMMANDS[name] = (f"km.lock_{cmd}(0)", bit)
+            self._LOCK_QUERY_COMMANDS[name] = (f"km.lock_{cmd}()", bit)
+
+    def _send_button_command(self, button: MouseButton, state: int) -> None:
+        if button not in self._BUTTON_COMMANDS:
+            raise MakcuCommandError(f"Unsupported button: {button}")
+
+        cmd = self._PRESS_COMMANDS[button] if state else self._RELEASE_COMMANDS[button]
+        self.transport.send_command(cmd)
+
+    def press(self, button: MouseButton) -> None:
+        self.transport.send_command(self._PRESS_COMMANDS[button])
+
+    def release(self, button: MouseButton) -> None:
+        self.transport.send_command(self._RELEASE_COMMANDS[button])
+
+    def move(self, x: int, y: int) -> None:
+        self.transport.send_command(f"km.move({x},{y})")
+
+    def move_abs(self,
+        target: tuple[int, int],
+        speed: int = 1,
+        wait_ms: int = 2) -> None:
+
+        def get_mouse_speed_multiplier() -> float:
+            """Return multiplier to convert pixels to mickeys based on Windows pointer speed."""
+            SPI_GETMOUSESPEED = 0x0070
+            speed = ctypes.c_uint()
+            ctypes.windll.user32.SystemParametersInfoW(
+                SPI_GETMOUSESPEED, 0, ctypes.byref(speed), 0
+            )
+            return speed.value / 10.0
+        
+        def get_cursor_pos():
+            class POINT(ctypes.Structure):
+                _fields_ = [("x", ctypes.c_long), ("y", ctypes.c_long)]
+            pt = POINT()
+            ctypes.windll.user32.GetCursorPos(ctypes.byref(pt))
+            return pt.x, pt.y
+        
+        multiplier = get_mouse_speed_multiplier()
+        end_x, end_y = target
+        
+        # clamp speed to be between 1-14. >15 creates an infinite overflick loop issue.
+        speed = max(1, min(speed, 14))
+        
+        while True:
+            cx, cy = get_cursor_pos()
+            dx, dy = end_x - cx, end_y - cy
+
+            if abs(dx) <= 1 and abs(dy) <= 1:
+                break
+            
+            move_x = max(-speed, min(speed, int(dx / multiplier)))
+            move_y = max(-speed, min(speed, int(dy / multiplier)))
+
+            self.transport.send_command(f"km.move({move_x},{move_y})")
+            time.sleep(wait_ms / 1000)
+
+    def click(self, button: MouseButton) -> None:
+        if button not in self._BUTTON_COMMANDS:
+            raise MakcuCommandError(f"Unsupported button: {button}")
+
+        press_cmd = self._PRESS_COMMANDS[button]
+        release_cmd = self._RELEASE_COMMANDS[button]
+        
+        transport = self.transport
+        transport.send_command(press_cmd)
+        transport.send_command(release_cmd)
+
+    def move_smooth(self, x: int, y: int, segments: int) -> None:
+        self.transport.send_command(f"km.move({x},{y},{segments})")
+
+    def move_bezier(self, x: int, y: int, segments: int, ctrl_x: int, ctrl_y: int) -> None:
+        self.transport.send_command(f"km.move({x},{y},{segments},{ctrl_x},{ctrl_y})")
+
+    def scroll(self, delta: int) -> None:
+        self.transport.send_command(f"km.wheel({delta})")
+
+
+    def _set_lock(self, name: str, lock: bool) -> None:
+        if lock:
+            cmd, bit = self._LOCK_COMMANDS[name]
+        else:
+            cmd, bit = self._UNLOCK_COMMANDS[name]
+        
+        self.transport.send_command(cmd)
+        
+        if lock:
+            self._lock_states_cache |= (1 << bit)
+        else:
+            self._lock_states_cache &= ~(1 << bit)
+        self._cache_valid = True
+
+    def lock_left(self, lock: bool) -> None:
+        self._set_lock("LEFT", lock)
+        
+    def lock_middle(self, lock: bool) -> None:
+        self._set_lock("MIDDLE", lock)
+
+    def lock_right(self, lock: bool) -> None:
+        self._set_lock("RIGHT", lock)
+
+    def lock_side1(self, lock: bool) -> None:
+        self._set_lock("MOUSE4", lock)
+
+    def lock_side2(self, lock: bool) -> None:
+        self._set_lock("MOUSE5", lock)
+
+    def lock_x(self, lock: bool) -> None:
+        self._set_lock("X", lock)
+
+    def lock_y(self, lock: bool) -> None:
+        self._set_lock("Y", lock)
+
+    def spoof_serial(self, serial: str) -> None:
+        self.transport.send_command(f"km.serial('{serial}')")
+
+    def reset_serial(self) -> None:
+        self.transport.send_command("km.serial(0)")
+
+    def get_device_info(self) -> Dict[str, Union[str, bool]]:
+        port_name = self.transport.port
+        is_connected = self.transport.is_connected()
+        
+        if not is_connected or not port_name:
+            return {
+                "port": port_name or "Unknown",
+                "description": "Disconnected",
+                "vid": "Unknown", 
+                "pid": "Unknown",
+                "isConnected": False
+            }
+        
+        info = {
+            "port": port_name,
+            "description": "Connected Device",
+            "vid": "Unknown", 
+            "pid": "Unknown",
+            "isConnected": True
+        }
+        
+        try:
+            for port in list_ports.comports():
+                if port.device == port_name:
+                    info["description"] = port.description or "Connected Device"
+                    if port.vid is not None:
+                        info["vid"] = f"0x{port.vid:04x}"
+                    if port.pid is not None:
+                        info["pid"] = f"0x{port.pid:04x}"
+                    break
+        except Exception:
+            pass
+        
+        return info
+
+    def get_firmware_version(self) -> str:
+        response = self.transport.send_command("km.version()", expect_response=True, timeout=0.1)
+        return response or ""
+
+    def _invalidate_cache(self) -> None:
+        self._cache_valid = False
+
+    def get_all_lock_states(self) -> Dict[str, bool]:
+
+        if self._cache_valid:
+            return {
+                "X": bool(self._lock_states_cache & (1 << 5)),
+                "Y": bool(self._lock_states_cache & (1 << 6)),
+                "LEFT": bool(self._lock_states_cache & (1 << 0)),
+                "RIGHT": bool(self._lock_states_cache & (1 << 1)),
+                "MIDDLE": bool(self._lock_states_cache & (1 << 2)),
+                "MOUSE4": bool(self._lock_states_cache & (1 << 3)),
+                "MOUSE5": bool(self._lock_states_cache & (1 << 4)),
+            }
+        
+        states = {}
+        targets = ["X", "Y", "LEFT", "RIGHT", "MIDDLE", "MOUSE4", "MOUSE5"]
+        
+        for target in targets:
+            cmd, bit = self._LOCK_QUERY_COMMANDS[target]
+            try:
+                result = self.transport.send_command(cmd, expect_response=True, timeout=0.05)
+                if result and result.strip() in ['0', '1']:
+                    is_locked = result.strip() == '1'
+                    states[target] = is_locked
+                    
+                    if is_locked:
+                        self._lock_states_cache |= (1 << bit)
+                    else:
+                        self._lock_states_cache &= ~(1 << bit)
+                else:
+                    states[target] = False
+            except Exception:
+                states[target] = False
+        
+        self._cache_valid = True
+        return states
+
+    def is_locked(self, button: Union[MouseButton, AxisButton]) -> bool:
+        try:
+            target_name = button.name if hasattr(button, 'name') else str(button)
+
+            if self._cache_valid and target_name in self._LOCK_QUERY_COMMANDS:
+                _, bit = self._LOCK_QUERY_COMMANDS[target_name]
+                return bool(self._lock_states_cache & (1 << bit))
+
+            cmd, bit = self._LOCK_QUERY_COMMANDS[target_name]
+            result = self.transport.send_command(cmd, expect_response=True, timeout=0.05)
+            
+            if not result:
+                return False
+            
+            result = result.strip()
+            is_locked = result == '1'
+            
+            if is_locked:
+                self._lock_states_cache |= (1 << bit)
+            else:
+                self._lock_states_cache &= ~(1 << bit)
+            
+            return is_locked
+            
+        except Exception:
+            return False

{makcu-2.2.2.dist-info → makcu-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makcu
-Version: 2.2.2
+Version: 2.3.1
 Summary: Python library for Makcu hardware device control
 Author: SleepyTotem
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -708,7 +708,7 @@ Requires-Dist: twine>=4.0
 Requires-Dist: rich>=14.0
 Dynamic: license-file
 
-# 🖱️ Makcu Python Library v2.2.2
+# 🖱️ Makcu Python Library v2.3.0
 
 [![PyPI Version](https://img.shields.io/pypi/v/makcu.svg)](https://pypi.org/project/makcu/)
 [![Python Support](https://img.shields.io/pypi/pyversions/makcu.svg)](https://pypi.org/project/makcu/)

{makcu-2.2.2.dist-info → makcu-2.3.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
-makcu/README.md,sha256=2sEl6BpxwLZpv0B5eDMG-1-6vrAXnUijl5im3NDVbck,10788
-makcu/__init__.py,sha256=lbWpmF383K2bi1-IFpaLA0G12ITD8NjQVq8t3oIzTI0,448
+makcu/README.md,sha256=inbc1krsBQErNI1RNaIfjKXX4ZjaqGKWG3ETFMqVwfw,11193
+makcu/__init__.py,sha256=wLK0OX4t587Gt7Z4H5pfFaFlgTm8HGzMtlKGT7w0a98,448
 makcu/__main__.py,sha256=duRmMpsNqCKZQfQ-Wj57tIUkZ6hbxLV8MBxWnhyKarY,14527
 makcu/conftest.py,sha256=EoX2T6dnUvWVI_VvJ0KTes6W82KR4Z69kMQVNtsxV7I,201
 makcu/connection.py,sha256=xvgFUPz9JBVHhatlVFtj6zhnfTamT7_o8M3msxOjVMs,23767
-makcu/controller.py,sha256=EBtiScaOU0CV7NmwVdR3CwFpbT5RymdrNveRKo5ehFU,13242
+makcu/controller.py,sha256=DRSS9qySJjdKKlUYXf90GemF_HXMTK3ewdqEBJRe06U,14069
 makcu/enums.py,sha256=1SvIv5IoMIfXyoMAq8I5r_aKMVKjYR-L_hXkFLJ_5mw,119
 makcu/errors.py,sha256=hXdeUCHvbzfqWX3uotG12Xv8EPwWs-5aHQ12xpgwx3Y,229
 makcu/makcu.pyi,sha256=UfbX7774u_a9oyIa1rweWqIRoQxVAjhhHUuukDp3jiA,237
-makcu/mouse.py,sha256=YZQDA5OGQlCxCDu3Huzwp5bjH__9yb867iLSVTYOKP4,8157
+makcu/mouse.py,sha256=dawpgWUs6V-CeMlsiPrELSbJmmgYl7QjlqK15Y0bXGI,9819
 makcu/py.typed,sha256=ks2XNwsNldow4qVp9kuCuGBuHTmngmrzgvRnkzWIGMY,110
 makcu/test_suite.py,sha256=mfzr7L63Eim1z4-l7WHtWs7szGr6bNk2U13vXVlWeM4,4295
-makcu-2.2.2.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-makcu-2.2.2.dist-info/METADATA,sha256=a1xZlmx3dgZfhwidbupCWnks-oVpeRfUYj1k-WNl18U,53904
-makcu-2.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-makcu-2.2.2.dist-info/top_level.txt,sha256=IRO1UVb5LK_ovjau0g4oObyXQqy00tVEE-yF5lPgw1w,6
-makcu-2.2.2.dist-info/RECORD,,
+makcu-2.3.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+makcu-2.3.1.dist-info/METADATA,sha256=Y-ATRFlY_DLYQf3MKz5WpqI6dHhkWp2nhHFrn83u_RM,53904
+makcu-2.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+makcu-2.3.1.dist-info/top_level.txt,sha256=IRO1UVb5LK_ovjau0g4oObyXQqy00tVEE-yF5lPgw1w,6
+makcu-2.3.1.dist-info/RECORD,,