debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter keyboard state against modfifier default mask

Browse source 
The modifier state does in fact incorporate modal keys such as
NumLock. So code assuming that state be 0 if no modifier is
pressed is wrong, if NumLock, CapsLock and the like are active.

The solution is to filter out these modal keys with
gtk_accelerator_get_default_mod_mask(), and compare the result.

This fixes the problem of being unable to type keys used as
single-letter shortcuts.
This commit is contained in:
Enrico Tröger 2010-03-30 00:39:31 +02:00 committed by Christian Dywan
parent 004a347340
commit 05488d8bd3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/midori-browser.c
View file

@ -1784,12 +1784,14 @@ midori_browser_key_press_event (GtkWidget* widget,
{ {
GtkWindow* window = GTK_WINDOW (widget); GtkWindow* window = GTK_WINDOW (widget);
GtkWidgetClass* widget_class; GtkWidgetClass* widget_class;
guint clean_state;
if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))
if (sokoke_window_activate_key (window, event)) if (sokoke_window_activate_key (window, event))
return TRUE; return TRUE;
if (!event->state && gtk_window_propagate_key_event (window, event)) clean_state = event->state & gtk_accelerator_get_default_mod_mask();
if (!clean_state && gtk_window_propagate_key_event (window, event))
return TRUE; return TRUE;
if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))