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

XI: directly write out X_SetDeviceMode reply 

Write out X_SetDeviceMode the reply directly (and do the swapping
within the request handler) instead of going through separate callback
that's having demux the replies again.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-03-31 20:04:34 +02:00
parent baac2944f6
commit 00a19a11d5
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xi/extinit.c
View File

@ -421,9 +421,7 @@ SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep)
{ {
/* All we look at is the type field */ /* All we look at is the type field */
/* This is common to all replies */ /* This is common to all replies */
if (rep->RepType == X_SetDeviceMode) if (rep->RepType == X_GetSelectedExtensionEvents)
SRepXSetDeviceMode(client, len, (xSetDeviceModeReply *) rep);
else if (rep->RepType == X_GetSelectedExtensionEvents)
SRepXGetSelectedExtensionEvents(client, len, SRepXGetSelectedExtensionEvents(client, len,
(xGetSelectedExtensionEventsReply *) (xGetSelectedExtensionEventsReply *)
rep); rep);

22
Xi/setmode.c
View File

@ -113,21 +113,11 @@ ProcXSetDeviceMode(ClientPtr client)
return rep.status; return rep.status;
} }
WriteReplyToClient(client, sizeof(xSetDeviceModeReply), &rep); if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
}
WriteToClient(client, sizeof(xSetDeviceModeReply), &rep);
return Success; return Success;
} }
/***********************************************************************
*
* This procedure writes the reply for the XSetDeviceMode function,
* if the client and server have a different byte ordering.
*
*/
void _X_COLD
SRepXSetDeviceMode(ClientPtr client, int size, xSetDeviceModeReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}

5
Xi/setmode.h
View File

@ -33,9 +33,4 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int ProcXSetDeviceMode(ClientPtr /* client */ int ProcXSetDeviceMode(ClientPtr /* client */
); );
void SRepXSetDeviceMode(ClientPtr /* client */ ,
int /* size */ ,
xSetDeviceModeReply * /* rep */
);
#endif /* SETMODE_H */ #endif /* SETMODE_H */