From 6ea76c550486bd17eb31f43757030fb44bdf1eab Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 4 Jun 2009 12:55:59 +1000 Subject: [PATCH] Xi: reply with the XI2 version that is supported by both client and server. XIQueryVersion must return the client's version if the client's version is lower than or equal to the server's version, or the server's version otherwise. Signed-off-by: Peter Hutterer --- Xi/queryversion.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Xi/queryversion.c b/Xi/queryversion.c index 3e0644be1..f96c6f019 100644 --- a/Xi/queryversion.c +++ b/Xi/queryversion.c @@ -43,6 +43,7 @@ #include "exglobals.h" #include "exevents.h" #include "queryversion.h" +#include "misc.h" extern XExtensionVersion XIVersion; /* defined in getvers.c */ /** @@ -56,22 +57,26 @@ ProcXIQueryVersion(ClientPtr client) { xXIQueryVersionReply rep; XIClientPtr pXIClient; + int major, minor; REQUEST(xXIQueryVersionReq); REQUEST_SIZE_MATCH(xXIQueryVersionReq); pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey); - pXIClient->major_version = stuff->major_version; - pXIClient->minor_version = stuff->minor_version; + major = min(XIVersion.major_version, stuff->major_version); + minor = min(XIVersion.minor_version, stuff->minor_version); + + pXIClient->major_version = major; + pXIClient->minor_version = minor; memset(&rep, 0, sizeof(xXIQueryVersionReply)); rep.repType = X_Reply; rep.RepType = X_XIQueryVersion; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.major_version = XIVersion.major_version; - rep.minor_version = XIVersion.minor_version; + rep.major_version = major; + rep.minor_version = minor; WriteReplyToClient(client, sizeof(xXIQueryVersionReply), &rep);