GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

vnc: using evdev codes

Browse Source
This commit is contained in:
Maxim Devaev 2025-05-09 12:26:04 +03:00
parent bc880009c1
commit 09eb5ebc2f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kvmd/apps/vnc/rfb/__init__.py
View File

@ -27,6 +27,8 @@ from typing import Callable
from typing import Coroutine
from typing import AsyncGenerator
from evdev import ecodes
from ....logging import get_logger
from .... import tools
@ -165,7 +167,7 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute
async def _on_ext_key_event(self, code: int, state: bool) -> None:
raise NotImplementedError
async def _on_pointer_event(self, buttons: dict[str, bool], wheel: tuple[int, int], move: tuple[int, int]) -> None:
async def _on_pointer_event(self, buttons: dict[int, bool], wheel: tuple[int, int], move: tuple[int, int]) -> None:
raise NotImplementedError
async def _on_cut_event(self, text: str) -> None:
@ -508,11 +510,11 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute
sr = self.__scroll_rate
await self._on_pointer_event(
buttons={
"left": bool(buttons & 0x1),
"right": bool(buttons & 0x4),
"middle": bool(buttons & 0x2),
"up": bool(ext_buttons & 0x2),
"down": bool(ext_buttons & 0x1),
ecodes.BTN_LEFT: bool(buttons & 0x1),
ecodes.BTN_RIGHT: bool(buttons & 0x4),
ecodes.BTN_MIDDLE: bool(buttons & 0x2),
ecodes.BTN_BACK: bool(ext_buttons & 0x2),
ecodes.BTN_FORWARD: bool(ext_buttons & 0x1),
},
wheel=(
(-sr if buttons & 0x40 else (sr if buttons & 0x20 else 0)),

10
kvmd/apps/vnc/server.py
View File

@ -38,8 +38,6 @@ from ...keyboard.mappings import X11Modifiers
from ...keyboard.mappings import AT1_TO_EVDEV
from ...keyboard.magic import BaseMagicHandler
from ...mouse import MOUSE_TO_EVDEV
from ...clients.kvmd import KvmdClientWs
from ...clients.kvmd import KvmdClientSession
from ...clients.kvmd import KvmdClient
@ -132,7 +130,7 @@ class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance
# Эти состояния шарить не обязательно - бекенд исключает дублирующиеся события.
# Все это нужно только чтобы не посылать лишние жсоны в сокет KVMD
self.__mouse_buttons: dict[str, (bool | None)] = dict.fromkeys(MOUSE_TO_EVDEV, None)
self.__mouse_buttons: dict[int, bool] = {}
self.__mouse_move = (-1, -1) # (X, Y)
self.__modifiers = 0
@ -465,7 +463,7 @@ class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance
# =====
async def _on_pointer_event(self, buttons: dict[str, bool], wheel: tuple[int, int], move: tuple[int, int]) -> None:
async def _on_pointer_event(self, buttons: dict[int, bool], wheel: tuple[int, int], move: tuple[int, int]) -> None:
assert self.__stage1_authorized.is_passed()
if self.__kvmd_ws:
if wheel[0] or wheel[1]:
@ -476,8 +474,8 @@ class _Client(RfbClient, BaseMagicHandler): # pylint: disable=too-many-instance
self.__mouse_move = move
for (button, state) in buttons.items():
if self.__mouse_buttons[button] != state:
await self.__kvmd_ws.send_mouse_button_event(MOUSE_TO_EVDEV[button], state)
if self.__mouse_buttons.get(button) != state:
await self.__kvmd_ws.send_mouse_button_event(button, state)
self.__mouse_buttons[button] = state
async def _on_cut_event(self, text: str) -> None: