AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

events: Stop doing elaborate virtual modifier handling

Browse Source 
These are going away in the GdkModifierType cleanup.
Just compare the modifiers we got.
This commit is contained in:
Matthias Clasen 2020-04-05 10:23:18 -04:00
parent be2a0971c2
commit 5ce05a8fd0
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdk/gdkevents.c
View File

@ -2191,9 +2191,6 @@ gdk_event_matches (GdkEvent *event,
GdkModifierType consumed_modifiers; GdkModifierType consumed_modifiers;
GdkModifierType shift_group_mask; GdkModifierType shift_group_mask;
gboolean group_mod_is_accel_mod = FALSE; gboolean group_mod_is_accel_mod = FALSE;
const GdkModifierType xmods = GDK_MOD2_MASK|GDK_MOD3_MASK|GDK_MOD4_MASK|GDK_MOD5_MASK;
const GdkModifierType vmods = GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK;
GdkModifierType mods;
if (gdk_event_get_event_type (event) != GDK_KEY_PRESS) if (gdk_event_get_event_type (event) != GDK_KEY_PRESS)
return GDK_EVENT_MATCH_NONE; return GDK_EVENT_MATCH_NONE;
@ -2224,13 +2221,7 @@ gdk_event_matches (GdkEvent *event,
if (mask & shift_group_mask) if (mask & shift_group_mask)
group_mod_is_accel_mod = TRUE; group_mod_is_accel_mod = TRUE;
gdk_keymap_map_virtual_modifiers (keymap, &mask); if ((modifiers & ~consumed_modifiers & mask) == (state & ~consumed_modifiers & mask))
gdk_keymap_add_virtual_modifiers (keymap, &state);
mods = modifiers;
if (gdk_keymap_map_virtual_modifiers (keymap, &mods) &&
((mods & ~consumed_modifiers & mask & ~vmods) == (state & ~consumed_modifiers & mask & ~vmods) ||
(mods & ~consumed_modifiers & mask & ~xmods) == (state & ~consumed_modifiers & mask & ~xmods)))
{ {
/* modifier match */ /* modifier match */
GdkKeymapKey *keys; GdkKeymapKey *keys;