Xi: Deliver XI2 HierarchyEvents when the hierarchy changes.

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

1 files changed, 29 insertions, 0 deletions

diff --git a/Xi/extinit.c b/Xi/extinit.c
index f0aa9f672..8c9f9e111 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -739,6 +739,32 @@ static void SDeviceEvent(xXIDeviceEvent *from, xXIDeviceEvent *to)
     }
 }
 
+static void SDeviceHierarchyEvent(xXIDeviceHierarchyEvent *from,
+                                  xXIDeviceHierarchyEvent *to)
+{
+    int i;
+    char n;
+    xXIHierarchyInfo *info;
+
+    *to = *from;
+    memcpy(&to[1], &from[1], from->length * 4);
+    swaps(&to->sequenceNumber, n);
+    swapl(&to->length, n);
+    swaps(&to->evtype, n);
+    swaps(&to->deviceid, n);
+    swapl(&to->time, n);
+    swapl(&to->flags, n);
+    swaps(&to->num_devices, n);
+
+    info = (xXIHierarchyInfo*)&to[1];
+    for (i = 0; i< from->num_devices; i++)
+    {
+        swaps(&info->deviceid, n);
+        swaps(&info->attachment, n);
+        info++;
+    }
+}
+
 /** Event swapping function for XI2 events. */
 static void
 XI2EventSwap(xGenericEvent *from, xGenericEvent *to)
@@ -753,6 +779,9 @@ XI2EventSwap(xGenericEvent *from, xGenericEvent *to)
             SDeviceChangedEvent((xXIDeviceChangedEvent*)from,
                                 (xXIDeviceChangedEvent*)to);
             break;
+        case XI_HierarchyChanged:
+            SDeviceHierarchyEvent((xXIDeviceHierarchyEvent*)from,
+                                  (xXIDeviceHierarchyEvent*)to);
         default:
             SDeviceEvent((xXIDeviceEvent*)from, (xXIDeviceEvent*)to);
             break;