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

(!1632) xkb: XkbWriteKeyBehaviors(): only pass in the needed data 

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 0ed09b7093
commit cffb71b947
1 changed files with 5 additions and 6 deletions
Show Stats 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 * static char *
XkbWriteKeyBehaviors(XkbDescPtr xkb, xkbGetMapReply * rep, char *buf, XkbWriteKeyBehaviors(XkbDescPtr xkb, KeyCode firstKeyBehavior, CARD8 nKeyBehaviors, char *buf)
ClientPtr client)
{ {
unsigned i; unsigned i;
xkbBehaviorWireDesc *wire; xkbBehaviorWireDesc *wire;
XkbBehavior *pBhvr; XkbBehavior *pBhvr;
wire = (xkbBehaviorWireDesc *) buf; wire = (xkbBehaviorWireDesc *) buf;
pBhvr = &xkb->server->behaviors[rep->firstKeyBehavior]; pBhvr = &xkb->server->behaviors[firstKeyBehavior];
for (i = 0; i < rep->nKeyBehaviors; i++, pBhvr++) { for (i = 0; i < nKeyBehaviors; i++, pBhvr++) {
if (pBhvr->type != XkbKB_Default) { if (pBhvr->type != XkbKB_Default) {
wire->key = i + rep->firstKeyBehavior; wire->key = i + firstKeyBehavior;
wire->type = pBhvr->type; wire->type = pBhvr->type;
wire->data = pBhvr->data; wire->data = pBhvr->data;
wire++; wire++;
@ -1421,7 +1420,7 @@ XkbSendMap(ClientPtr client, XkbDescPtr xkb, xkbGetMapReply * rep)
if (rep->nKeyActs > 0) if (rep->nKeyActs > 0)
desc = XkbWriteKeyActions(xkb, rep->firstKeyAct, rep->nKeyActs, desc); desc = XkbWriteKeyActions(xkb, rep->firstKeyAct, rep->nKeyActs, desc);
if (rep->totalKeyBehaviors > 0) if (rep->totalKeyBehaviors > 0)
desc = XkbWriteKeyBehaviors(xkb, rep, desc, client); desc = XkbWriteKeyBehaviors(xkb, rep->firstKeyBehavior, rep->nKeyBehaviors, desc);
if (rep->virtualMods) { if (rep->virtualMods) {
register int sz, bit; register int sz, bit;