From c5bebca46f63bcd7279f3c73ed1d50e0c1b6051f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 8 Jun 2009 17:54:05 +1000 Subject: Xi: hierarchy events have a num_info now instead of num_devices. Signed-off-by: Peter Hutterer --- Xi/chdevhier.c | 6 +++--- Xi/extinit.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c index e2903f1c5..3f2bb9377 100644 --- a/Xi/chdevhier.c +++ b/Xi/chdevhier.c @@ -77,7 +77,7 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]) ev->evtype = XI_HierarchyChanged; ev->time = GetTimeInMillis(); ev->flags = 0; - ev->num_devices = inputInfo.numDevices; + ev->num_info = inputInfo.numDevices; info = (xXIHierarchyInfo*)&ev[1]; for (dev = inputInfo.devices; dev; dev = dev->next) @@ -109,12 +109,12 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]) info->flags = flags[i]; info->use = 0; ev->flags |= info->flags; - ev->num_devices++; + ev->num_info++; info++; } } - ev->length = (ev->num_devices * sizeof(xXIHierarchyInfo))/4; + ev->length = (ev->num_info * sizeof(xXIHierarchyInfo))/4; dummyDev.id = XIAllDevices; SendEventToAllWindows(&dummyDev, (XI_HierarchyChangedMask >> 8), (xEvent*)ev, 1); diff --git a/Xi/extinit.c b/Xi/extinit.c index 549c5ca56..635afea95 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -786,10 +786,10 @@ static void SDeviceHierarchyEvent(xXIHierarchyEvent *from, swaps(&to->deviceid, n); swapl(&to->time, n); swapl(&to->flags, n); - swaps(&to->num_devices, n); + swaps(&to->num_info, n); info = (xXIHierarchyInfo*)&to[1]; - for (i = 0; i< from->num_devices; i++) + for (i = 0; i< from->num_info; i++) { swaps(&info->deviceid, n); swaps(&info->attachment, n); -- cgit v1.2.3