frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xi: hierarchy events have a num_info now instead of num_devices. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-08 17:54:05 +10:00
parent 810b74dbbc
commit c5bebca46f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xi/chdevhier.c
View File

@ -77,7 +77,7 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
ev->evtype = XI_HierarchyChanged; ev->evtype = XI_HierarchyChanged;
ev->time = GetTimeInMillis(); ev->time = GetTimeInMillis();
ev->flags = 0; ev->flags = 0;
ev->num_devices = inputInfo.numDevices; ev->num_info = inputInfo.numDevices;
info = (xXIHierarchyInfo*)&ev[1]; info = (xXIHierarchyInfo*)&ev[1];
for (dev = inputInfo.devices; dev; dev = dev->next) for (dev = inputInfo.devices; dev; dev = dev->next)
@ -109,12 +109,12 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
info->flags = flags[i]; info->flags = flags[i];
info->use = 0; info->use = 0;
ev->flags |= info->flags; ev->flags |= info->flags;
ev->num_devices++; ev->num_info++;
info++; info++;
} }
} }
ev->length = (ev->num_devices * sizeof(xXIHierarchyInfo))/4; ev->length = (ev->num_info * sizeof(xXIHierarchyInfo))/4;
dummyDev.id = XIAllDevices; dummyDev.id = XIAllDevices;
SendEventToAllWindows(&dummyDev, (XI_HierarchyChangedMask >> 8), (xEvent*)ev, 1); SendEventToAllWindows(&dummyDev, (XI_HierarchyChangedMask >> 8), (xEvent*)ev, 1);

4
Xi/extinit.c
View File

@ -786,10 +786,10 @@ static void SDeviceHierarchyEvent(xXIHierarchyEvent *from,
swaps(&to->deviceid, n); swaps(&to->deviceid, n);
swapl(&to->time, n); swapl(&to->time, n);
swapl(&to->flags, n); swapl(&to->flags, n);
swaps(&to->num_devices, n); swaps(&to->num_info, n);
info = (xXIHierarchyInfo*)&to[1]; 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->deviceid, n);
swaps(&info->attachment, n); swaps(&info->attachment, n);