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

Xext: xtest: use REQUEST_HEAD_STRUCT and REQUEST_FIELD_* macros 

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
parent a9f50509bc
commit d929424514
1 changed files with 19 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Xext/xtest.c
View File

@ -38,6 +38,7 @@
#include "dix/input_priv.h" #include "dix/input_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/exevents_priv.h" #include "dix/exevents_priv.h"
#include "dix/request_priv.h"
#include "mi/mi_priv.h" #include "mi/mi_priv.h"
#include "mi/mipointer_priv.h" #include "mi/mipointer_priv.h"
#include "os/client_priv.h" #include "os/client_priv.h"
@ -89,6 +90,9 @@ static int XTestSwapFakeInput(ClientPtr /* client */ ,
static int static int
ProcXTestGetVersion(ClientPtr client) ProcXTestGetVersion(ClientPtr client)
{ {
REQUEST_HEAD_STRUCT(xXTestGetVersionReq);
REQUEST_FIELD_CARD16(minorVersion);
xXTestGetVersionReply rep = { xXTestGetVersionReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
@ -110,14 +114,16 @@ ProcXTestGetVersion(ClientPtr client)
static int static int
ProcXTestCompareCursor(ClientPtr client) ProcXTestCompareCursor(ClientPtr client)
{ {
REQUEST(xXTestCompareCursorReq); REQUEST_HEAD_STRUCT(xXTestCompareCursorReq);
REQUEST_FIELD_CARD32(window);
REQUEST_FIELD_CARD32(cursor);
xXTestCompareCursorReply rep; xXTestCompareCursorReply rep;
WindowPtr pWin; WindowPtr pWin;
CursorPtr pCursor; CursorPtr pCursor;
int rc; int rc;
DeviceIntPtr ptr = PickPointer(client); DeviceIntPtr ptr = PickPointer(client);
REQUEST_SIZE_MATCH(xXTestCompareCursorReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
@ -182,7 +188,14 @@ XTestDeviceSendEvents(DeviceIntPtr dev,
static int static int
ProcXTestFakeInput(ClientPtr client) ProcXTestFakeInput(ClientPtr client)
{ {
REQUEST(xXTestFakeInputReq); REQUEST_HEAD_NO_CHECK(xXTestFakeInputReq);
if (client->swapped) {
int n = XTestSwapFakeInput(client, (xReq *)stuff);
if (n != Success)
return n;
}
int nev, n, type, rc; int nev, n, type, rc;
xEvent *ev; xEvent *ev;
DeviceIntPtr dev = NULL; DeviceIntPtr dev = NULL;
@ -372,6 +385,7 @@ ProcXTestFakeInput(ClientPtr client)
/* swap the request back so we can simply re-execute it */ /* swap the request back so we can simply re-execute it */
if (client->swapped) { if (client->swapped) {
(void) XTestSwapFakeInput(client, (xReq *) stuff); (void) XTestSwapFakeInput(client, (xReq *) stuff);
REQUEST_FIELD_CARD16(length);
} }
ResetCurrentRequest(client); ResetCurrentRequest(client);
client->sequence--; client->sequence--;
@ -449,9 +463,8 @@ ProcXTestFakeInput(ClientPtr client)
static int static int
ProcXTestGrabControl(ClientPtr client) ProcXTestGrabControl(ClientPtr client)
{ {
REQUEST(xXTestGrabControlReq); REQUEST_HEAD_STRUCT(xXTestGrabControlReq);
REQUEST_SIZE_MATCH(xXTestGrabControlReq);
if ((stuff->impervious != xTrue) && (stuff->impervious != xFalse)) { if ((stuff->impervious != xTrue) && (stuff->impervious != xFalse)) {
client->errorValue = stuff->impervious; client->errorValue = stuff->impervious;
return BadValue; return BadValue;
@ -481,25 +494,6 @@ ProcXTestDispatch(ClientPtr client)
} }
} }
static int _X_COLD
SProcXTestGetVersion(ClientPtr client)
{
REQUEST(xXTestGetVersionReq);
REQUEST_SIZE_MATCH(xXTestGetVersionReq);
swaps(&stuff->minorVersion);
return ProcXTestGetVersion(client);
}
static int _X_COLD
SProcXTestCompareCursor(ClientPtr client)
{
REQUEST(xXTestCompareCursorReq);
REQUEST_SIZE_MATCH(xXTestCompareCursorReq);
swapl(&stuff->window);
swapl(&stuff->cursor);
return ProcXTestCompareCursor(client);
}
static int _X_COLD static int _X_COLD
XTestSwapFakeInput(ClientPtr client, xReq * req) XTestSwapFakeInput(ClientPtr client, xReq * req)
{ {
@ -524,37 +518,6 @@ XTestSwapFakeInput(ClientPtr client, xReq * req)
return Success; return Success;
} }
static int _X_COLD
SProcXTestFakeInput(ClientPtr client)
{
int n;
REQUEST(xReq);
n = XTestSwapFakeInput(client, stuff);
if (n != Success)
return n;
return ProcXTestFakeInput(client);
}
static int _X_COLD
SProcXTestDispatch(ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data) {
case X_XTestGetVersion:
return SProcXTestGetVersion(client);
case X_XTestCompareCursor:
return SProcXTestCompareCursor(client);
case X_XTestFakeInput:
return SProcXTestFakeInput(client);
case X_XTestGrabControl:
return ProcXTestGrabControl(client);
default:
return BadRequest;
}
}
/** /**
* Allocate an virtual slave device for xtest events, this * Allocate an virtual slave device for xtest events, this
* is a slave device to inputInfo master devices * is a slave device to inputInfo master devices
@ -686,7 +649,7 @@ void
XTestExtensionInit(void) XTestExtensionInit(void)
{ {
AddExtension(XTestExtensionName, 0, 0, AddExtension(XTestExtensionName, 0, 0,
ProcXTestDispatch, SProcXTestDispatch, ProcXTestDispatch, ProcXTestDispatch,
XTestExtensionTearDown, StandardMinorOpcode); XTestExtensionTearDown, StandardMinorOpcode);
xtest_evlist = InitEventList(GetMaximumEventsNum()); xtest_evlist = InitEventList(GetMaximumEventsNum());