(release/25.1) xkb: Fix key type without level names in XkbCopyKeymap#2283
Open
metux wants to merge 1 commit intorelease/25.1from
Open
Conversation
A key type that has no level names is legit. Before this commit, `XkbCopyKeymap` would make such level inconsistent by setting its number of levels to 0 while keeping its map entries. It suffices to clear the names array. Fixed by copying the level count from the source type. WARNING: this will trigger an error in `XkbGetNames`, which worked before this commit only by chance. This is fixed in the next commit. Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2082> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
metux
force-pushed
the
pr/xkb-fix-key-type-without-level-names-in-xkbcopykeymap-_2026-04-18_19-50-35
branch
from
4d4db61 to
f0a7223
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A key type that has no level names is legit. Before this commit,
XkbCopyKeymapwould make such level inconsistent by setting itsnumber of levels to 0 while keeping its map entries. It suffices
to clear the names array.
Fixed by copying the level count from the source type.
WARNING: this will trigger an error in
XkbGetNames, which workedbefore this commit only by chance. This is fixed in the next commit.
Part-of: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2082