aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/touch.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-29 08:50:02 +0200
committermarha <marha@users.sourceforge.net>2013-07-29 08:50:02 +0200
commit4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (patch)
tree30b754ce6f4bb714f948a1bcec554335d402e42b /xorg-server/dix/touch.c
parent8647aa1a5029fcd96f134103331ddf3c21bc0a0b (diff)
downloadvcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.tar.gz
vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.tar.bz2
vcxsrv-4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a.zip
libX11 mesa xserver git update 29 July 2013
xserver commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 libX11 commit 208e586c808e88a2ee819e4450dc27f557afc2bf mesa commit e847b5ae066bf9a209dad482fcc664f944983633
Diffstat (limited to 'xorg-server/dix/touch.c')
-rw-r--r--xorg-server/dix/touch.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/dix/touch.c b/xorg-server/dix/touch.c
index a4b6d7eea..a7ea213ba 100644
--- a/xorg-server/dix/touch.c
+++ b/xorg-server/dix/touch.c
@@ -895,8 +895,7 @@ TouchAddActiveGrabListener(DeviceIntPtr dev, TouchPointInfoPtr ti,
if (!ti->emulate_pointer &&
grab->grabtype == XI2 &&
- (grab->type != XI_TouchBegin && grab->type != XI_TouchEnd &&
- grab->type != XI_TouchUpdate))
+ !xi2mask_isset(grab->xi2mask, dev, XI_TouchBegin))
return;
TouchAddGrabListener(dev, ti, ev, grab);