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: use x_rpcbuf_t in XkbWriteVirtualModMap()

Browse Source 
As it's caller now has x_rpcbuf, we can use it here, instead of
meddling with pre-allocated buffer space directly via raw pointer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-16 02:17:55 +02:00
committed by Enrico Weigelt
parent 18fe21fe0e
commit c3052dbc39
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xkb/xkb.c
View File

@@ -1331,24 +1331,17 @@ XkbSizeVirtualModMap(XkbDescPtr xkb, xkbGetMapReply * rep)
return len;
}
static char *
XkbWriteVirtualModMap(XkbDescPtr xkb, KeyCode firstVModMapKey,
CARD8 nVModMapKeys, char *buf)
static void XkbWriteVirtualModMap(XkbDescPtr xkb, KeyCode firstVModMapKey,
CARD8 nVModMapKeys, x_rpcbuf_t *rpcbuf)
{
unsigned i;
xkbVModMapWireDesc *wire;
unsigned short *pMap;
wire = (xkbVModMapWireDesc *) buf;
pMap = &xkb->server->vmodmap[firstVModMapKey];
for (i = 0; i < nVModMapKeys; i++, pMap++) {
unsigned short *pMap = &xkb->server->vmodmap[firstVModMapKey];
for (int i = 0; i < nVModMapKeys; i++, pMap++) {
if (*pMap != 0) {
xkbVModMapWireDesc *wire = x_rpcbuf_reserve(rpcbuf, sizeof(xkbVModMapWireDesc));
wire->key = i + firstVModMapKey;
wire->vmods = *pMap;
wire++;
}
}
return (char *) wire;
}
static Status
@@ -1394,11 +1387,8 @@ static void XkbAssembleMap(ClientPtr client, XkbDescPtr xkb,
XkbWriteExplicit(xkb, rep.firstKeyExplicit, rep.nKeyExplicit, rpcbuf);
if (rep.totalModMapKeys > 0)
XkbWriteModifierMap(xkb, rep.firstModMapKey, rep.nModMapKeys, rpcbuf);
char *desc = rpcbuf->buffer + rpcbuf->wpos;
if (rep.totalVModMapKeys > 0)
desc = XkbWriteVirtualModMap(xkb, rep.firstVModMapKey, rep.nVModMapKeys, desc);
XkbWriteVirtualModMap(xkb, rep.firstVModMapKey, rep.nVModMapKeys, rpcbuf);
}
int