Fix empty layout display for custom XKB layouts in sway/language module#5151
Open
nick133 wants to merge 1 commit into
Open
Fix empty layout display for custom XKB layouts in sway/language module#5151nick133 wants to merge 1 commit into
nick133 wants to merge 1 commit into
Conversation
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
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.
Problem
Custom XKB layouts (e.g. defined in ~/.config/xkb/symbols/) are not present in libxkbregistry.
When such a layout is active, sway/language module fails to resolve it in layouts_map_, resulting in empty output for all layout placeholders ({short}, {long}, {shortDescription}).
Cause
The code previously used
layouts_map_[current_layout], which assumes every active layout exists inlayouts_map_:layout_ = layouts_map_[current_layout];For unknown layouts, this produces a default Layout with empty fields.
Fix
Add a fallback for unknown layouts instead of relying on
map::operator[].Notes