Merge branch 'multitouch'

diff --combined src/xinput.c
index 946017571c85cf215400454182a0066e1f89bcca,f12d69cdc274cf7c2708253c8c8a9d696307368e..80a1789cee6e980890457b283339bf32c2bc636b
--- 1/src/xinput.c
--- 2/src/xinput.c
+++ b/src/xinput.c
@@@ -143,8 -143,8 +143,8 @@@ static entry drivers[] 
  
  static const char version_id[] = VERSION;
  
 -int
 -print_version()
 +static int
 +print_version(void)
  {
      XExtensionVersion *version;
      Display *display;
@@@ -197,6 -197,8 +197,8 @@@ xinput_version(Display     *display
  
  #if HAVE_XI21
          min = 1;
+ #elif HAVE_XI22
+         min = 2;
  #endif
  
          XIQueryVersion(display, &maj, &min);
@@@ -346,20 -348,16 +348,20 @@@ main(int argc, char * argv[]
      char        *func;
      int event, error;
  
 -    if (argc < 2) {
 -      usage();
 -      return EXIT_FAILURE;
 +    if (argc > 1) {
 +      func = argv[1];
 +      while(func[0] == '-') func++;
 +    } else {
 +      func = "list";
      }
  
 -    func = argv[1];
 -    while((*func) == '-') func++;
 -
      if (strcmp("version", func) == 0) {
 -        return print_version(argv[0]);
 +        return print_version();
 +    }
 +
 +    if (strcmp("help", func) == 0) {
 +        usage();
 +        return 0;
      }
  
      display = XOpenDisplay(NULL);