From 55747d256d759850141e4a9c4dec965616a31dc8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Sep 2009 16:27:54 +1000 Subject: input: define server-supported protocol versions in one single file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit include/protocol-versions.h specifies each extension version as supported by the server and sent back on the wire to the client. This fixes up several issues with the server potentially reporting a higher version of the protocol if recompiled against a newer version of the protocol. Signed-off-by: Peter Hutterer Acked-by: Rémi Cardona Acked-by: Julien Cristau --- xfixes/xfixes.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'xfixes') diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index 25c92ea93..fa360b88e 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -52,13 +52,11 @@ #endif #include "xfixesint.h" - +#include "protocol-versions.h" /* * Must use these instead of the constants from xfixeswire.h. They advertise * what we implement, not what the protocol headers define. */ -#define SERVER_XFIXES_MAJOR 4 -#define SERVER_XFIXES_MINOR 0 static unsigned char XFixesReqCode; int XFixesEventBase; @@ -80,16 +78,16 @@ ProcXFixesQueryVersion(ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - if (stuff->majorVersion < SERVER_XFIXES_MAJOR) { + if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = SERVER_XFIXES_MAJOR; - if (stuff->majorVersion == SERVER_XFIXES_MAJOR && - stuff->minorVersion < SERVER_XFIXES_MINOR) + rep.majorVersion = SERVER_XFIXES_MAJOR_VERSION; + if (stuff->majorVersion == SERVER_XFIXES_MAJOR_VERSION && + stuff->minorVersion < SERVER_XFIXES_MINOR_VERSION) rep.minorVersion = stuff->minorVersion; else - rep.minorVersion = SERVER_XFIXES_MINOR; + rep.minorVersion = SERVER_XFIXES_MINOR_VERSION; } pXFixesClient->major_version = rep.majorVersion; pXFixesClient->minor_version = rep.minorVersion; -- cgit v1.2.3