From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 4 Mar 2009 11:25:50 +0000 (+1000)
Subject: Change is_xinput_present() to xinput_version().
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/a12acdea9e289c9495bc14dd886e9a68cf9a533f?ds=inline;hp=a197551573663cab9e79e07e2de9d423c7a7a572

Change is_xinput_present() to xinput_version().

Returns major version of XI.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/src/xinput.c b/src/xinput.c
index 029b3fb..88fe2fa 100644
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -135,21 +135,23 @@ static entry drivers[] =
     }
 };
 
-static Bool
-is_xinput_present(Display	*display)
+int
+xinput_version(Display	*display)
 {
     XExtensionVersion	*version;
-    Bool		present;
+    static int vers = -1;
+
+    if (vers != -1)
+        return vers;
 
     version = XGetExtensionVersion(display, INAME);
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
-	present = version->present;
+	vers = version->major_version;
 	XFree(version);
-	return present;
-    } else {
-	return False;
     }
+
+    return vers;
 }
 
 XDeviceInfo*
@@ -269,7 +271,7 @@ main(int argc, char * argv[])
     func = argv[1];
     while((*func) == '-') func++;
 
-    if (!is_xinput_present(display)) {
+    if (!xinput_version(display)) {
 	fprintf(stderr, "%s extension not available\n", INAME);
 	return EXIT_FAILURE;
     }
diff --git a/src/xinput.h b/src/xinput.h
index 96ae321..cdb2b2d 100644
--- a/src/xinput.h
+++ b/src/xinput.h
@@ -47,6 +47,7 @@ find_device_info(
 int
 xi2_find_device_id(Display *display, char *name);
 
+int xinput_version(Display* display);
 
 #define DECLARE(name) \
     int (name) ( \