]> diplodocus.org Git - xorg-xinput/commitdiff
Announce support for XI 2.0 to the server.
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 1 Jun 2011 23:14:40 +0000 (09:14 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 2 Jun 2011 23:48:13 +0000 (09:48 +1000)
Technically, we're required to announce support for XI 2.0 through
XIQueryVersion. The behaviour of XI2 for clients that have not done so is
undefined, it just happens to work.

With XI 2.1 on the horizon, this may change so make sure we're clamining our
version correctly

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
src/xinput.c

index a20f8560bad57f1813ab000822eec54e9e73d35f..64b48874e2c82ff4d3df308c06d63425d721c843 100644 (file)
@@ -184,6 +184,16 @@ xinput_version(Display     *display)
        XFree(version);
     }
 
+#if HAVE_XI2
+    /* Announce our supported version so the server treats us correctly. */
+    if (vers >= XI_2_Major)
+    {
+        int maj = 2,
+            min = 0;
+        XIQueryVersion(display, &maj, &min);
+    }
+#endif
+
     return vers;
 }