From 4d668e9c1aa5162965437f0186924f6e56432bbd Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Tue, 1 Oct 2019 21:23:45 +0300 Subject: refactoring --- kvmd/plugins/hid/serial.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kvmd/plugins/hid/serial.py') diff --git a/kvmd/plugins/hid/serial.py b/kvmd/plugins/hid/serial.py index 4a4346dc..3f9fe23b 100644 --- a/kvmd/plugins/hid/serial.py +++ b/kvmd/plugins/hid/serial.py @@ -81,19 +81,6 @@ class _KeyEvent(_BaseEvent): return struct.pack(">BBBxx", 0x11, code, int(self.state)) -@dataclasses.dataclass(frozen=True) -class _MouseMoveEvent(_BaseEvent): - to_x: int - to_y: int - - def __post_init__(self) -> None: - assert -32768 <= self.to_x <= 32767 - assert -32768 <= self.to_y <= 32767 - - def make_command(self) -> bytes: - return struct.pack(">Bhh", 0x12, self.to_x, self.to_y) - - @dataclasses.dataclass(frozen=True) class _MouseButtonEvent(_BaseEvent): name: str @@ -113,6 +100,19 @@ class _MouseButtonEvent(_BaseEvent): return struct.pack(">BBxxx", 0x13, code) +@dataclasses.dataclass(frozen=True) +class _MouseMoveEvent(_BaseEvent): + to_x: int + to_y: int + + def __post_init__(self) -> None: + assert -32768 <= self.to_x <= 32767 + assert -32768 <= self.to_y <= 32767 + + def make_command(self) -> bytes: + return struct.pack(">Bhh", 0x12, self.to_x, self.to_y) + + @dataclasses.dataclass(frozen=True) class _MouseWheelEvent(_BaseEvent): delta_x: int @@ -248,12 +248,12 @@ class Plugin(BaseHid, multiprocessing.Process): # pylint: disable=too-many-inst async def send_key_event(self, key: str, state: bool) -> None: await self.__queue_event(_KeyEvent(key, state)) - async def send_mouse_move_event(self, to_x: int, to_y: int) -> None: - await self.__queue_event(_MouseMoveEvent(to_x, to_y)) - async def send_mouse_button_event(self, button: str, state: bool) -> None: await self.__queue_event(_MouseButtonEvent(button, state)) + async def send_mouse_move_event(self, to_x: int, to_y: int) -> None: + await self.__queue_event(_MouseMoveEvent(to_x, to_y)) + async def send_mouse_wheel_event(self, delta_x: int, delta_y: int) -> None: await self.__queue_event(_MouseWheelEvent(delta_x, delta_y)) -- cgit v1.2.3