UI: ignore scroll lock in hotkeys/keyboard handling

Also warn if a hotkey uses a modifier that is masked out.
black-sliver · Sep 3, 2024 · feaf1f4 · feaf1f4
1 parent 8f51c4b
commit feaf1f4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/uilib/ui.cpp b/src/uilib/ui.cpp
@@ -250,12 +250,17 @@ bool Ui::render()
                     EVENT_LOCK(this);
                     if (!ev.key.repeat) {
                         int key = (int)ev.key.keysym.sym;
-                        int mod = (int)(ev.key.keysym.mod & ~(KMOD_NUM | KMOD_CAPS));
+                        const uint16_t mask = KMOD_CTRL | KMOD_SHIFT | KMOD_GUI;
+                        int mod = (int)(ev.key.keysym.mod & mask);
                         for (const auto& hotkey: _hotkeys) {
                             if (key == hotkey.key && mod == hotkey.mod) {
                                 onHotkey.emit(this, hotkey);
                                 break;
                             }
+                            if (hotkey.mod & ~mask) {
+                                fprintf(stderr, "Invalid hotkey %d+%d: modifier masked out\n",
+                                    hotkey.key, hotkey.mod);
+                            }
                         }
                     }
                     EVENT_UNLOCK(this);