diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-02-18 15:49:09 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-02-22 13:19:58 -0800 |
| commit | e40ba5798c367bec584f6437b23d2c5f801fd013 (patch) | |
| tree | 3b047544716a9f4fa6eba3e4d0eff216cf1d274e | |
| parent | 03ef00ae79687046dc9f9987857062a16ff2c2e0 (diff) | |
Xi: assume BadMode for non-BadMatch errors returned from SetDeviceMode.
The XI protocol spec only allows for two errors on the SetDeviceMode
requests: BadMatch or BadMode. BadMode however is a dynamically assigned
extension error and the driver doesn't have access to the actual error
number. Hence, if a SetDeviceMode driver returns an error other than
BadMatch, assume BadMode.
The two exceptions are BadAlloc and BadImplementations, pass these on to the
client (any request is allowed to return either of those).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Xi/setmode.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Xi/setmode.c b/Xi/setmode.c index 51e57675f..ce2ad47c7 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -112,7 +112,17 @@ ProcXSetDeviceMode(ClientPtr client) if (rep.status == Success) dev->valuator->mode = stuff->mode; else if (rep.status != AlreadyGrabbed) + { + switch(rep.status) { + case BadMatch: + case BadImplementation: + case BadAlloc: + break; + default: + rep.status = BadMode; + } return rep.status; + } WriteReplyToClient(client, sizeof(xSetDeviceModeReply), &rep); return Success; |