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

gdk: exclude MOD1 from the virtual modifier mapping

Browse Source 
which effectively nails down the MOD1 == ALT assumption that is valid
in all other parts of GTK+. After the modifier abstraction fixes for
OSX, the virtual mapping is now (correctly) used in more places, and
caused problems with the common default PC keyboard layout on X11 that
colocates ALT and META on the same key.
This commit is contained in:
Michael Natterer 2011-11-07 20:09:00 +01:00
parent d80953666e
commit ac943bf69a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/x11/gdkkeys-x11.c
View File

@ -1489,13 +1489,12 @@ _gdk_x11_keymap_add_virt_mods (GdkKeymap *keymap,
keymap = GET_EFFECTIVE_KEYMAP (keymap); keymap = GET_EFFECTIVE_KEYMAP (keymap);
keymap_x11 = GDK_X11_KEYMAP (keymap); keymap_x11 = GDK_X11_KEYMAP (keymap);
for (i = 3; i < 8; i++) /* See comment in add_virtual_modifiers() */
for (i = 4; i < 8; i++)
{ {
if ((1 << i) & *modifiers) if ((1 << i) & *modifiers)
{ {
if (keymap_x11->modmap[i] & GDK_MOD1_MASK) if (keymap_x11->modmap[i] & GDK_SUPER_MASK)
*modifiers |= GDK_MOD1_MASK;
else if (keymap_x11->modmap[i] & GDK_SUPER_MASK)
*modifiers |= GDK_SUPER_MASK; *modifiers |= GDK_SUPER_MASK;
else if (keymap_x11->modmap[i] & GDK_HYPER_MASK) else if (keymap_x11->modmap[i] & GDK_HYPER_MASK)
*modifiers |= GDK_HYPER_MASK; *modifiers |= GDK_HYPER_MASK;
@ -1515,12 +1514,16 @@ gdk_x11_keymap_add_virtual_modifiers (GdkKeymap *keymap,
keymap = GET_EFFECTIVE_KEYMAP (keymap); keymap = GET_EFFECTIVE_KEYMAP (keymap);
keymap_x11 = GDK_X11_KEYMAP (keymap); keymap_x11 = GDK_X11_KEYMAP (keymap);
for (i = 3; i < 8; i++) /* This loop used to start at 3, which included MOD1 in the
* virtual mapping. However, all of GTK+ treats MOD1 as a
* synonym for Alt, and does not expect it to be mapped around,
* therefore it's more sane to simply treat MOD1 like SHIFT and
* CONTROL, which are not mappable either.
*/
for (i = 4; i < 8; i++)
{ {
if ((1 << i) & *state) if ((1 << i) & *state)
{ {
if (keymap_x11->modmap[i] & GDK_MOD1_MASK)
*state |= GDK_MOD1_MASK;
if (keymap_x11->modmap[i] & GDK_SUPER_MASK) if (keymap_x11->modmap[i] & GDK_SUPER_MASK)
*state |= GDK_SUPER_MASK; *state |= GDK_SUPER_MASK;
if (keymap_x11->modmap[i] & GDK_HYPER_MASK) if (keymap_x11->modmap[i] & GDK_HYPER_MASK)
@ -1589,7 +1592,8 @@ gdk_x11_keymap_map_virtual_modifiers (GdkKeymap *keymap,
{ {
if (*state & vmods[j]) if (*state & vmods[j])
{ {
for (i = 3; i < 8; i++) /* See comment in add_virtual_modifiers() */
for (i = 4; i < 8; i++)
{ {
if (keymap_x11->modmap[i] & vmods[j]) if (keymap_x11->modmap[i] & vmods[j])
{ {