Merge branch 'master' into xi2

Conflicts:
	src/xinput.h

diff --combined src/xinput.h
index f3fc26634784bf60076e5f87a3ee5f28d23edaf0,c4a6f8f96e57b1f1f55891c35f08e8dfc5b4af5b..fd468b01530d5c8695aeb79510b40e3479416215
--- 1/src/xinput.h
--- 2/src/xinput.h
+++ b/src/xinput.h
@@@ -27,9 -27,6 +27,9 @@@
  
  #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>
@@@ -41,12 -38,7 +41,11 @@@
  #define EXIT_FAILURE 0
  #endif
  
- 
  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);
@@@ -76,6 -68,4 +75,6 @@@ int remove_master( Display* display, in
  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 */