From 02d1116e7eb84068fa32477f1640d29b0a81b638 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Jan 2010 16:35:36 +1000 Subject: [PATCH] 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 Reviewed-by: Dan Nicholson --- Xi/setmode.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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;