Add Peter and Red Hat's copyright notices and licenses to COPYING

[xorg-xinput] / src / xinput.h

diff --git a/src/xinput.h b/src/xinput.h
index c4a6f8f96e57b1f1f55891c35f08e8dfc5b4af5b..d44ce0960ae751dd81f73e926326fc63acf14a34 100644 (file)
--- a/src/xinput.h
+++ b/src/xinput.h
@@ -27,6 +27,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput.h>

+#ifdef HAVE_XI2
+#include <X11/extensions/XInput2.h>
+#endif

 #include <X11/Xutil.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xutil.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -38,7 +41,12 @@
 #define EXIT_FAILURE 0
 #endif
 
 #define EXIT_FAILURE 0
 #endif
 

+extern int xi_opcode; /* xinput extension op code */

 XDeviceInfo* find_device_info( Display *display, char *name, Bool only_extended);
 XDeviceInfo* find_device_info( Display *display, char *name, Bool only_extended);

+#if HAVE_XI2
+XIDeviceInfo* xi2_find_device_info(Display *display, char *name);
+int xinput_version(Display* display);
+#endif

 
 int get_feedbacks( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int set_ptr_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 
 int get_feedbacks( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int set_ptr_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);


@@ -68,4 +76,6 @@ int remove_master( Display* display, int argc, char *argv[], char *prog_name, ch
 int change_attachment( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int float_device( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int set_clientpointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int change_attachment( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int float_device( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int set_clientpointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);

+int test_xi2( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+

 /* end of xinput.h */
 /* end of xinput.h */