diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-28 13:04:36 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-07-17 14:35:33 +1000 |
| commit | 18346911ab0ce1ad66986b83f9afefadec25555e (patch) | |
| tree | 221f3ec6c8651144b37706f00667e3529b232604 | |
| parent | 000d469dd4d97424c72d82e4383ec295e31ffd34 (diff) | |
Xi: fix lookup in ActivateEarlyAccept
ActivateEarlyAccept() can only be called from a grabbing client, so we can
ignore the rest. And it's easy enough to get the client from that since
9ad0fdb135a1c336771aee1f6eab75a6ad874aff.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 8b0d21044956f3810199d5e2f38ce33069e97be7)
| -rw-r--r-- | Xi/exevents.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index d07581596..180f4b558 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -1039,17 +1039,16 @@ ActivateEarlyAccept(DeviceIntPtr dev, TouchPointInfoPtr ti) int rc; ClientPtr client; XID error; + GrabPtr grab = ti->listeners[0].grab; - rc = dixLookupClient(&client, ti->listeners[0].listener, serverClient, - DixSendAccess); - if (rc != Success) { - ErrorF("[Xi] Failed to lookup early accepting client.\n"); - return; - } + BUG_RETURN(ti->listeners[0].type != LISTENER_GRAB && + ti->listeners[0].type != LISTENER_POINTER_GRAB); + BUG_RETURN(!grab); + + client = rClient(grab); if (TouchAcceptReject(client, dev, XIAcceptTouch, ti->client_id, - ti->listeners[0].window->drawable.id, &error) != - Success) + ti->listeners[0].window->drawable.id, &error) != Success) ErrorF("[Xi] Failed to accept touch grab after early acceptance.\n"); } |