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

dix: write out X_GetPointerControl 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 16:41:29 +02:00
parent 39dcf3e233
commit 13bec61739
4 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dix/devices.c
View File

@ -2473,7 +2473,6 @@ ProcGetMotionEvents(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
xTimecoord *coords = (xTimecoord *) NULL; xTimecoord *coords = (xTimecoord *) NULL;
xGetMotionEventsReply rep;
int i, count, xmin, xmax, ymin, ymax, rc; int i, count, xmin, xmax, ymin, ymax, rc;
unsigned long nEvents; unsigned long nEvents;
DeviceIntPtr mouse = PickPointer(client); DeviceIntPtr mouse = PickPointer(client);
@ -2492,10 +2491,7 @@ ProcGetMotionEvents(ClientPtr client)
UpdateCurrentTimeIf(); UpdateCurrentTimeIf();
if (mouse->valuator->motionHintWindow) if (mouse->valuator->motionHintWindow)
MaybeStopHint(mouse, client); MaybeStopHint(mouse, client);
rep = (xGetMotionEventsReply) {
.type = X_Reply,
.sequenceNumber = client->sequence
};
nEvents = 0; nEvents = 0;
start = ClientTimeToServerTime(stuff->start); start = ClientTimeToServerTime(stuff->start);
stop = ClientTimeToServerTime(stuff->stop); stop = ClientTimeToServerTime(stuff->stop);
@ -2522,9 +2518,20 @@ ProcGetMotionEvents(ClientPtr client)
nEvents++; nEvents++;
} }
} }
rep.length = nEvents * bytes_to_int32(sizeof(xTimecoord));
rep.nEvents = nEvents; xGetMotionEventsReply rep = {
WriteReplyToClient(client, sizeof(xGetMotionEventsReply), &rep); .type = X_Reply,
.sequenceNumber = client->sequence,
.length = nEvents * bytes_to_int32(sizeof(xTimecoord)),
.nEvents = nEvents,
};
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swapl(&rep.nEvents);
}
WriteToClient(client, sizeof(xGetMotionEventsReply), &rep);
if (nEvents) { if (nEvents) {
client->pSwapReplyFunc = (ReplySwapPtr) SwapTimeCoordWrite; client->pSwapReplyFunc = (ReplySwapPtr) SwapTimeCoordWrite;
WriteSwappedDataToClient(client, nEvents * sizeof(xTimecoord), WriteSwappedDataToClient(client, nEvents * sizeof(xTimecoord),

9
dix/swaprep.c
View File

@ -287,15 +287,6 @@ SwapTimeCoordWrite(ClientPtr pClient, int size, xTimecoord * pRep)
} }
void _X_COLD
SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply * pRep)
{
swaps(&pRep->sequenceNumber);
swapl(&pRep->length);
swapl(&pRep->nEvents);
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

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

5
include/swaprep.h
View File

@ -75,11 +75,6 @@ extern void SwapTimeCoordWrite(ClientPtr /* pClient */ ,
int /* size */ , int /* size */ ,
xTimecoord * /* pRep */ ); xTimecoord * /* pRep */ );
extern void SGetMotionEventsReply(ClientPtr /* pClient */ ,
int /* size */ ,
xGetMotionEventsReply * /* pRep */
);
extern void SGetInputFocusReply(ClientPtr /* pClient */ , extern void SGetInputFocusReply(ClientPtr /* pClient */ ,
int /* size */ , int /* size */ ,
xGetInputFocusReply * /* pRep */ ); xGetInputFocusReply * /* pRep */ );