diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2010-12-28 12:13:29 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2011-01-06 17:10:41 +0000 |
| commit | 30c8c7a86310139e79c9698caee21b3bd51936bd (patch) | |
| tree | d9538a1bb03dff7c97b15703bd81752f1536dc88 | |
| parent | 690476250f58616d5156317e01ba547497f4331a (diff) | |
Input: Handle grabs with no Xi 1.x equivalent
Don't try to search for an Xi 1.x grab in CheckPassiveGrabsOnWindow for
events with no Xi 1.x equivalent.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | dix/events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/events.c b/dix/events.c index 29033e2e5..45d9eabea 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3415,9 +3415,9 @@ CheckPassiveGrabsOnWindow( tempGrab.detail.exact = event->detail.key; if (!match) { - tempGrab.type = GetXIType((InternalEvent*)event); tempGrab.grabtype = GRABTYPE_XI; - if (GrabMatchesSecond(&tempGrab, grab, FALSE)) + if ((tempGrab.type = GetXIType((InternalEvent*)event)) && + (GrabMatchesSecond(&tempGrab, grab, FALSE))) match = XI_MATCH; } |