diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-04-24 14:40:31 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-05-10 14:32:38 +1000 |
| commit | 5b00fc52270e9cfdfe7ac1838a21defe50fc3d31 (patch) | |
| tree | c7e7d0deb2b6dea4856df4519d920c4629d0197c | |
| parent | 34c9b39d9937c2e19c2dffc9748605f90d40f965 (diff) | |
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>
| -rw-r--r-- | dix/dispatch.c | 1 | ||||
| -rw-r--r-- | dix/grabs.c | 3 | ||||
| -rw-r--r-- | dix/touch.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 1363f223d..51d0de25f 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -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. */ diff --git a/dix/grabs.c b/dix/grabs.c index f46a6b23a..b254ddcf1 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -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); diff --git a/dix/touch.c b/dix/touch.c index 009991433..110b1cce2 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -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); |