From 8966275071195e75aa176f0720a07ee8e385a9d6 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 13 May 2026 23:39:15 -0400 Subject: [PATCH] Missed a couple of keys in translation for -x. --- src/fenrirscreenreader/inputDriver/x11Driver.py | 6 ++++++ tests/unit/test_x11_terminal_mode.py | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/src/fenrirscreenreader/inputDriver/x11Driver.py b/src/fenrirscreenreader/inputDriver/x11Driver.py index 44c3bea3..04ae44fb 100644 --- a/src/fenrirscreenreader/inputDriver/x11Driver.py +++ b/src/fenrirscreenreader/inputDriver/x11Driver.py @@ -61,7 +61,11 @@ class driver(inputDriver): "Escape": "KEY_ESC", "space": "KEY_SPACE", "minus": "KEY_MINUS", + "underscore": "KEY_MINUS", + "_": "KEY_MINUS", "equal": "KEY_EQUAL", + "plus": "KEY_EQUAL", + "+": "KEY_EQUAL", "bracketleft": "KEY_LEFTBRACE", "bracketright": "KEY_RIGHTBRACE", "backslash": "KEY_BACKSLASH", @@ -610,6 +614,8 @@ class driver(inputDriver): "KEY_COMPOSE": ["Multi_key"], "KEY_PAGEUP": ["Page_Up", "Prior"], "KEY_PAGEDOWN": ["Page_Down", "Next"], + "KEY_MINUS": ["minus", "underscore"], + "KEY_EQUAL": ["equal", "plus"], "KEY_KP0": ["KP_0", "KP_Insert"], "KEY_KP1": ["KP_1", "KP_End"], "KEY_KP2": ["KP_2", "KP_Down"], diff --git a/tests/unit/test_x11_terminal_mode.py b/tests/unit/test_x11_terminal_mode.py index 55f2fdb3..79ed7ae4 100644 --- a/tests/unit/test_x11_terminal_mode.py +++ b/tests/unit/test_x11_terminal_mode.py @@ -79,6 +79,10 @@ def test_x11_key_name_mapping_for_keypad_and_capslock(): assert x11.keysym_name_to_key_name("Prior") == "KEY_PAGEUP" assert x11.keysym_name_to_key_name("a") == "KEY_A" assert x11.keysym_name_to_key_name("F10") == "KEY_F10" + assert x11.keysym_name_to_key_name("plus") == "KEY_EQUAL" + assert x11.keysym_name_to_key_name("+") == "KEY_EQUAL" + assert x11.keysym_name_to_key_name("underscore") == "KEY_MINUS" + assert x11.keysym_name_to_key_name("_") == "KEY_MINUS" @pytest.mark.unit @@ -150,6 +154,11 @@ def test_x11_key_name_to_keysym_names_includes_numlock_aliases(): assert x11.key_name_to_keysym_names("KEY_COMPOSE") == ["Multi_key"] assert "Next" in x11.key_name_to_keysym_names("KEY_PAGEDOWN") assert "Prior" in x11.key_name_to_keysym_names("KEY_PAGEUP") + assert x11.key_name_to_keysym_names("KEY_EQUAL") == ["equal", "plus"] + assert x11.key_name_to_keysym_names("KEY_MINUS") == [ + "minus", + "underscore", + ] @pytest.mark.unit