From cacdb9a74065ccba7d50a82e14abdf04b36c5309 Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Wed, 11 Apr 2012 08:13:17 -0700 Subject: [PATCH] Accept touch sequence for pointer listener after second event delivery This is a bit of unimplemented code for touchscreen pointer emulation. A pointer grabbing client currently never accepts the touch sequence. The sequence must be accepted once any touch-derived event is irrevocably delivered to a client. The first pointer event, derived from a touch begin event, may be caught in a sync grab and then replayed. This is essentially a revocable delivery of an event. Thus, we must wait till a non-begin event is delivered. Signed-off-by: Chase Douglas Reviewed-by: Peter Hutterer --- Xi/exevents.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Xi/exevents.c b/Xi/exevents.c index ab2f044d90..4629df3608 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -1466,6 +1466,12 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, if (!deliveries) DeliverOneGrabbedEvent(ptrev, dev, grab->grabtype); + /* We must accept the touch sequence once a pointer listener has + * received one event past ButtonPress. */ + if (deliveries && ev->any.type != ET_TouchBegin && + !(ev->device_event.flags & TOUCH_CLIENT_ID)) + TouchListenerAcceptReject(dev, ti, 0, XIAcceptTouch); + if (ev->any.type == ET_TouchEnd && !dev->button->buttonsDown && dev->deviceGrab.fromPassiveGrab && GrabIsPointerGrab(grab)) {