[PATCH libXi] Add XI2 library-internal array offsets to XIint.h

Peter Hutterer peter.hutterer at who-t.net
Mon Sep 6 22:33:31 PDT 2010


These defines are currently defined in XI.h and XI2.h. Their only use is as
offset into a library-internal array. Move them to XIint.h so they may be
removed from the protocol headers with the next revision.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/XIint.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/XIint.h b/src/XIint.h
index 00e84d3..776ce15 100644
--- a/src/XIint.h
+++ b/src/XIint.h
@@ -9,6 +9,21 @@
 #define _XIINT_H_
 #include <X11/extensions/XI.h>
 
+/* inputproto 2.0 still shipped with these defined in the proto headers */
+#ifndef XInput_Initial_Release
+/* Indices into the versions[] array (XExtInt.c). Used as a index to
+ * retrieve the minimum version of XI from _XiCheckExtInit */
+#define Dont_Check			0
+#define XInput_Initial_Release		1
+#define XInput_Add_XDeviceBell		2
+#define XInput_Add_XSetDeviceValuators	3
+#define XInput_Add_XChangeDeviceControl	4
+#define XInput_Add_DevicePresenceNotify	5
+#define XInput_Add_DeviceProperties	6
+#define XInput_2_0			7
+#endif
+
+
 extern XExtDisplayInfo *XInput_find_display(Display *);
 
 extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *);
-- 
1.7.2.2


More information about the xorg-devel mailing list