aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/touch.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-12-18 10:05:10 +0100
committermarha <marha@users.sourceforge.net>2012-12-18 10:05:10 +0100
commit1d46380a9bb69897acdadf71b80cd759b0493fad (patch)
treed8517cf38e0ac8a6ec098d92293e262e99a4c7b9 /xorg-server/dix/touch.c
parent18d9ddc200055ccf6bf285e578e4724159ff69d5 (diff)
parent293fd0043af7e861c9c540bebc44630d0da0bf9b (diff)
downloadvcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.gz
vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.bz2
vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 18 oct 2012
Diffstat (limited to 'xorg-server/dix/touch.c')
-rw-r--r--xorg-server/dix/touch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/dix/touch.c b/xorg-server/dix/touch.c
index 29ba17194..d890b6227 100644
--- a/xorg-server/dix/touch.c
+++ b/xorg-server/dix/touch.c
@@ -915,6 +915,8 @@ TouchRemovePointerGrab(DeviceIntPtr dev)
ti = TouchFindByClientID(dev, ev->touchid);
if (!ti)
return;
+
+ /* FIXME: missing a bit of code here... */
}
/* As touch grabs don't turn into active grabs with their own resources, we
@@ -987,8 +989,6 @@ TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti, int listener,
for (i = 0; i < nev; i++)
mieqProcessDeviceEvent(dev, events + i, NULL);
- ProcessInputEvents();
-
FreeEventList(events, GetMaximumEventsNum());
return nev ? Success : BadMatch;