summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2011-11-29 15:45:36 -0800
committerChase Douglas <chase.douglas@canonical.com>2011-11-29 17:54:49 -0800
commit42d871d7627321bc0733c3d430058eb8463d3013 (patch)
tree1d94b2d3862ae5f7cb2cb8c7c2521e60956a3190
parent3986d6f95d2b4f896728259c1faf5a2a11520c55 (diff)
Don't end a pointer emulated touch when there are no touch listenersmultitouch-devel
PE touches need to be ended later on in the event processing stack. This commit will leave these touches hanging for now. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--Xi/exevents.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index f64652402..d567673d9 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1754,7 +1754,8 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
TouchCopyValuatorData(&ev->device_event, ti);
DeliverTouchEvents(dev, ti, (InternalEvent *) ev, 0);
if (ev->any.type == ET_TouchEnd &&
- !(ev->device_event.flags & TOUCH_PENDING_END))
+ !(ev->device_event.flags & TOUCH_PENDING_END) &&
+ !ti->emulate_pointer)
TouchEndTouch(dev, ti);
}
}