diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-05-15 13:17:25 -0700 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-06-07 11:01:15 -0700 |
| commit | 90dcf889fcf82176c4a3aefa595efb53fc04e4d5 (patch) | |
| tree | bc67cf9d3018e5ba0a8117e5c9e4fb934e00a35d | |
| parent | 058d3a98cc9ddeeb70201bed2388835b68da705e (diff) | |
End physically active touches when device is disabledintegration-tests
Otherwise:
* We can't end the touches while device is disabled
* New touches after enabling the device may erroneously be mapped to old
logical touches
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/devices.c | 1 | ||||
| -rw-r--r-- | dix/touch.c | 28 | ||||
| -rw-r--r-- | include/input.h | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c index 0c62a012d..dc5f51cf2 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -437,6 +437,7 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent) if (*prev != dev) return FALSE; + TouchEndPhysicallyActiveTouches(dev); ReleaseButtonsAndKeys(dev); SyncRemoveDeviceIdleTime(dev->idle_counter); dev->idle_counter = NULL; diff --git a/dix/touch.c b/dix/touch.c index 401cb981a..c9f72a923 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -1028,3 +1028,31 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, return TouchListenerAcceptReject(dev, ti, i, mode); } + +/** + * End physically active touches for a device. + */ +void +TouchEndPhysicallyActiveTouches(DeviceIntPtr dev) +{ + InternalEvent *eventlist = InitEventList(GetMaximumEventsNum()); + int i; + + OsBlockSignals(); + mieqProcessInputEvents(); + for (i = 0; i < dev->last.num_touches; i++) { + DDXTouchPointInfoPtr ddxti = dev->last.touches + i; + + if (ddxti->active) { + int j; + int nevents = GetTouchEvents(eventlist, dev, ddxti->ddx_id, + XI_TouchEnd, 0, NULL); + + for (j = 0; j < nevents; j++) + mieqProcessDeviceEvent(dev, eventlist + j, NULL); + } + } + OsReleaseSignals(); + + FreeEventList(eventlist, GetMaximumEventsNum()); +} diff --git a/include/input.h b/include/input.h index bcf98a63e..c702929f3 100644 --- a/include/input.h +++ b/include/input.h @@ -579,6 +579,7 @@ extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti, int listener, int mode); extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, uint32_t touchid, Window grab_window, XID *error); +extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev); /* misc event helpers */ extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients); |