diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-28 15:56:08 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-08-22 15:56:50 +1000 |
| commit | 09496996accfdaf7bc01097a25db400912004d97 (patch) | |
| tree | ddc82529c749d1290b03136deb145a29893c237b /dix/grabs.c | |
| parent | 80c37048539daa1d257d127d66502bde45c97c85 (diff) | |
dix: ignore devices when adding passive core grabs to list (#39545)
Passive core grabs are mostly device-independent. In an MPX scenario, they
may change to reflect whichever master pair activated the grab last. For
adding new grabs to the list, ignore the device for core grabs to return
failures when trying to set the same grab combo twice on a window.
X.Org Bug 39545 <http://bugs.freedesktop.org/show_bug.cgi?id=39545>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'dix/grabs.c')
| -rw-r--r-- | dix/grabs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/grabs.c b/dix/grabs.c index 85ca9eee0..c28356d9b 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -479,7 +479,7 @@ AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab) for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next) { - if (GrabMatchesSecond(pGrab, grab, FALSE)) + if (GrabMatchesSecond(pGrab, grab, (pGrab->grabtype == GRABTYPE_CORE))) { if (CLIENT_BITS(pGrab->resource) != CLIENT_BITS(grab->resource)) { |