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

dix: write out X_TranslateCoords 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-02 20:15:21 +02:00
parent b06fc7e68c
commit df63401d6d
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xext/panoramiXprocs.c
View File

@ -622,7 +622,6 @@ PanoramiXTranslateCoords(ClientPtr client)
REQUEST(xTranslateCoordsReq); REQUEST(xTranslateCoordsReq);
int rc; int rc;
WindowPtr pWin, pDst; WindowPtr pWin, pDst;
xTranslateCoordsReply rep;
REQUEST_SIZE_MATCH(xTranslateCoordsReq); REQUEST_SIZE_MATCH(xTranslateCoordsReq);
rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixReadAccess); rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixReadAccess);
@ -631,7 +630,8 @@ PanoramiXTranslateCoords(ClientPtr client)
rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixReadAccess); rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixReadAccess);
if (rc != Success) if (rc != Success)
return rc; return rc;
rep = (xTranslateCoordsReply) {
xTranslateCoordsReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = 0, .length = 0,
@ -682,7 +682,13 @@ PanoramiXTranslateCoords(ClientPtr client)
rep.dstY += screenInfo.screens[0]->y; rep.dstY += screenInfo.screens[0]->y;
} }
WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep); if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.child);
swaps(&rep.dstX);
swaps(&rep.dstY);
}
WriteToClient(client, sizeof(rep), &rep);
return Success; return Success;
} }

12
dix/dispatch.c
View File

@ -1219,7 +1219,6 @@ ProcTranslateCoords(ClientPtr client)
REQUEST(xTranslateCoordsReq); REQUEST(xTranslateCoordsReq);
WindowPtr pWin, pDst; WindowPtr pWin, pDst;
xTranslateCoordsReply rep;
int rc; int rc;
REQUEST_SIZE_MATCH(xTranslateCoordsReq); REQUEST_SIZE_MATCH(xTranslateCoordsReq);
@ -1230,7 +1229,7 @@ ProcTranslateCoords(ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
rep = (xTranslateCoordsReply) { xTranslateCoordsReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = 0 .length = 0
@ -1281,7 +1280,14 @@ ProcTranslateCoords(ClientPtr client)
rep.dstX = x - pDst->drawable.x; rep.dstX = x - pDst->drawable.x;
rep.dstY = y - pDst->drawable.y; rep.dstY = y - pDst->drawable.y;
} }
WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep);
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.child);
swaps(&rep.dstX);
swaps(&rep.dstY);
}
WriteToClient(client, sizeof(rep), &rep);
return Success; return Success;
} }

10
dix/swaprep.c
View File

@ -305,16 +305,6 @@ SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply * pRep)
WriteToClient(pClient, size, pRep); WriteToClient(pClient, size, pRep);
} }
void _X_COLD
STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply * pRep)
{
swaps(&pRep->sequenceNumber);
swapl(&pRep->child);
swaps(&pRep->dstX);
swaps(&pRep->dstY);
WriteToClient(pClient, size, pRep);
}
void _X_COLD void _X_COLD
SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply * pRep) SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply * pRep)
{ {

2
dix/tables.c
View File

@ -755,7 +755,7 @@ ReplySwapPtr ReplySwapVector[256] = {
ReplyNotSwappd, ReplyNotSwappd,
(ReplySwapPtr) SQueryPointerReply, (ReplySwapPtr) SQueryPointerReply,
(ReplySwapPtr) SGetMotionEventsReply, (ReplySwapPtr) SGetMotionEventsReply,
(ReplySwapPtr) STranslateCoordsReply, /* 40 */ ReplyNotSwappd, /* 40 */
ReplyNotSwappd, ReplyNotSwappd,
ReplyNotSwappd, ReplyNotSwappd,
(ReplySwapPtr) SGetInputFocusReply, (ReplySwapPtr) SGetInputFocusReply,

5
include/swaprep.h
View File

@ -85,11 +85,6 @@ extern void SGetMotionEventsReply(ClientPtr /* pClient */ ,
xGetMotionEventsReply * /* pRep */ xGetMotionEventsReply * /* pRep */
); );
extern void STranslateCoordsReply(ClientPtr /* pClient */ ,
int /* size */ ,
xTranslateCoordsReply * /* pRep */
);
extern void SGetInputFocusReply(ClientPtr /* pClient */ , extern void SGetInputFocusReply(ClientPtr /* pClient */ ,
int /* size */ , int /* size */ ,
xGetInputFocusReply * /* pRep */ ); xGetInputFocusReply * /* pRep */ );