diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-14 11:34:15 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-01-08 12:35:42 +1000 |
| commit | d5142c4e9db6175c5258749acc314833c40ac2fb (patch) | |
| tree | e264c6088ce6e16ebe4ebd9cd12a3bcb82c165a0 | |
| parent | 7800cf99f52081b7f6b8870d430730c595ffca60 (diff) | |
dix: don't allow overriding a grab with a different type of grab (#58255)
If a client has a core grab, don't allow re-grabbing with type XI2, etc.
This was the intent of the original commit
xorg-server-1.5.99.1-782-g09f9a86, but ineffective.
X.Org Bug 58255 <http://bugs.freedesktop.org/show_bug.cgi?id=58255>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit dd3242c87a0a58cba055eb99c0c3fcf03153e4b8)
| -rw-r--r-- | dix/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c index ddb5b343d..bf6eef2ed 100644 --- a/dix/events.c +++ b/dix/events.c @@ -5027,7 +5027,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev, grab = grabInfo->grab; if (grab && grab->grabtype != grabtype) *status = AlreadyGrabbed; - if (grab && !SameClient(grab, client)) + else if (grab && !SameClient(grab, client)) *status = AlreadyGrabbed; else if ((!pWin->realized) || (confineTo && |