randr: reply with the server or client version, whichever is lower.

Signed-off-by: Peter Hutterer <[email protected]>
juergbi · Sep 20, 2009 · 00dfe69 · 00dfe69
1 parent 8b75d0f
commit 00dfe69
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
@@ -48,12 +48,18 @@ ProcRRQueryVersion (ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    /*
-     * Report the current version; the current
-     * spec says they're all compatible after 1.0
-     */
-    rep.majorVersion = SERVER_RANDR_MAJOR;
-    rep.minorVersion = SERVER_RANDR_MINOR;
+
+    if ((stuff->majorVersion * 1000 + stuff->minorVersion) <
+        (SERVER_RANDR_MAJOR * 1000 + SERVER_RANDR_MINOR))
+    {
+	rep.majorVersion = stuff->majorVersion;
+	rep.minorVersion = stuff->minorVersion;
+    } else
+    {
+        rep.majorVersion = SERVER_RANDR_MAJOR;
+        rep.minorVersion = SERVER_RANDR_MINOR;
+    }
+
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);
     	swapl(&rep.length, n);