p
/
tdv
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sdgui: ignore Caps Lock for accelerators

This commit is contained in:
Přemysl Eric Janouch 2021-10-20 08:58:53 +02:00
parent 85a30d20c3
commit e461189f0e
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sdgui.c
View File

@ -171,7 +171,9 @@ accelerate_hamburger (GdkEvent *event)
GdkModifierType mods = 0; GdkModifierType mods = 0;
gtk_accelerator_parse (accelerator, &key, &mods); gtk_accelerator_parse (accelerator, &key, &mods);
g_free (accelerator); g_free (accelerator);
if (!key || event->key.keyval != key || event->key.state != mods)
guint mask = gtk_accelerator_get_default_mod_mask ();
if (!key || event->key.keyval != key || (event->key.state & mask) != mods)
return FALSE; return FALSE;
gtk_button_clicked (GTK_BUTTON (g.hamburger)); gtk_button_clicked (GTK_BUTTON (g.hamburger));
@ -187,7 +189,8 @@ on_key_press (G_GNUC_UNUSED GtkWidget *widget, GdkEvent *event,
if (accelerate_hamburger (event)) if (accelerate_hamburger (event))
return TRUE; return TRUE;
if (event->key.state == GDK_CONTROL_MASK) guint mods = event->key.state & gtk_accelerator_get_default_mod_mask ();
if (mods == GDK_CONTROL_MASK)
{ {
// Can't use gtk_widget_add_accelerator() to change-current-page(-1/+1) // Can't use gtk_widget_add_accelerator() to change-current-page(-1/+1)
// because that signal has arguments, which cannot be passed. // because that signal has arguments, which cannot be passed.
@ -202,7 +205,7 @@ on_key_press (G_GNUC_UNUSED GtkWidget *widget, GdkEvent *event,
return TRUE; return TRUE;
} }
} }
if (event->key.state == GDK_MOD1_MASK) if (mods == GDK_MOD1_MASK)
{ {
if (event->key.keyval >= GDK_KEY_0 if (event->key.keyval >= GDK_KEY_0
&& event->key.keyval <= GDK_KEY_9) && event->key.keyval <= GDK_KEY_9)