refactoring

This commit is contained in:
Maxim Devaev 2022-09-23 16:06:35 +03:00
parent 51447bc436
commit 737550e768

View File

@ -327,21 +327,20 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
async def _on_key_event(self, code: int, state: bool) -> None: async def _on_key_event(self, code: int, state: bool) -> None:
is_modifier = self.__switch_modifiers(code, state) is_modifier = self.__switch_modifiers(code, state)
if self.__kvmd_ws: variants = self.__symmap.get(code)
web_keys = self.__symmap.get(code) if variants:
if web_keys: if is_modifier:
if is_modifier: web_key = variants.get(0)
web_key = web_keys.get(0) else:
else: web_key = variants.get(self.__modifiers)
web_key = web_keys.get(self.__modifiers) if web_key is None:
if web_key is None: web_key = variants.get(0)
web_key = web_keys.get(0) if web_key and self.__kvmd_ws:
if web_key is not None: await self.__kvmd_ws.send_key_event(web_key, state)
await self.__kvmd_ws.send_key_event(web_key, state)
async def _on_ext_key_event(self, code: int, state: bool) -> None: async def _on_ext_key_event(self, code: int, state: bool) -> None:
web_key = AT1_TO_WEB.get(code) web_key = AT1_TO_WEB.get(code)
if web_key is not None: if web_key:
self.__switch_modifiers(web_key, state) # Предполагаем, что модификаторы всегда известны self.__switch_modifiers(web_key, state) # Предполагаем, что модификаторы всегда известны
if self.__kvmd_ws: if self.__kvmd_ws:
await self.__kvmd_ws.send_key_event(web_key, state) await self.__kvmd_ws.send_key_event(web_key, state)