frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Peter Hutterer 2013-04-24 14:40:31 +10:00
parent 34c9b39d99
commit 5b00fc5227
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/dispatch.c
View File

@ -3399,6 +3399,7 @@ CloseDownClient(ClientPtr client)
clientinfo.setup = (xConnSetup *) NULL; clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer) &clientinfo); CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
} }
TouchListenerGone(client->clientAsMask);
FreeClientResources(client); FreeClientResources(client);
/* Disable client ID tracking. This must be done after /* Disable client ID tracking. This must be done after
* ClientStateCallback. */ * ClientStateCallback. */

3
dix/grabs.c
View File

@ -257,9 +257,6 @@ FreeGrab(GrabPtr pGrab)
{ {
BUG_RETURN(!pGrab); BUG_RETURN(!pGrab);
if (pGrab->grabtype == XI2 && pGrab->type == XI_TouchBegin)
TouchListenerGone(pGrab->resource);
free(pGrab->modifiersDetail.pMask); free(pGrab->modifiersDetail.pMask);
free(pGrab->detail.pMask); free(pGrab->detail.pMask);

4
dix/touch.c
View File

@ -989,11 +989,11 @@ TouchListenerGone(XID resource)
continue; continue;
for (j = 0; j < ti->num_listeners; j++) { for (j = 0; j < ti->num_listeners; j++) {
if (ti->listeners[j].listener != resource) if (CLIENT_BITS(ti->listeners[j].listener) != resource)
continue; continue;
nev = GetTouchOwnershipEvents(events, dev, ti, XIRejectTouch, nev = GetTouchOwnershipEvents(events, dev, ti, XIRejectTouch,
resource, 0); ti->listeners[j].listener, 0);
for (k = 0; k < nev; k++) for (k = 0; k < nev; k++)
mieqProcessDeviceEvent(dev, events + k, NULL); mieqProcessDeviceEvent(dev, events + k, NULL);