Require inputproto 1.9.99.5

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index 5010923a1bd41dbad340e576deb50d942501ecff..b1cd0a3b2dff0f99b1a9e7142e6c586c2ce12412 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -1,19 +1,19 @@
 /*
  * Copyright 1996 by Frederic Lepied, France. <Frederic.Lepied@sugix.frmug.org>
 /*
  * Copyright 1996 by Frederic Lepied, France. <Frederic.Lepied@sugix.frmug.org>

- *                                                                            
+ *

  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is  hereby granted without fee, provided that
  * the  above copyright   notice appear  in   all  copies and  that both  that
  * copyright  notice   and   this  permission   notice  appear  in  supporting
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is  hereby granted without fee, provided that
  * the  above copyright   notice appear  in   all  copies and  that both  that
  * copyright  notice   and   this  permission   notice  appear  in  supporting

- * documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+ * documentation, and that   the  name of  the authors  not  be  used  in

  * advertising or publicity pertaining to distribution of the software without
  * advertising or publicity pertaining to distribution of the software without

- * specific,  written      prior  permission.     Frederic  Lepied   makes  no
+ * specific,  written      prior  permission.     The authors  make  no

  * representations about the suitability of this software for any purpose.  It
  * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.                   
- *                                                                            
- * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHORS DISCLAIM ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,

  * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
  * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO

- * EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+ * EVENT  SHALL THE AUTHORS  BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR

  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
  * TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
  * TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR


@@ -32,7 +32,7 @@ typedef int (*prog)(
 #endif
 );
 
 #endif
 );
 

-typedef struct 
+typedef struct

 {
     char       *func_name;
     char       *arg_desc;
 {
     char       *func_name;
     char       *arg_desc;


@@ -66,7 +66,7 @@ static entry drivers[] =
      set_mode
     },
     {"list",
      set_mode
     },
     {"list",

-     "[<device name>...]",
+     "[--loop || --short || <device name>...]",

      list
     },
     {"query-state",
      list
     },
     {"query-state",


@@ -81,6 +81,44 @@ static entry drivers[] =
      "",
      version
     },
      "",
      version
     },

+#if HAVE_XI2
+    { "create-master",
+      "<id> [sendCore (dflt:1)] [enable (dflt:1)]",
+      create_master
+    },
+    { "remove-master",
+      "<id> [returnMode (dflt:Floating)] [returnPointer] [returnKeyboard]",
+      remove_master
+    },
+    { "reattach",
+      "<id> <master>",
+      change_attachment
+    },
+    { "float",
+      "<id>",
+      float_device
+    },
+    { "set-cp",
+      "<window> <device>",
+      set_clientpointer
+    },
+    { "list-props",
+      "<device> [<device> ...]",
+      list_props
+    },
+    { "set-int-prop",
+      "<device> <property> <format (8, 16, 32)> <val> [<val> ...]",
+      set_int_prop
+    },
+    { "watch-props",
+      "<device>",
+      watch_props
+    },
+    { "delete-prop",
+      "<device> <property>",
+      delete_prop
+    },
+#endif

     {0, 0, 0
     }
 };
     {0, 0, 0
     }
 };


@@ -90,8 +128,12 @@ is_xinput_present(Display   *display)
 {
     XExtensionVersion  *version;
     Bool               present;
 {
     XExtensionVersion  *version;
     Bool               present;

-    
+
+#if HAVE_XI2
+    version = XQueryInputVersion(display, XI_2_Major, XI_2_Minor);
+#else

     version = XGetExtensionVersion(display, INAME);
     version = XGetExtensionVersion(display, INAME);

+#endif

 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
        present = version->present;
 
     if (version && (version != (XExtensionVersion*) NoSuchExtension)) {
        present = version->present;


@@ -108,12 +150,13 @@ find_device_info(Display  *display,
                 Bool           only_extended)
 {
     XDeviceInfo        *devices;
                 Bool           only_extended)
 {
     XDeviceInfo        *devices;

+    XDeviceInfo *found = NULL;

     int                loop;
     int                num_devices;
     int                len = strlen(name);
     Bool       is_id = True;
     XID                id;
     int                loop;
     int                num_devices;
     int                len = strlen(name);
     Bool       is_id = True;
     XID                id;

-    
+

     for(loop=0; loop<len; loop++) {
        if (!isdigit(name[loop])) {
            is_id = False;
     for(loop=0; loop<len; loop++) {
        if (!isdigit(name[loop])) {
            is_id = False;


@@ -124,26 +167,33 @@ find_device_info(Display  *display,
     if (is_id) {
        id = atoi(name);
     }
     if (is_id) {
        id = atoi(name);
     }

-    
+

     devices = XListInputDevices(display, &num_devices);
 
     for(loop=0; loop<num_devices; loop++) {
        if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) &&
            ((!is_id && strcmp(devices[loop].name, name) == 0) ||
             (is_id && devices[loop].id == id))) {
     devices = XListInputDevices(display, &num_devices);
 
     for(loop=0; loop<num_devices; loop++) {
        if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) &&
            ((!is_id && strcmp(devices[loop].name, name) == 0) ||
             (is_id && devices[loop].id == id))) {

-           return &devices[loop];
+           if (found) {
+               fprintf(stderr,
+                       "Warning: There are multiple devices named \"%s\".\n"
+                       "To ensure the correct one is selected, please use "
+                       "the device ID instead.\n\n", name);
+           } else {
+               found = &devices[loop];
+           }

        }
     }
        }
     }

-    return NULL;
+    return found;

 }
 
 static void
 }
 
 static void

-usage() 
+usage(void)

 {
     entry      *pdriver = drivers;
 {
     entry      *pdriver = drivers;

-    
+

     fprintf(stderr, "usage :\n");
     fprintf(stderr, "usage :\n");

-    
+

     while(pdriver->func_name) {
        fprintf(stderr, "\txinput %s %s\n", pdriver->func_name,
                pdriver->arg_desc);
     while(pdriver->func_name) {
        fprintf(stderr, "\txinput %s %s\n", pdriver->func_name,
                pdriver->arg_desc);


@@ -156,26 +206,30 @@ main(int argc, char * argv[])
 {
     Display    *display;
     entry      *driver = drivers;
 {
     Display    *display;
     entry      *driver = drivers;

-    
+    char        *func;
+

     if (argc < 2) {
        usage();
        return EXIT_FAILURE;
     }
     if (argc < 2) {
        usage();
        return EXIT_FAILURE;
     }

-    
+

     display = XOpenDisplay(NULL);
     display = XOpenDisplay(NULL);

-    
+

     if (display == NULL) {
        fprintf(stderr, "Unable to connect to X server\n");
        return EXIT_FAILURE;
     }
 
     if (display == NULL) {
        fprintf(stderr, "Unable to connect to X server\n");
        return EXIT_FAILURE;
     }
 

+    func = argv[1];
+    while((*func) == '-') func++;
+

     if (!is_xinput_present(display)) {
        fprintf(stderr, "%s extension not available\n", INAME);
        return EXIT_FAILURE;
     }
     if (!is_xinput_present(display)) {
        fprintf(stderr, "%s extension not available\n", INAME);
        return EXIT_FAILURE;
     }

-    
+

     while(driver->func_name) {
     while(driver->func_name) {

-       if (strcmp(driver->func_name, argv[1]) == 0) {
+       if (strcmp(driver->func_name, func) == 0) {

            int r = (*driver->func)(display, argc-2, argv+2,
                                    driver->func_name, driver->arg_desc);
            XFlush(display);
            int r = (*driver->func)(display, argc-2, argv+2,
                                    driver->func_name, driver->arg_desc);
            XFlush(display);


@@ -183,9 +237,9 @@ main(int argc, char * argv[])
        }
        driver++;
     }
        }
        driver++;
     }

-    
+

     usage();
     usage();

-    
+

     return EXIT_FAILURE;
 }
 
     return EXIT_FAILURE;
 }