fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-01 00:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'xkb/fix-types-level-names-serialization' into 'master'

Browse source 
xkb: Fix key type level names serialization

See merge request xorg/xserver!2082
This commit is contained in:
Wismill 2026-02-04 13:05:06 +01:00
commit 884b9d1cb0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xkb/xkb.c
View file

@ -3941,7 +3941,8 @@ XkbSendNames(ClientPtr client, XkbDescPtr xkb, xkbGetNamesReply * rep)
register CARD32 *atm;
for (i = 0; i < rep->nTypes; i++, type++) {
*desc++ = type->num_levels;
/* Either no name or all of them, even empty ones */
*desc++ = (type->level_names) ? type->num_levels : 0;
}
desc += XkbPaddedSize(rep->nTypes) - rep->nTypes;

2
xkb/xkbUtils.c
View file

@ -1044,7 +1044,7 @@ _XkbCopyClientMap(XkbDescPtr src, XkbDescPtr dst)
if (dtype->num_levels && dtype->level_names &&
i < dst->map->num_types)
free(dtype->level_names);
dtype->num_levels = 0;
dtype->num_levels = stype->num_levels;
dtype->level_names = NULL;
}