XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xkb: XkbAssembleMap() use explicit parameters instead of struct

Browse Source 
Don't pass in the reply header struct anymore, instead only pass the
individual values that we really need here.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-14 16:40:42 +02:00
committed by Enrico Weigelt
parent 50037a450d
commit dd61928bde
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
xkb/xkb.c
View File

@@ -1466,32 +1466,38 @@ XkbComputeGetMapReplySize(XkbDescPtr xkb, xkbGetMapReply * rep)
return Success;
}
static void XkbAssembleMap(ClientPtr client, XkbDescPtr xkb,
xkbGetMapReply rep, x_rpcbuf_t *rpcbuf)
static void XkbAssembleMap(ClientPtr client, XkbDescPtr xkb, CARD8 firstType,
CARD8 nTypes, KeySym firstKeySym, CARD8 nKeySyms,
KeyCode firstKeyAct, CARD8 nKeyActs, KeyCode firstKeyBehavior,
CARD8 nKeyBehaviors, CARD16 virtualMods, KeyCode firstKeyExplicit,
CARD8 nKeyExplicit, KeyCode firstModMapKey, CARD8 nModMapKeys,
KeyCode firstVModMapKey, CARD8 nVModMapKeys, CARD8 totalKeyBehaviors,
CARD8 totalKeyExplicit, CARD8 totalModMapKeys, CARD8 totalVModMapKeys,
x_rpcbuf_t *rpcbuf)
{
XkbWriteKeyTypes(xkb, rep.firstType, rep.nTypes, rpcbuf, client);
XkbWriteKeySyms(xkb, rep.firstKeySym, rep.nKeySyms, rpcbuf, client);
XkbWriteKeyActions(xkb, rep.firstKeyAct, rep.nKeyActs, rpcbuf);
if (rep.totalKeyBehaviors > 0)
XkbWriteKeyBehaviors(xkb, rep.firstKeyBehavior, rep.nKeyBehaviors, rpcbuf);
XkbWriteKeyTypes(xkb, firstType, nTypes, rpcbuf, client);
XkbWriteKeySyms(xkb, firstKeySym, nKeySyms, rpcbuf, client);
XkbWriteKeyActions(xkb, firstKeyAct, nKeyActs, rpcbuf);
if (totalKeyBehaviors > 0)
XkbWriteKeyBehaviors(xkb, firstKeyBehavior, nKeyBehaviors, rpcbuf);
if (rep.virtualMods) {
if (virtualMods) {
CARD8 vmods[XkbPaddedSize(XkbNumVirtualMods)] = { 0 };
size_t sz = 0;
for (size_t i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) {
if (rep.virtualMods & bit) {
if (virtualMods & bit) {
vmods[sz++] = xkb->server->vmods[i];
}
}
x_rpcbuf_write_CARD8s(rpcbuf, vmods, XkbPaddedSize(sz));
}
if (rep.totalKeyExplicit > 0)
XkbWriteExplicit(xkb, rep.firstKeyExplicit, rep.nKeyExplicit, rpcbuf);
if (rep.totalModMapKeys > 0)
XkbWriteModifierMap(xkb, rep.firstModMapKey, rep.nModMapKeys, rpcbuf);
if (rep.totalVModMapKeys > 0)
XkbWriteVirtualModMap(xkb, rep.firstVModMapKey, rep.nVModMapKeys, rpcbuf);
if (totalKeyExplicit > 0)
XkbWriteExplicit(xkb, firstKeyExplicit, nKeyExplicit, rpcbuf);
if (totalModMapKeys > 0)
XkbWriteModifierMap(xkb, firstModMapKey, nModMapKeys, rpcbuf);
if (totalVModMapKeys > 0)
XkbWriteVirtualModMap(xkb, firstVModMapKey, nVModMapKeys, rpcbuf);
}
int
@@ -1610,7 +1616,11 @@ ProcXkbGetMap(ClientPtr client)
return rc;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
XkbAssembleMap(client, xkb, rep, &rpcbuf);
XkbAssembleMap(client, xkb, rep.firstType, rep.nTypes, rep.firstKeySym, rep.nKeySyms,
rep.firstKeyAct, rep.nKeyActs, rep.firstKeyBehavior, rep.nKeyBehaviors,
rep.virtualMods, rep.firstKeyExplicit, rep.nKeyExplicit, rep.firstModMapKey,
rep.nModMapKeys, rep.firstVModMapKey, rep.nVModMapKeys, rep.totalKeyBehaviors,
rep.totalKeyExplicit, rep.totalModMapKeys, rep.totalVModMapKeys, &rpcbuf);
if (rpcbuf.error)
return BadAlloc;
@@ -6040,7 +6050,12 @@ ProcXkbGetKbdByName(ClientPtr client)
if (reported & (XkbGBN_SymbolsMask | XkbGBN_TypesMask)) {
x_rpcbuf_t childbuf = { .swapped = client->swapped, .err_clear = TRUE };
XkbAssembleMap(client, new, mrep, &childbuf);
XkbAssembleMap(client, new, mrep.firstType, mrep.nTypes, mrep.firstKeySym,
mrep.nKeySyms, mrep.firstKeyAct, mrep.nKeyActs, mrep.firstKeyBehavior,
mrep.nKeyBehaviors, mrep.virtualMods, mrep.firstKeyExplicit,
mrep.nKeyExplicit, mrep.firstModMapKey, mrep.nModMapKeys,
mrep.firstVModMapKey, mrep.nVModMapKeys, mrep.totalKeyBehaviors,
mrep.totalKeyExplicit, mrep.totalModMapKeys, mrep.totalVModMapKeys, &rpcbuf);
if (childbuf.error)
return BadAlloc;