Move TouchListenerGone call to CloseDownClient
TouchListenerGone cleans up if a client disappears. Having this in FreeGrab() triggers cyclic removal of grabs, emitting wrong events. In particular, it would clean up a passive grab record while that grab is active. Move it to CloseDownClient() instead, cleaning up before we go. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
34c9b39d99
commit
5b00fc5227
|
@ -3399,6 +3399,7 @@ CloseDownClient(ClientPtr client)
|
|||
clientinfo.setup = (xConnSetup *) NULL;
|
||||
CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
|
||||
}
|
||||
TouchListenerGone(client->clientAsMask);
|
||||
FreeClientResources(client);
|
||||
/* Disable client ID tracking. This must be done after
|
||||
* ClientStateCallback. */
|
||||
|
|
|
@ -257,9 +257,6 @@ FreeGrab(GrabPtr pGrab)
|
|||
{
|
||||
BUG_RETURN(!pGrab);
|
||||
|
||||
if (pGrab->grabtype == XI2 && pGrab->type == XI_TouchBegin)
|
||||
TouchListenerGone(pGrab->resource);
|
||||
|
||||
free(pGrab->modifiersDetail.pMask);
|
||||
free(pGrab->detail.pMask);
|
||||
|
||||
|
|
|
@ -989,11 +989,11 @@ TouchListenerGone(XID resource)
|
|||
continue;
|
||||
|
||||
for (j = 0; j < ti->num_listeners; j++) {
|
||||
if (ti->listeners[j].listener != resource)
|
||||
if (CLIENT_BITS(ti->listeners[j].listener) != resource)
|
||||
continue;
|
||||
|
||||
nev = GetTouchOwnershipEvents(events, dev, ti, XIRejectTouch,
|
||||
resource, 0);
|
||||
ti->listeners[j].listener, 0);
|
||||
for (k = 0; k < nev; k++)
|
||||
mieqProcessDeviceEvent(dev, events + k, NULL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user