summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2011-12-21 01:08:40 +0100
committerChase Douglas <chase.douglas@canonical.com>2011-12-21 10:34:13 -0800
commit792fb55c054d67b43daceaac0868d914fb4456bd (patch)
tree4f2b58870d23129442f326b4d7f5a0498ef5675f
parentcfe7ad97e55254540307ce1e508fffbc2207aed7 (diff)
dix: fix xi2 mask/filter when delivering grabbed events
Signed-off-by: Carlos Garnacho <carlosg@gnome.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/events.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/events.c b/dix/events.c
index d80290360..536026716 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4192,8 +4192,8 @@ DeliverOneGrabbedEvent(InternalEvent *event, DeviceIntPtr dev, enum InputLevel l
if (rc == Success)
{
int evtype = xi2_get_type(xE);
- mask = xi2mask_isset(grab->xi2mask, dev, evtype);
- filter = 1;
+ mask = GetXI2MaskByte(grab->xi2mask, dev, evtype);
+ filter = GetEventFilter(dev, xE);
}
break;
case XI: