summaryrefslogtreecommitdiff
path: root/gdk/wayland/gdkkeys-wayland.c
diff options
context:
space:
mode:
authorRui Matos <tiagomatos@gmail.com>2016-04-19 21:03:45 +0200
committerRui Matos <tiagomatos@gmail.com>2016-04-19 21:14:20 +0200
commitdeaf664ed23fc346bc8788e6724e179f4590da07 (patch)
treeaf12e5444be08345255c5d4213278cbe37e8065a /gdk/wayland/gdkkeys-wayland.c
parentb8a86e6ca4fd3cf64ae0c2d014b4355dc9315146 (diff)
downloadgtk+-deaf664ed23fc346bc8788e6724e179f4590da07.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
Diffstat (limited to 'gdk/wayland/gdkkeys-wayland.c')
-rw-r--r--gdk/wayland/gdkkeys-wayland.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index 086e4de956..a780e9d9c2 100644
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -424,7 +424,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);