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

dix: write out X_SetModifierMapping 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 15:48:52 +02:00
parent 361a8ef46f
commit 80d748e1cd
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dix/devices.c
View File

@ -1759,7 +1759,6 @@ BadDeviceMap(BYTE * buff, int length, unsigned low, unsigned high, XID *errval)
int int
ProcSetModifierMapping(ClientPtr client) ProcSetModifierMapping(ClientPtr client)
{ {
xSetModifierMappingReply rep;
int rc; int rc;
REQUEST(xSetModifierMappingReq); REQUEST(xSetModifierMappingReq);
@ -1769,11 +1768,6 @@ ProcSetModifierMapping(ClientPtr client)
bytes_to_int32(sizeof(xSetModifierMappingReq)))) bytes_to_int32(sizeof(xSetModifierMappingReq))))
return BadLength; return BadLength;
rep = (xSetModifierMappingReply) {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0
};
rc = change_modmap(client, PickKeyboard(client), (KeyCode *) &stuff[1], rc = change_modmap(client, PickKeyboard(client), (KeyCode *) &stuff[1],
stuff->numKeyPerModifier); stuff->numKeyPerModifier);
@ -1782,9 +1776,17 @@ ProcSetModifierMapping(ClientPtr client)
if (rc != MappingSuccess && rc != MappingFailed && rc != MappingBusy) if (rc != MappingSuccess && rc != MappingFailed && rc != MappingBusy)
return rc; return rc;
rep.success = rc; xSetModifierMappingReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
.success = rc,
};
WriteReplyToClient(client, sizeof(xSetModifierMappingReply), &rep); if (client->swapped) {
swaps(&rep.sequenceNumber);
}
WriteToClient(client, sizeof(rep), &rep);
return Success; return Success;
} }

2
dix/tables.c
View File

@ -833,7 +833,7 @@ ReplySwapPtr ReplySwapVector[256] = {
ReplyNotSwappd, /* 115 */ ReplyNotSwappd, /* 115 */
(ReplySwapPtr) SGenericReply, /* SetPointerMapping */ (ReplySwapPtr) SGenericReply, /* SetPointerMapping */
(ReplySwapPtr) SGetPointerMappingReply, (ReplySwapPtr) SGetPointerMappingReply,
(ReplySwapPtr) SGenericReply, /* SetModifierMapping */ ReplyNotSwappd,
(ReplySwapPtr) SGetModifierMappingReply, /* 119 */ (ReplySwapPtr) SGetModifierMappingReply, /* 119 */
ReplyNotSwappd, /* 120 */ ReplyNotSwappd, /* 120 */
ReplyNotSwappd, /* 121 */ ReplyNotSwappd, /* 121 */