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

Xi: fix event swapping for XIDeviceEvents. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-08-10 13:12:40 +10:00
parent e46f02fa2d
commit f3b2f9fb73
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Xi/extinit.c
View File

@ -733,14 +733,14 @@ static void SDeviceEvent(xXIDeviceEvent *from, xXIDeviceEvent *to)
char *ptr; char *ptr;
char *vmask; char *vmask;
*to = *from; memcpy(to, from, sizeof(xEvent) + from->length * 4);
memcpy(&to[1], &from[1], from->length * 4);
swaps(&to->sequenceNumber, n); swaps(&to->sequenceNumber, n);
swapl(&to->length, n); swapl(&to->length, n);
swaps(&to->evtype, n); swaps(&to->evtype, n);
swaps(&to->deviceid, n); swaps(&to->deviceid, n);
swapl(&to->time, n); swapl(&to->time, n);
swapl(&to->detail, n);
swapl(&to->root, n); swapl(&to->root, n);
swapl(&to->event, n); swapl(&to->event, n);
swapl(&to->child, n); swapl(&to->child, n);
@ -754,11 +754,12 @@ static void SDeviceEvent(xXIDeviceEvent *from, xXIDeviceEvent *to)
swapl(&to->mods.base_mods, n); swapl(&to->mods.base_mods, n);
swapl(&to->mods.latched_mods, n); swapl(&to->mods.latched_mods, n);
swapl(&to->mods.locked_mods, n); swapl(&to->mods.locked_mods, n);
swapl(&to->mods.effective_mods, n);
ptr = (char*)(&to[1]); ptr = (char*)(&to[1]);
ptr += from->buttons_len; ptr += from->buttons_len * 4;
vmask = ptr; /* valuator mask */ vmask = ptr; /* valuator mask */
ptr += from->valuators_len; ptr += from->valuators_len * 4;
for (i = 0; i < from->valuators_len * 32; i++) for (i = 0; i < from->valuators_len * 32; i++)
{ {
if (BitIsOn(vmask, i)) if (BitIsOn(vmask, i))
@ -830,9 +831,16 @@ XI2EventSwap(xGenericEvent *from, xGenericEvent *to)
SXIPropertyEvent((xXIPropertyEvent*)from, SXIPropertyEvent((xXIPropertyEvent*)from,
(xXIPropertyEvent*)to); (xXIPropertyEvent*)to);
break; break;
default: case XI_Motion:
case XI_KeyPress:
case XI_KeyRelease:
case XI_ButtonPress:
case XI_ButtonRelease:
SDeviceEvent((xXIDeviceEvent*)from, (xXIDeviceEvent*)to); SDeviceEvent((xXIDeviceEvent*)from, (xXIDeviceEvent*)to);
break; break;
default:
ErrorF("[Xi] Unknown event type to swap. This is a bug.\n");
break;
} }
} }