Merge pull request #812 from Gutawer/gtk_input_fix

Gtk: Fix some keys not being usable with modifiers
snes9xgit · Jan 27, 2023 · f619764 · f619764
2 parents a069749 + 7321eb3
commit f619764
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/gtk/src/gtk_binding.cpp b/gtk/src/gtk_binding.cpp
@@ -17,7 +17,22 @@ Binding::Binding()
 
 Binding::Binding(GdkEventKey *event)
 {
-    event->keyval = gdk_keyval_to_lower(event->keyval);
+    GdkKeymapKey* keys;
+    guint* keyvals;
+    int n_entries;
+
+    gdk_keymap_get_entries_for_keycode(
+        gdk_keymap_get_for_display(top_level->window->get_display()->gobj()),
+        event->hardware_keycode,
+        &keys,
+        &keyvals,
+        &n_entries
+    );
+    event->keyval = keyvals[0];
+
+    g_free(keys);
+    g_free(keyvals);
+
     value = BINDING_KEY | (event->keyval & BINDING_KEY_MASK);
 
     /* Strip modifiers from modifiers */