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

dix: write out X_QueryTree reply directly 

No need for using a complex callback machinery, if we just move the
little pieces of byte-swapping directly into the request handler.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-04-03 17:40:54 +02:00
parent f59ffc7c93
commit 9541233f8d
4 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dix/dispatch.c
View File

@ -1027,7 +1027,6 @@ ProcGetGeometry(ClientPtr client)
int int
ProcQueryTree(ClientPtr client) ProcQueryTree(ClientPtr client)
{ {
xQueryTreeReply reply;
int rc, numChildren = 0; int rc, numChildren = 0;
WindowPtr pChild, pWin, pHead; WindowPtr pChild, pWin, pHead;
Window *childIDs = (Window *) NULL; Window *childIDs = (Window *) NULL;
@ -1039,12 +1038,6 @@ ProcQueryTree(ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
reply = (xQueryTreeReply) {
.type = X_Reply,
.sequenceNumber = client->sequence,
.root = pWin->drawable.pScreen->root->drawable.id,
.parent = (pWin->parent) ? pWin->parent->drawable.id : (Window) None
};
pHead = RealChildHead(pWin); pHead = RealChildHead(pWin);
for (pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib) for (pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib)
numChildren++; numChildren++;
@ -1059,17 +1052,26 @@ ProcQueryTree(ClientPtr client)
childIDs[curChild++] = pChild->drawable.id; childIDs[curChild++] = pChild->drawable.id;
} }
reply.nChildren = numChildren; xQueryTreeReply rep = {
reply.length = bytes_to_int32(numChildren * sizeof(Window)); .type = X_Reply,
.sequenceNumber = client->sequence,
.root = pWin->drawable.pScreen->root->drawable.id,
.parent = (pWin->parent) ? pWin->parent->drawable.id : (Window) None,
.nChildren = numChildren,
.length = bytes_to_int32(numChildren * sizeof(Window)),
};
WriteReplyToClient(client, sizeof(xQueryTreeReply), &reply); if (client->swapped) {
if (numChildren) { SwapLongs(childIDs, rep.length);
client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; swaps(&rep.sequenceNumber);
WriteSwappedDataToClient(client, numChildren * sizeof(Window), swapl(&rep.length);
childIDs); swapl(&rep.root);
free(childIDs); swapl(&rep.parent);
swaps(&rep.nChildren);
} }
WriteToClient(client, sizeof(rep), &rep);
WriteToClient(client, numChildren * sizeof(Window), childIDs);
free(childIDs);
return Success; return Success;
} }

11
dix/swaprep.c
View File

@ -183,17 +183,6 @@ SGenericReply(ClientPtr pClient, int size, xGenericReply * pRep)
WriteToClient(pClient, size, pRep); WriteToClient(pClient, size, pRep);
} }
void _X_COLD
SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply * pRep)
{
swaps(&pRep->sequenceNumber);
swapl(&pRep->length);
swapl(&pRep->root);
swapl(&pRep->parent);
swaps(&pRep->nChildren);
WriteToClient(pClient, size, pRep);
}
void _X_COLD void _X_COLD
SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply * pRep) SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply * pRep)
{ {

2
dix/tables.c
View File

@ -730,7 +730,7 @@ ReplySwapPtr ReplySwapVector[256] = {
ReplyNotSwappd, ReplyNotSwappd,
ReplyNotSwappd, ReplyNotSwappd,
ReplyNotSwappd, ReplyNotSwappd,
(ReplySwapPtr) SQueryTreeReply, /* 15 */ ReplyNotSwappd, /* 15 */
(ReplySwapPtr) SInternAtomReply, (ReplySwapPtr) SInternAtomReply,
(ReplySwapPtr) SGetAtomNameReply, (ReplySwapPtr) SGetAtomNameReply,
ReplyNotSwappd, ReplyNotSwappd,

4
include/swaprep.h
View File

@ -42,10 +42,6 @@ extern void SGenericReply(ClientPtr /* pClient */ ,
int /* size */ , int /* size */ ,
xGenericReply * /* pRep */ ); xGenericReply * /* pRep */ );
extern void SQueryTreeReply(ClientPtr /* pClient */ ,
int /* size */ ,
xQueryTreeReply * /* pRep */ );
extern void SInternAtomReply(ClientPtr /* pClient */ , extern void SInternAtomReply(ClientPtr /* pClient */ ,
int /* size */ , int /* size */ ,
xInternAtomReply * /* pRep */ ); xInternAtomReply * /* pRep */ );