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

(submit/cleanup-xkb) xkb: XkbWriteKeyBehaviors(): only pass in the needed data

Browse Source 
We don't need the whole struct here, especially do we not wanna change it.
Therefore only pass in what's really needed, so it gets easier to understand.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-07-15 19:29:10 +02:00
parent bae7f3e55a
commit 752172ccdf
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xkb/xkb.c
View File

@@ -1240,18 +1240,17 @@ XkbSizeKeyBehaviors(XkbDescPtr xkb, xkbGetMapReply * rep)
}
static char *
XkbWriteKeyBehaviors(XkbDescPtr xkb, xkbGetMapReply * rep, char *buf,
ClientPtr client)
XkbWriteKeyBehaviors(XkbDescPtr xkb, KeyCode firstKeyBehavior, CARD8 nKeyBehaviors, char *buf)
{
unsigned i;
xkbBehaviorWireDesc *wire;
XkbBehavior *pBhvr;
wire = (xkbBehaviorWireDesc *) buf;
pBhvr = &xkb->server->behaviors[rep->firstKeyBehavior];
for (i = 0; i < rep->nKeyBehaviors; i++, pBhvr++) {
pBhvr = &xkb->server->behaviors[firstKeyBehavior];
for (i = 0; i < nKeyBehaviors; i++, pBhvr++) {
if (pBhvr->type != XkbKB_Default) {
wire->key = i + rep->firstKeyBehavior;
wire->key = i + firstKeyBehavior;
wire->type = pBhvr->type;
wire->data = pBhvr->data;
wire++;
@@ -1421,7 +1420,7 @@ XkbSendMap(ClientPtr client, XkbDescPtr xkb, xkbGetMapReply * rep)
if (rep->nKeyActs > 0)
desc = XkbWriteKeyActions(xkb, rep->firstKeyAct, rep->nKeyActs, desc);
if (rep->totalKeyBehaviors > 0)
desc = XkbWriteKeyBehaviors(xkb, rep, desc, client);
desc = XkbWriteKeyBehaviors(xkb, rep->firstKeyBehavior, rep->nKeyBehaviors, desc);
if (rep->virtualMods) {
register int sz, bit;