summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-03-09 09:53:47 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-04-18 13:04:39 +1000
commit2a49ffa3c94819e9f28dd939f23ee8a675258172 (patch)
tree0600422049375b0b629bc2a5bc137ecba1cb5064
parent315aa8444b13f827237674535eb2ad55a2066808 (diff)
Xi: return the bad device ID if a passive grab fails with BadDevice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
-rw-r--r--Xi/xipassivegrab.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 3319ef913..22f905e8f 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -99,7 +99,10 @@ ProcXIPassiveGrabDevice(ClientPtr client)
{
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
if (ret != Success)
+ {
+ client->errorValue = stuff->deviceid;
return ret;
+ }
}
if (stuff->grab_type != XIGrabtypeButton &&