XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 01:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xext: xtest: use REQUEST_HEAD_STRUCT and REQUEST_FIELD_* macros

Browse Source 
Use the new macros to make request struct parsing / field swapping
much easier.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-07-08 17:57:03 +02:00
committed by Enrico Weigelt
parent 6f7aa46c51
commit ec973853c9
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Xext/xtest.c
View File

@@ -92,11 +92,8 @@ static int XTestSwapFakeInput(ClientPtr /* client */ ,
static int
ProcXTestGetVersion(ClientPtr client)
{
REQUEST(xXTestGetVersionReq);
REQUEST_SIZE_MATCH(xXTestGetVersionReq);
if (client->swapped)
swaps(&stuff->minorVersion);
X_REQUEST_HEAD_STRUCT(xXTestGetVersionReq);
X_REQUEST_FIELD_CARD16(minorVersion);
xXTestGetVersionReply reply = {
.majorVersion = XTestMajorVersion,
@@ -112,13 +109,9 @@ ProcXTestGetVersion(ClientPtr client)
static int
ProcXTestCompareCursor(ClientPtr client)
{
REQUEST(xXTestCompareCursorReq);
REQUEST_SIZE_MATCH(xXTestCompareCursorReq);
if (client->swapped) {
swapl(&stuff->window);
swapl(&stuff->cursor);
}
X_REQUEST_HEAD_STRUCT(xXTestCompareCursorReq);
X_REQUEST_FIELD_CARD32(window);
X_REQUEST_FIELD_CARD32(cursor);
WindowPtr pWin;
CursorPtr pCursor;
@@ -184,14 +177,14 @@ XTestDeviceSendEvents(DeviceIntPtr dev,
static int
ProcXTestFakeInput(ClientPtr client)
{
X_REQUEST_HEAD_NO_CHECK(xXTestFakeInputReq);
if (client->swapped) {
REQUEST(xReq);
int n = XTestSwapFakeInput(client, stuff);
int n = XTestSwapFakeInput(client, (xReq *)stuff);
if (n != Success)
return n;
}
REQUEST(xXTestFakeInputReq);
int nev, n, type, rc;
xEvent *ev;
DeviceIntPtr dev = NULL;
@@ -462,9 +455,8 @@ ProcXTestFakeInput(ClientPtr client)
static int
ProcXTestGrabControl(ClientPtr client)
{
REQUEST(xXTestGrabControlReq);
X_REQUEST_HEAD_STRUCT(xXTestGrabControlReq);
REQUEST_SIZE_MATCH(xXTestGrabControlReq);
if ((stuff->impervious != xTrue) && (stuff->impervious != xFalse)) {
client->errorValue = stuff->impervious;
return BadValue;