summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-03 16:19:10 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2012-02-08 18:04:15 +1000
commitb0c54856df71f9cabf9dad176fdade960ef8c5d9 (patch)
treeb7ae2ced727fd9b007bbec85fa608eb0f6a4031f
parent656ab879f20892975510723ce8fe78faf64aadb4 (diff)
Implement early touch reject
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/touch.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/dix/touch.c b/dix/touch.c
index 7daf81b26..f55bb8c77 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -1019,9 +1019,16 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
if (i == ti->num_listeners)
return BadAccess;
- /* FIXME: Implement early accept/reject */
if (i > 0)
+ {
+ if (mode == XIRejectTouch)
+ {
+ TouchRejected(dev, ti, ti->listeners[i].listener, NULL);
+ return Success;
+ }
+ /* FIXME: Implement early accept */
return BadAccess;
+ }
nev = GetTouchOwnershipEvents(events, dev, ti, mode,
ti->listeners[0].listener, 0);