fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-07 02:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xi: assume BadMode for non-BadMatch errors returned from SetDeviceMode.

Browse source 
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>
(cherry picked from commit e40ba5798c)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2010-02-18 15:49:09 +10:00
parent 5ac8298469
commit c8dd981c7f
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Xi/setmode.c
View file

@ -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;