From 09496996accfdaf7bc01097a25db400912004d97 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 28 Jul 2011 15:56:08 +1000 Subject: [PATCH] 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 Signed-off-by: Peter Hutterer Reviewed-by: Daniel Stone --- dix/grabs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) {