Fix build errors introduced by inputproto 1.9.99.11.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index 84bdcc68cc497bb9e366c0dd31478b9881710834..dbc3f34937efe3317de037babcde7954d50d9771 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ XORG_CWARNFLAGS
 PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5])
 
 # XI2 support
 PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5])
 
 # XI2 support

-PKG_CHECK_MODULES(XI2, [xi >= 1.2.99] [inputproto >= 1.9.99.9],
+PKG_CHECK_MODULES(XI2, [xi >= 1.2.99] [inputproto >= 1.9.99.11],

                   HAVE_XI2="yes"; AC_DEFINE(HAVE_XI2, 1, [XI2 available]),
                   HAVE_XI2="no");
 AM_CONDITIONAL(HAVE_XI2, [ test "$HAVE_XI2" = "yes" ])
                   HAVE_XI2="yes"; AC_DEFINE(HAVE_XI2, 1, [XI2 available]),
                   HAVE_XI2="no");
 AM_CONDITIONAL(HAVE_XI2, [ test "$HAVE_XI2" = "yes" ])

diff --git a/src/hierarchy.c b/src/hierarchy.c
index 77960d5311b9f9540a95c80a63df7fd3361b7afa..cf0f78391e77917310f2c87cadb8565029cca971 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,9 +48,9 @@ create_master(Display* dpy, int argc, char** argv, char* name, char *desc)
         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    c.type = XICreateMaster;
+    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;
 
     return XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
     c.enable = (argc >= 3) ? atoi(argv[2]) : 1;
 
     return XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);


@@ -82,22 +82,22 @@ remove_master(Display* dpy, int argc, char** argv, char *name, char *desc)
     }
 
     r.type = XIRemoveMaster;
     }
 
     r.type = XIRemoveMaster;

-    r.device = info->deviceid;
+    r.deviceid = info->deviceid;

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

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

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

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

         else
         else

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

     } else
     } else

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

 
 

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

     {
     {

-        r.returnPointer = atoi(argv[2]);
-        r.returnKeyboard = atoi(argv[3]);
+        r.return_pointer = atoi(argv[2]);
+        r.return_keyboard = atoi(argv[3]);

     }
 
     ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&r, 1);
     }
 
     ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&r, 1);


@@ -134,8 +134,8 @@ change_attachment(Display* dpy, int argc, char** argv, char *name, char* desc)
     }
 
     c.type = XIAttachSlave;
     }
 
     c.type = XIAttachSlave;

-    c.device = sd_info->deviceid;
-    c.newMaster = md_info->deviceid;
+    c.deviceid = sd_info->deviceid;
+    c.new_master = md_info->deviceid;

 
     ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
     return ret;
 
     ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
     return ret;


@@ -165,7 +165,7 @@ float_device(Display* dpy, int argc, char** argv, char* name, char* desc)
     }
 
     c.type = XIDetachSlave;
     }
 
     c.type = XIDetachSlave;

-    c.device = info->deviceid;
+    c.deviceid = info->deviceid;

 
     ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
     return ret;
 
     ret = XIChangeHierarchy(dpy, (XIAnyHierarchyChangeInfo*)&c, 1);
     return ret;

diff --git a/src/test_xi2.c b/src/test_xi2.c
index 72de8b258b87d4e26a8e5b3aad824a8589c5fe76..8c6175f7637f6b71caea6ba95b66d422c49ac669 100644 (file)
--- a/src/test_xi2.c
+++ b/src/test_xi2.c
@@ -102,7 +102,7 @@ static void print_hierarchychangedevent(XIHierarchyEvent *event)
             (event->flags & XIDeviceEnabled) ? "[device enabled]" : "",
             (event->flags & XIDeviceDisabled) ? "[device disabled]" : "");
 
             (event->flags & XIDeviceEnabled) ? "[device enabled]" : "",
             (event->flags & XIDeviceDisabled) ? "[device disabled]" : "");
 

-    for (i = 0; i < event->num_devices; i++)
+    for (i = 0; i < event->num_info; i++)

     {
         char *use;
         switch(event->info[i].use)
     {
         char *use;
         switch(event->info[i].use)