Add some more esoteric keys.

beeware · May 6, 2024 · 16eba7a · 16eba7a
1 parent c86b96f
commit 16eba7a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/changes/2220.bugfix.rst b/changes/2220.bugfix.rst
@@ -1 +1 @@
-Key handling for Insert, Delete, Num Lock, and some uses of Shift was added for GTK and Winforms.
+Key handling for Insert, Delete, Num Lock, Scroll Lock, and some other esoteric keys was added for GTK and Winforms. Some uses of bare Shift on GTK were also improved.
diff --git a/core/src/toga/keys.py b/core/src/toga/keys.py
@@ -149,6 +149,11 @@ class Key(Enum):
     NUMPAD_MULTIPLY = "numpad:*"
     NUMPAD_PLUS = "numpad:+"
 
+    SCROLLLOCK = "<scroll lock>"
+    BEGIN = "<begin>"
+    MENU = "<menu>"
+    PAUSE = "<pause>"
+
     def is_printable(self) -> bool:
         """Does pressing the key result in a printable character?"""
         return not (self.value.startswith("<") and self.value.endswith(">"))

diff --git a/gtk/src/toga_gtk/keys.py b/gtk/src/toga_gtk/keys.py
@@ -102,6 +102,7 @@
     Gdk.KEY_X: Key.X,
     Gdk.KEY_Y: Key.Y,
     Gdk.KEY_Z: Key.Z,
+    Gdk.KEY_Caps_Lock: Key.CAPSLOCK,
     Gdk.KEY_Tab: Key.TAB,
     Gdk.KEY_bracketleft: Key.OPEN_BRACKET,
     Gdk.KEY_bracketright: Key.CLOSE_BRACKET,
@@ -123,6 +124,8 @@
     Gdk.KEY_question: Key.QUESTION,
     Gdk.KEY_Insert: Key.INSERT,
     Gdk.KEY_Delete: Key.DELETE,
+    Gdk.KEY_Begin: Key.BEGIN,
+    Gdk.KEY_Menu: Key.MENU,
     Gdk.KEY_Home: Key.HOME,
     Gdk.KEY_End: Key.END,
     Gdk.KEY_Page_Up: Key.PAGE_UP,
@@ -152,12 +155,15 @@
     Gdk.KEY_KP_Up: Key.UP,
     Gdk.KEY_KP_Down: Key.DOWN,
     Gdk.KEY_KP_Delete: Key.DELETE,
+    Gdk.KEY_KP_Insert: Key.INSERT,
     Gdk.KEY_KP_Add: Key.NUMPAD_PLUS,
     Gdk.KEY_KP_Subtract: Key.NUMPAD_MINUS,
     Gdk.KEY_KP_Multiply: Key.NUMPAD_MULTIPLY,
     Gdk.KEY_KP_Divide: Key.NUMPAD_DIVIDE,
-    Gdk.KEY_KP_Delete: Key.DELETE,
+    Gdk.KEY_KP_Begin: Key.BEGIN,
+    Gdk.KEY_Pause: Key.PAUSE,
     Gdk.KEY_ISO_Left_Tab: Key.TAB,
+    Gdk.KEY_Scroll_Lock: Key.SCROLLLOCK,
     Gdk.KEY_Shift_L: Key.SHIFT,
     Gdk.KEY_Shift_R: Key.SHIFT,
 }

diff --git a/winforms/src/toga_winforms/keys.py b/winforms/src/toga_winforms/keys.py
@@ -41,6 +41,8 @@
     Key.RIGHT.value: WinForms.Keys.Right,
     Key.NUMLOCK.value: WinForms.Keys.NumLock,
     Key.NUMPAD_DECIMAL_POINT.value: WinForms.Keys.Decimal,
+    Key.SCROLLLOCK.value: WinForms.Keys.Scroll,
+    Key.MENU.value: WinForms.Keys.Menu,
 }
 WINFORMS_KEYS.update(
     {str(digit): getattr(WinForms.Keys, f"D{digit}") for digit in range(10)}