callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Fix gdk_keymap_translate_keyboard_state

Browse Source 
I was confusing indices and masks here, which made the modifier
translation go wrong. With this commit, accelerators work.
This commit is contained in:
Matthias Clasen 2013-04-06 17:03:27 -04:00
parent 905e4a58bd
commit acf56b6cb3
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gdk/wayland/gdkkeys-wayland.c
View File

@ -240,21 +240,21 @@ get_xkb_modifiers (struct xkb_keymap *xkb_keymap,
guint32 mods = 0; guint32 mods = 0;
if (state & GDK_SHIFT_MASK) if (state & GDK_SHIFT_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT);
if (state & GDK_LOCK_MASK) if (state & GDK_LOCK_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS);
if (state & GDK_CONTROL_MASK) if (state & GDK_CONTROL_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL);
if (state & GDK_MOD1_MASK) if (state & GDK_MOD1_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT);
if (state & GDK_MOD2_MASK) if (state & GDK_MOD2_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, "Mod2"); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2");
if (state & GDK_MOD3_MASK) if (state & GDK_MOD3_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, "Mod3"); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3");
if (state & GDK_MOD4_MASK) if (state & GDK_MOD4_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO);
if (state & GDK_MOD5_MASK) if (state & GDK_MOD5_MASK)
mods |= xkb_keymap_mod_get_index (xkb_keymap, "Mod5"); mods |= 1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5");
return mods; return mods;
} }
@ -265,27 +265,26 @@ get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
{ {
GdkModifierType state = 0; GdkModifierType state = 0;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT)) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_SHIFT)))
state |= GDK_SHIFT_MASK; state |= GDK_SHIFT_MASK;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS)) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CAPS)))
state |= GDK_LOCK_MASK; state |= GDK_LOCK_MASK;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL)) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_CTRL)))
state |= GDK_CONTROL_MASK; state |= GDK_CONTROL_MASK;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT)) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_ALT)))
state |= GDK_MOD1_MASK; state |= GDK_MOD1_MASK;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, "Mod2")) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod2")))
state |= GDK_MOD2_MASK; state |= GDK_MOD2_MASK;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, "Mod3")) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3")))
state |= GDK_MOD3_MASK; state |= GDK_MOD3_MASK;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO)) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO)))
state |= GDK_MOD4_MASK; state |= GDK_MOD4_MASK;
if (mods & xkb_keymap_mod_get_index (xkb_keymap, "Mod5")) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5")))
state |= GDK_MOD5_MASK; state |= GDK_MOD5_MASK;
return state; return state;
} }
static gboolean static gboolean
gdk_wayland_keymap_translate_keyboard_state (GdkKeymap *keymap, gdk_wayland_keymap_translate_keyboard_state (GdkKeymap *keymap,
guint hardware_keycode, guint hardware_keycode,