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

xkb: split XkbSendCompatMap() 

This function is a funny beast: it assembles and writes out an xkbGetCompatMapReply,
called in two different cases, ProcXkbGetCompatMap() as well as ProcXkbGetKbdByName().
In the latter case the whole reply is contained in another one. That's the reason
why it's payload size is computed separately - the caller must know that in order
to set up the container's reply size correctly.

As preparation for upcoming simplifications of the reply send path, splitting off
this function into pieces: XkbAssembleCompatMap() just assembles the reply payload,
while it's callers now responsible for preparing the request header and writing
out both pieces.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-25 16:28:48 +02:00
parent 182404fde6
commit d90335b8f1
1 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
xkb/xkb.c
View File

@ -2798,16 +2798,13 @@ XkbComputeGetCompatMapReplySize(XkbCompatMapPtr compat,
return Success; return Success;
} }
static int static void
XkbSendCompatMap(ClientPtr client, XkbAssembleCompatMap(ClientPtr client,
XkbCompatMapPtr compat, xkbGetCompatMapReply rep) XkbCompatMapPtr compat,
xkbGetCompatMapReply rep,
char *buf)
{ {
int sz = rep.length * sizeof(CARD32); if (rep.length) {
char *buf = calloc(1, sz);
if (sz && (!buf))
return BadAlloc;
if (sz) {
register unsigned i, bit; register unsigned i, bit;
xkbModsWireDesc *grp; xkbModsWireDesc *grp;
XkbSymInterpretPtr sym = &compat->sym_interpret[rep.firstSI]; XkbSymInterpretPtr sym = &compat->sym_interpret[rep.firstSI];
@ -2841,19 +2838,6 @@ XkbSendCompatMap(ClientPtr client,
wire = (xkbSymInterpretWireDesc *) grp; wire = (xkbSymInterpretWireDesc *) grp;
} }
} }
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.firstSI);
swaps(&rep.nSI);
swaps(&rep.nTotalSI);
}
WriteToClient(client, sizeof(xkbGetCompatMapReply), &rep);
WriteToClient(client, sz, buf);
free(buf);
return Success;
} }
int int
@ -2893,7 +2877,26 @@ ProcXkbGetCompatMap(ClientPtr client)
return BadValue; return BadValue;
} }
XkbComputeGetCompatMapReplySize(compat, &rep); XkbComputeGetCompatMapReplySize(compat, &rep);
return XkbSendCompatMap(client, compat, rep);
int sz = rep.length * sizeof(CARD32);
char *buf = calloc(1, sz);
if (rep.length && (!buf)) // rep.length = 0 is valid here
return BadAlloc;
XkbAssembleCompatMap(client, compat, rep, buf);
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.firstSI);
swaps(&rep.nSI);
swaps(&rep.nTotalSI);
}
WriteToClient(client, sizeof(xkbGetCompatMapReply), &rep);
WriteToClient(client, sz, buf);
free(buf);
return Success;
} }
/** /**
@ -6065,8 +6068,27 @@ ProcXkbGetKbdByName(ClientPtr client)
free(buf); free(buf);
} }
if (reported & XkbGBN_CompatMapMask) if (reported & XkbGBN_CompatMapMask) {
XkbSendCompatMap(client, new->compat, crep); int sz = crep.length * sizeof(CARD32);
char *buf = calloc(1, sz);
if (!buf)
return BadAlloc;
XkbAssembleCompatMap(client, new->compat, crep, buf);
if (client->swapped) {
swaps(&crep.sequenceNumber);
swapl(&crep.length);
swaps(&crep.firstSI);
swaps(&crep.nSI);
swaps(&crep.nTotalSI);
}
WriteToClient(client, sizeof(crep), &crep);
WriteToClient(client, sz, buf);
free(buf);
}
if (reported & XkbGBN_IndicatorMapMask) if (reported & XkbGBN_IndicatorMapMask)
XkbSendIndicatorMap(client, new->indicators, irep); XkbSendIndicatorMap(client, new->indicators, irep);
if (reported & (XkbGBN_KeyNamesMask | XkbGBN_OtherNamesMask)) if (reported & (XkbGBN_KeyNamesMask | XkbGBN_OtherNamesMask))