xinput 1.6.3

[xorg-xinput] / src / setcp.c

diff --git a/src/setcp.c b/src/setcp.c
index 582d978c001f5d53ae17723fbbf597aa8ff164c1..649f301424cc96c9993936f8c51a2d40966cd3e2 100644 (file)
--- a/src/setcp.c
+++ b/src/setcp.c
@@ -1,28 +1,25 @@
 /*
 /*

- * Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
+ * Copyright © 2007 Peter Hutterer
+ * Copyright © 2009 Red Hat, Inc.

  *
  *

- * 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.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:

  *
  *

- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the author shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization
- * from the author.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.

  *
  *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.

  */
 
 
  */
 
 


@@ -32,9 +29,8 @@
 int
 set_clientpointer(Display* dpy, int argc, char** argv, char* name, char *desc)
 {
 int
 set_clientpointer(Display* dpy, int argc, char** argv, char* name, char *desc)
 {

+    XIDeviceInfo *info;

     XID window;
     XID window;

-    XID deviceid;
-    XDevice* dev = NULL;

     char* id;
     char* dummy;
 
     char* id;
     char* dummy;
 


@@ -49,14 +45,14 @@ set_clientpointer(Display* dpy, int argc, char** argv, char* name, char *desc)
     while(*id == '0') id++;
 
     window = strtol(argv[0], &dummy, (*id == 'x') ? 16 : 10);
     while(*id == '0') id++;
 
     window = strtol(argv[0], &dummy, (*id == 'x') ? 16 : 10);

-    deviceid = atol(argv[1]);

 
 

-    dev = XOpenDevice(dpy, deviceid);
+    info = xi2_find_device_info(dpy, argv[1]);

 
 

-    if (!dev)
-    {
-        fprintf(stderr, "Cannot open device %ld.\n", deviceid);
-    } else
-        XSetClientPointer(dpy, window, dev);
+    if (!info) {
+       fprintf(stderr, "unable to find device '%s'\n", argv[1]);
+       return EXIT_FAILURE;
+    }
+
+    XISetClientPointer(dpy, window, info->deviceid);

     return 0;
 }
     return 0;
 }