brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend: Use the most recent event time on replayed touch events

Browse Source 
When a touch sequence is passively grabbed and later rejected, events
will be replayed on the next client in propagation order, although those
events (either transformed to pointer events or not) will contain the
original timestamps, this will make grabs fail with InvalidTime if triggered
from the replayed ButtonPress/TouchBegin handler.

In order to work around this, store the most recent event time (presumably
gotten from the XI_TouchEnd caused by the passive grab being rejected), and
use that time on the events being replayed afterwards and grabs, so we don't
possibly fail with InvalidTime if those events result in a compositor grab.
This commit is contained in:
Carlos Garnacho 2014-06-19 23:16:50 +02:00 committed by Jasper St. Pierre
parent 23b074481a
commit 704cae1de3
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backends/x11/meta-backend-x11.c
View File

@ -51,6 +51,7 @@ struct _MetaBackendX11Private
int xinput_opcode; int xinput_opcode;
int xinput_event_base; int xinput_event_base;
int xinput_error_base; int xinput_error_base;
Time latest_evtime;
}; };
typedef struct _MetaBackendX11Private MetaBackendX11Private; typedef struct _MetaBackendX11Private MetaBackendX11Private;
@ -71,6 +72,7 @@ static void
translate_device_event (MetaBackendX11 *x11, translate_device_event (MetaBackendX11 *x11,
XIDeviceEvent *device_event) XIDeviceEvent *device_event)
{ {
MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
Window stage_window = meta_backend_x11_get_xwindow (x11); Window stage_window = meta_backend_x11_get_xwindow (x11);
if (device_event->event != stage_window) if (device_event->event != stage_window)
@ -88,6 +90,21 @@ translate_device_event (MetaBackendX11 *x11,
device_event->event_x = device_event->root_x; device_event->event_x = device_event->root_x;
device_event->event_y = device_event->root_y; device_event->event_y = device_event->root_y;
} }
if (!device_event->send_event && device_event->time != CurrentTime)
{
if (device_event->time < priv->latest_evtime)
{
/* Emulated pointer events received after XIRejectTouch is received
* on a passive touch grab will contain older timestamps, update those
* so we dont get InvalidTime at grabs.
*/
device_event->time = priv->latest_evtime;
}
/* Update the internal latest evtime, for any possible later use */
priv->latest_evtime = device_event->time;
}
} }
/* Clutter makes the assumption that there is only one X window /* Clutter makes the assumption that there is only one X window
@ -313,6 +330,9 @@ meta_backend_x11_grab_device (MetaBackend *backend,
XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits }; XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
int ret; int ret;
if (timestamp != CurrentTime)
timestamp = MAX (timestamp, priv->latest_evtime);
XISetMask (mask.mask, XI_ButtonPress); XISetMask (mask.mask, XI_ButtonPress);
XISetMask (mask.mask, XI_ButtonRelease); XISetMask (mask.mask, XI_ButtonRelease);
XISetMask (mask.mask, XI_Enter); XISetMask (mask.mask, XI_Enter);