Bump to 1.4.99.3

[xorg-xinput] / src / hierarchy.c

diff --git a/src/hierarchy.c b/src/hierarchy.c
index 7739074bb598863bd871587c97929a87e5bb448d..7f35c3988994ac24b2f56d5a881cdb9f021e73f6 100644 (file)
--- a/src/hierarchy.c
+++ b/src/hierarchy.c
@@ -40,7 +40,7 @@
 int
 create_master(Display* dpy, int argc, char** argv, char* name, char *desc)
 {
 int
 create_master(Display* dpy, int argc, char** argv, char* name, char *desc)
 {

-    XICreateMasterInfo c;
+    XIAddMasterInfo c;

 
     if (argc == 0)
     {
 
     if (argc == 0)
     {


@@ -48,12 +48,12 @@ create_master(Display* dpy, int argc, char** argv, char* name, char *desc)
         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    c.type = CH_CreateMasterDevice;
+    c.type = XIAddMaster;

     c.name = argv[0];
     c.name = argv[0];

-    c.sendCore = (argc >= 2) ? atoi(argv[1]) : 1;
+    c.send_core = (argc >= 2) ? atoi(argv[1]) : 1;

     c.enable = (argc >= 3) ? atoi(argv[2]) : 1;
 
     c.enable = (argc >= 3) ? atoi(argv[2]) : 1;
 

-    return XIChangeDeviceHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
+    return XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);

 }
 
 /**
 }
 
 /**


@@ -65,7 +65,8 @@ int
 remove_master(Display* dpy, int argc, char** argv, char *name, char *desc)
 {
     XIRemoveMasterInfo r;
 remove_master(Display* dpy, int argc, char** argv, char *name, char *desc)
 {
     XIRemoveMasterInfo r;

-    int ret, id;
+    XIDeviceInfo *info;
+    int ret;

 
     if (argc == 0)
     {
 
     if (argc == 0)
     {


@@ -73,33 +74,67 @@ remove_master(Display* dpy, int argc, char** argv, char *name, char *desc)
         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    id = xi2_find_device_id(dpy, argv[0]);
+    info = xi2_find_device_info(dpy, argv[0]);

 
 

-    if (id == -1) {
+    if (!info) {

        fprintf(stderr, "unable to find device %s\n", argv[0]);
        return EXIT_FAILURE;
     }
 
        fprintf(stderr, "unable to find device %s\n", argv[0]);
        return EXIT_FAILURE;
     }
 

-    r.type = CH_RemoveMasterDevice;
-    r.device = id;
+    r.type = XIRemoveMaster;
+    r.deviceid = info->deviceid;

     if (argc >= 2)
     {
         if (!strcmp(argv[1], "Floating"))
     if (argc >= 2)
     {
         if (!strcmp(argv[1], "Floating"))

-            r.returnMode = Floating;
+            r.return_mode = XIFloating;

         else if (!strcmp(argv[1], "AttachToMaster"))
         else if (!strcmp(argv[1], "AttachToMaster"))

-            r.returnMode = AttachToMaster;
+            r.return_mode = XIAttachToMaster;

         else
         else

-            Error(BadValue, "Invalid returnMode.\n");
+            Error(BadValue, "Invalid return_mode.\n");

     } else
     } else

-        r.returnMode = Floating;
+        r.return_mode = XIFloating;

 
 

-    if (r.returnMode == AttachToMaster)
+    if (r.return_mode == XIAttachToMaster)

     {
     {

-        r.returnPointer = atoi(argv[2]);
-        r.returnKeyboard = atoi(argv[3]);
+        r.return_pointer = 0;
+        if (argc >= 3) {
+            info = xi2_find_device_info(dpy, argv[2]);
+            if (!info) {
+                fprintf(stderr, "unable to find device %s\n", argv[2]);
+                return EXIT_FAILURE;
+            }
+
+            r.return_pointer = info->deviceid;
+        }
+
+        r.return_keyboard = 0;
+        if (argc >= 4) {
+            info = xi2_find_device_info(dpy, argv[3]);
+            if (!info) {
+                fprintf(stderr, "unable to find device %s\n", argv[3]);
+                return EXIT_FAILURE;
+            }
+
+            r.return_keyboard = info->deviceid;
+        }
+
+        if (!r.return_pointer || !r.return_keyboard) {
+            int i, ndevices;
+            info = XIQueryDevice(dpy, XIAllMasterDevices, &ndevices);
+            for(i = 0; i < ndevices; i++) {
+                if (info[i].use == XIMasterPointer && !r.return_pointer)
+                    r.return_pointer = info[i].deviceid;
+                if (info[i].use == XIMasterKeyboard && !r.return_keyboard)
+                    r.return_keyboard = info[i].deviceid;
+                if (r.return_pointer && r.return_keyboard)
+                    break;
+            }
+
+            XIFreeDeviceInfo(info);
+        }

     }
 
     }
 

-    ret = XIChangeDeviceHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&r, 1);
+    ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&r, 1);

     return ret;
 }
 
     return ret;
 }
 


@@ -109,7 +144,7 @@ remove_master(Display* dpy, int argc, char** argv, char *name, char *desc)
 int
 change_attachment(Display* dpy, int argc, char** argv, char *name, char* desc)
 {
 int
 change_attachment(Display* dpy, int argc, char** argv, char *name, char* desc)
 {

-    int sd_id, md_id;
+    XIDeviceInfo *sd_info, *md_info;

     XIAttachSlaveInfo c;
     int ret;
 
     XIAttachSlaveInfo c;
     int ret;
 


@@ -119,24 +154,24 @@ change_attachment(Display* dpy, int argc, char** argv, char *name, char* desc)
         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    sd_id = xi2_find_device_id(dpy, argv[0]);
-    md_id = xi2_find_device_id(dpy, argv[1]);
+    sd_info = xi2_find_device_info(dpy, argv[0]);
+    md_info= xi2_find_device_info(dpy, argv[1]);

 
 

-    if (sd_id == -1) {
+    if (!sd_info) {

        fprintf(stderr, "unable to find device %s\n", argv[0]);
        return EXIT_FAILURE;
     }
 
        fprintf(stderr, "unable to find device %s\n", argv[0]);
        return EXIT_FAILURE;
     }
 

-    if (md_id == -1) {
+    if (!md_info) {

        fprintf(stderr, "unable to find device %s\n", argv[1]);
        return EXIT_FAILURE;
     }
 
        fprintf(stderr, "unable to find device %s\n", argv[1]);
        return EXIT_FAILURE;
     }
 

-    c.type = CH_AttachSlave;
-    c.device = sd_id;
-    c.newMaster = md_id;
+    c.type = XIAttachSlave;
+    c.deviceid = sd_info->deviceid;
+    c.new_master = md_info->deviceid;

 
 

-    ret = XIChangeDeviceHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
+    ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);

     return ret;
 }
 
     return ret;
 }
 


@@ -146,7 +181,7 @@ change_attachment(Display* dpy, int argc, char** argv, char *name, char* desc)
 int
 float_device(Display* dpy, int argc, char** argv, char* name, char* desc)
 {
 int
 float_device(Display* dpy, int argc, char** argv, char* name, char* desc)
 {

-    int id;
+    XIDeviceInfo *info;

     XIDetachSlaveInfo c;
     int ret;
 
     XIDetachSlaveInfo c;
     int ret;
 


@@ -156,17 +191,17 @@ float_device(Display* dpy, int argc, char** argv, char* name, char* desc)
         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    id = xi2_find_device_id(dpy, argv[0]);
+    info = xi2_find_device_info(dpy, argv[0]);

 
 

-    if (id == -1) {
+    if (!info) {

        fprintf(stderr, "unable to find device %s\n", argv[0]);
        return EXIT_FAILURE;
     }
 
        fprintf(stderr, "unable to find device %s\n", argv[0]);
        return EXIT_FAILURE;
     }
 

-    c.type = CH_DetachSlave;
-    c.device = id;
+    c.type = XIDetachSlave;
+    c.deviceid = info->deviceid;

 
 

-    ret = XIChangeDeviceHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
+    ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);

     return ret;
 }
 
     return ret;
 }