Merge pull request #16 from vlrevolution/main

Author: Vinyzu

cdp_patches/input/__init__.py

@@ -94,84 +94,84 @@ class WinKeyboardCodes:
 # From: https://github.com/python-xlib/python-xlib/blob/4e8bbf8fc4941e5da301a8b3db8d27e98de68666/Xlib/keysymdef/miscellany.py
 @dataclass
 class LinuxKeyboardCodes:
-    SPACE: str = "space"
-    TAB: str = "Tab"
-    ENTER: str = "Return"
-    BACKSPACE: str = "BackSpace"
-    DELETE: str = "Delete"
-    ESCAPE: str = "Escape"
-    LEFT_ARROW: str = "Left"
-    RIGHT_ARROW: str = "Right"
-    UP_ARROW: str = "Up"
-    DOWN_ARROW: str = "Down"
-    HOME: str = "Home"
-    END: str = "End"
-    PAGE_UP: str = "Page_Up"
-    PAGE_DOWN: str = "Page_Down"
-    PRINT_SCREEN: str = "Print"
-    SCROLLLOCK: str = "Scroll_Lock"
-    CAPSLOCK: str = "Caps_Lock"
-    NUMLOCK: str = "Num_Lock"
-    F1: str = "F1"
-    F2: str = "F2"
-    F3: str = "F3"
-    F4: str = "F4"
-    F5: str = "F5"
-    F6: str = "F6"
-    F7: str = "F7"
-    F8: str = "F8"
-    F9: str = "F9"
-    F10: str = "F10"
-    F11: str = "F11"
-    F12: str = "F12"
-    F13: str = "F13"
-    F14: str = "F14"
-    F15: str = "F15"
-    F16: str = "F16"
-    F17: str = "F17"
-    F18: str = "F18"
-    F19: str = "F19"
-    F20: str = "F20"
-    F21: str = "F21"
-    F22: str = "F22"
-    F23: str = "F23"
-    F24: str = "F24"
-    INSERT: str = "Insert"
-    CONTROL: str = "Control_L"  # No normal Control -> Alias
-    SHIFT: str = "Shift_L"  # No normal Shift -> Alias
-    ALT: str = "Alt_L"  # No normal Alt -> Alias
-    CANCEL: str = "Cancel"
-    CLEAR: str = "Clear"
-    EXECUTE: str = "Execute"
-    KANA: str = "Kana_Lock"
-    KANJI: str = "Kanji"
-    LCONTROL: str = "Control_L"
-    LMENU: str = "Menu"
-    LSHIFT: str = "Shift_L"
-    NEXT: str = "Next"
-    PAUSE: str = "Pause"
-    PRIOR: str = "Prior"
-    RCONTROL: str = "Control_R"
-    RETURN: str = "Return"
-    RSHIFT: str = "Shift_R"
-    SELECT: str = "Select"
-    MENU_RIGHT: str = "Menu"  # No right Menu -> Alias
-    ADD: str = "KP_Add"
-    SUBTRACT: str = "KP_Subtract"
-    DECIMAL: str = "KP_Decimal"
-    MULTIPLY: str = "KP_Multiply"
-    DIVIDE: str = "KP_Divide"
-    SEPARATOR: str = "KP_Separator"
-    NUMPAD0: str = "KP_0"
-    NUMPAD1: str = "KP_1"
-    NUMPAD2: str = "KP_2"
-    NUMPAD3: str = "KP_3"
-    NUMPAD4: str = "KP_4"
-    NUMPAD5: str = "KP_5"
-    NUMPAD6: str = "KP_6"
-    NUMPAD7: str = "KP_7"
-    NUMPAD8: str = "KP_8"
-    NUMPAD9: str = "KP_9"
+    SPACE: str = "<<space>>"
+    TAB: str = "<<Tab>>"
+    ENTER: str = "<<Return>>"
+    BACKSPACE: str = "<<BackSpace>>"
+    DELETE: str = "<<Delete>>"
+    ESCAPE: str = "<<Escape>>"
+    LEFT_ARROW: str = "<<Left>>"
+    RIGHT_ARROW: str = "<<Right>>"
+    UP_ARROW: str = "<<Up>>"
+    DOWN_ARROW: str = "<<Down>>"
+    HOME: str = "<<Home>>"
+    END: str = "<<End>>"
+    PAGE_UP: str = "<<Page_Up>>"
+    PAGE_DOWN: str = "<<Page_Down>>"
+    PRINT_SCREEN: str = "<<Print>>"
+    SCROLLLOCK: str = "<<Scroll_Lock>>"
+    CAPSLOCK: str = "<<Caps_Lock>>"
+    NUMLOCK: str = "<<Num_Lock>>"
+    F1: str = "<<F1>>"
+    F2: str = "<<F2>>"
+    F3: str = "<<F3>>"
+    F4: str = "<<F4>>"
+    F5: str = "<<F5>>"
+    F6: str = "<<F6>>"
+    F7: str = "<<F7>>"
+    F8: str = "<<F8>>"
+    F9: str = "<<F9>>"
+    F10: str = "<<F10>>"
+    F11: str = "<<F11>>"
+    F12: str = "<<F12>>"
+    F13: str = "<<F13>>"
+    F14: str = "<<F14>>"
+    F15: str = "<<F15>>"
+    F16: str = "<<F16>>"
+    F17: str = "<<F17>>"
+    F18: str = "<<F18>>"
+    F19: str = "<<F19>>"
+    F20: str = "<<F20>>"
+    F21: str = "<<F21>>"
+    F22: str = "<<F22>>"
+    F23: str = "<<F23>>"
+    F24: str = "<<F24>>"
+    INSERT: str = "<<Insert>>"
+    CONTROL: str = "<<Control_L>>"  # No normal Control -> Alias
+    SHIFT: str = "<<Shift_L>>"  # No normal Shift -> Alias
+    ALT: str = "<<Alt_L>>"  # No normal Alt -> Alias
+    CANCEL: str = "<<Cancel>>"
+    CLEAR: str = "<<Clear>>"
+    EXECUTE: str = "<<Execute>>"
+    KANA: str = "<<Kana_Lock>>"
+    KANJI: str = "<<Kanji>>"
+    LCONTROL: str = "<<Control_L>>"
+    LMENU: str = "<<Menu>>"
+    LSHIFT: str = "<<Shift_L>>"
+    NEXT: str = "<<Next>>"
+    PAUSE: str = "<<Pause>>"
+    PRIOR: str = "<<Prior>>"
+    RCONTROL: str = "<<Control_R>>"
+    RETURN: str = "<<Return>>"
+    RSHIFT: str = "<<Shift_R>>"
+    SELECT: str = "<<Select>>"
+    MENU_RIGHT: str = "<<Menu>>"  # No right Menu -> Alias
+    ADD: str = "<<KP_Add>>"
+    SUBTRACT: str = "<<KP_Subtract>>"
+    DECIMAL: str = "<<KP_Decimal>>"
+    MULTIPLY: str = "<<KP_Multiply>>"
+    DIVIDE: str = "<<KP_Divide>>"
+    SEPARATOR: str = "<<KP_Separator>>"
+    NUMPAD0: str = "<<KP_0>>"
+    NUMPAD1: str = "<<KP_1>>"
+    NUMPAD2: str = "<<KP_2>>"
+    NUMPAD3: str = "<<KP_3>>"
+    NUMPAD4: str = "<<KP_4>>"
+    NUMPAD5: str = "<<KP_5>>"
+    NUMPAD6: str = "<<KP_6>>"
+    NUMPAD7: str = "<<KP_7>>"
+    NUMPAD8: str = "<<KP_8>>"
+    NUMPAD9: str = "<<KP_9>>"
 
 
 KeyboardCodes = WinKeyboardCodes if is_windows else LinuxKeyboardCodes

cdp_patches/input/os_base/linux.py

@@ -254,10 +254,13 @@ def scroll(self, direction: Literal["up", "down", "left", "right"], amount: int)
 
     def send_keystrokes(self, text: str) -> None:
         self.ensure_window()
-        selective_regex = re.compile(r"{[^{}]*}|.")  # Only for redundancy of windows implementations
+        selective_regex = re.compile(r"<<[^>]*>>|{[^{}]*}|.")  # Now accounting for both windows {} and linux <<>> (not part of official keycodes) keycodes
         shift_keycode = self.display.keysym_to_keycode(0xFFE1)  # Shift Key (0xFFE1)
 
         for key in selective_regex.findall(text):
+            if key.startswith("<<") and key.endswith(">>"):
+                key = key[2:-2]  # Remove << and >> from linux keycodes
+
             shifted_key = key.isupper() or key in self.shifted_chars
             if key in symbol_dict:
                 key = symbol_dict[key]