[gtk+] wayland: Leave existing mods on map_virtual_modifiers
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: Leave existing mods on map_virtual_modifiers
- Date: Tue, 19 Apr 2016 19:15:02 +0000 (UTC)
commit deaf664ed23fc346bc8788e6724e179f4590da07
Author: Rui Matos <tiagomatos gmail com>
Date: Tue Apr 19 21:03:45 2016 +0200
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
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 086e4de..a780e9d 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]