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

cursor: CreatePointerBarrier has a variable request length 

Support this, and swap the devices in the SProc as well. Don't
actually do anything with the devices just yet -- specifying any
should still emit a BadImplementation.

Based on a patch by Peter Hutterer <peter.hutterer@who-t.net>

Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Jasper St. Pierre 2012-11-03 20:23:43 -04:00 committed by Peter Hutterer
parent d74b63f95f
commit 04c885de71
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xfixes/cursor.c
View File

@ -1279,7 +1279,7 @@ ProcXFixesCreatePointerBarrier(ClientPtr client)
REQUEST(xXFixesCreatePointerBarrierReq); REQUEST(xXFixesCreatePointerBarrierReq);
REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices));
LEGAL_NEW_RESOURCE(stuff->barrier, client); LEGAL_NEW_RESOURCE(stuff->barrier, client);
err = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess); err = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
@ -1318,9 +1318,13 @@ int
SProcXFixesCreatePointerBarrier(ClientPtr client) SProcXFixesCreatePointerBarrier(ClientPtr client)
{ {
REQUEST(xXFixesCreatePointerBarrierReq); REQUEST(xXFixesCreatePointerBarrierReq);
int i;
CARD16 *in_devices = (CARD16 *) &stuff[1];
swaps(&stuff->length); swaps(&stuff->length);
REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); swaps(&stuff->num_devices);
REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices));
swapl(&stuff->barrier); swapl(&stuff->barrier);
swapl(&stuff->window); swapl(&stuff->window);
swaps(&stuff->x1); swaps(&stuff->x1);
@ -1328,6 +1332,10 @@ SProcXFixesCreatePointerBarrier(ClientPtr client)
swaps(&stuff->x2); swaps(&stuff->x2);
swaps(&stuff->y2); swaps(&stuff->y2);
swapl(&stuff->directions); swapl(&stuff->directions);
for (i = 0; i < stuff->num_devices; i++) {
swaps(in_devices + i);
}
return ProcXFixesVector[stuff->xfixesReqType] (client); return ProcXFixesVector[stuff->xfixesReqType] (client);
} }