diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2016-04-19 21:03:45 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2016-04-19 21:13:45 +0200 |
| commit | 60ba261ed6b5778486f5aac799f1439327e3d526 (patch) | |
| tree | ebeedf8885a99d9d756262f9ccfff8395b5f17f9 | |
| parent | ddde1a58a8f31b5f8fed766b27cd7f88b14a834a (diff) | |
| download | gtk+-60ba261ed6b5778486f5aac799f1439327e3d526.tar.gz | |
wayland: Leave existing mods on map_virtual_modifiers
map_virtual_modifiers() is supposed to add the necessary virtual mods
but otherwise leave the mods that are passed in.
https://bugzilla.gnome.org/show_bug.cgi?id=765270
| -rw-r--r-- | gdk/wayland/gdkkeys-wayland.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c index 32b4809a51..229eedb801 100644 --- a/gdk/wayland/gdkkeys-wayland.c +++ b/gdk/wayland/gdkkeys-wayland.c @@ -421,7 +421,7 @@ gdk_wayland_keymap_map_virtual_modifiers (GdkKeymap *keymap, mapped = xkb_state_serialize_mods (xkb_state, XKB_STATE_MODS_EFFECTIVE); if ((mapped & mods & 0xff) != 0) ret = FALSE; - *state = get_gdk_modifiers (xkb_keymap, mapped); + *state |= get_gdk_modifiers (xkb_keymap, mapped); xkb_state_unref (xkb_state); |