summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2011-12-08 20:21:13 +0100
committerMatthias Clasen <mclasen@redhat.com>2012-02-23 16:46:00 -0500
commit3ccf4e0896085dd932e56e3480e8c289991abd69 (patch)
tree897ee3fe1815812fd964587cf5746941bd8ec87b /gdk
parent5b014bfdfb6481055f9c0a29e5be882be5b8e0ec (diff)
downloadgtk+-3ccf4e0896085dd932e56e3480e8c289991abd69.tar.gz
xi2: Get the effective group state by ORing the XIGroupState values
Diffstat (limited to 'gdk')
-rw-r--r--gdk/x11/gdkdevice-xi2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 9eecb3c779..bc6261be6f 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -742,7 +742,7 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
{
gint group;
- group = group_state->base + group_state->latched + group_state->locked;
+ group = group_state->base | group_state->latched | group_state->locked;
/* FIXME: do we need the XKB complications for this ? */
group = CLAMP(group, 0, 3);