diff options
Diffstat (limited to 'kvmd/plugins/hid/ch9329/mouse.py')
| -rw-r--r-- | kvmd/plugins/hid/ch9329/mouse.py | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/kvmd/plugins/hid/ch9329/mouse.py b/kvmd/plugins/hid/ch9329/mouse.py index ea21150a..0a0cfbcc 100644 --- a/kvmd/plugins/hid/ch9329/mouse.py +++ b/kvmd/plugins/hid/ch9329/mouse.py @@ -32,6 +32,8 @@ class Mouse: # pylint: disable=too-many-instance-attributes self.__buttons = 0 self.__to_x = (0, 0) self.__to_y = (0, 0) + self.__delta_x = 0 + self.__delta_y = 0 self.__wheel_y = 0 def set_absolute(self, flag: bool) -> None: @@ -40,7 +42,7 @@ class Mouse: # pylint: disable=too-many-instance-attributes def is_absolute(self) -> bool: return self.__absolute - def process_button(self, button: str, state: bool) -> list[int]: + def process_button(self, button: str, state: bool) -> bytes: code = 0x00 match button: case "left": @@ -60,11 +62,11 @@ class Mouse: # pylint: disable=too-many-instance-attributes self.__buttons &= ~code self.__wheel_y = 0 if not self.__absolute: - return self.__make_relative_cmd() + return self.__make_relative_cmd() else: - return self.__make_absolute_cmd() + return self.__make_absolute_cmd() - def process_move(self, to_x: int, to_y: int) -> list[int]: + def process_move(self, to_x: int, to_y: int) -> bytes: self.__to_x = self.__fix_absolute(to_x) self.__to_y = self.__fix_absolute(to_y) self.__wheel_y = 0 @@ -75,37 +77,37 @@ class Mouse: # pylint: disable=too-many-instance-attributes to_fixed = math.ceil(MouseRange.remap(value, 0, MouseRange.MAX) / 8) return (to_fixed >> 8, to_fixed & 0xFF) - def process_wheel(self, delta_x: int, delta_y: int) -> list[int]: + def process_wheel(self, delta_x: int, delta_y: int) -> bytes: _ = delta_x assert -127 <= delta_y <= 127 self.__wheel_y = (1 if delta_y > 0 else 255) if not self.__absolute: - return self.__make_relative_cmd() + return self.__make_relative_cmd() else: - return self.__make_absolute_cmd() - - def process_relative(self, delta_x: int, delta_y: int) -> list[int]: + return self.__make_absolute_cmd() + + def process_relative(self, delta_x: int, delta_y: int) -> bytes: self.__delta_x = self.__fix_relative(delta_x) self.__delta_y = self.__fix_relative(delta_y) self.__wheel_y = 0 return self.__make_relative_cmd() - def __make_absolute_cmd(self) -> list[int]: - return [ + def __make_absolute_cmd(self) -> bytes: + return bytes([ 0, 0x04, 0x07, 0x02, self.__buttons, self.__to_x[1], self.__to_x[0], self.__to_y[1], self.__to_y[0], self.__wheel_y, - ] - - def __make_relative_cmd(self) -> list[int]: - return [ + ]) + + def __make_relative_cmd(self) -> bytes: + return bytes([ 0, 0x05, 0x05, 0x01, self.__buttons, self.__delta_x, self.__delta_y, self.__wheel_y, - ] + ]) def __fix_relative(self, value: int) -> int: assert -127 <= value <= 127 |