Require inputproto 1.9.99.12

[xorg-xinput] / src / setcp.c

diff --git a/src/setcp.c b/src/setcp.c
index e44bb00fabeb1d13bfbc253ec1e4ce72e100d932..7a2864479cf7b195bc785226d70f56b6656391f3 100644 (file)
--- a/src/setcp.c
+++ b/src/setcp.c
@@ -32,9 +32,8 @@
 int
 set_clientpointer(Display* dpy, int argc, char** argv, char* name, char *desc)
 {
-    XDeviceInfo* info;
+    XIDeviceInfo *info;
     XID window;
-    XDevice* dev = NULL;
     char* id;
     char* dummy;
 
@@ -50,19 +49,13 @@ set_clientpointer(Display* dpy, int argc, char** argv, char* name, char *desc)
 
     window = strtol(argv[0], &dummy, (*id == 'x') ? 16 : 10);
 
-    info = find_device_info(dpy, argv[1], False);
+    info = xi2_find_device_info(dpy, argv[1]);
 
     if (!info) {
        fprintf(stderr, "unable to find device %s\n", argv[1]);
        return EXIT_FAILURE;
     }
 
-    dev = XOpenDevice(dpy, info->id);
-
-    if (!dev)
-    {
-        fprintf(stderr, "Cannot open device %s.\n", argv[1]);
-    } else
-        XSetClientPointer(dpy, window, dev);
+    XISetClientPointer(dpy, window, info->deviceid);
     return 0;
 }