keyboard: improve live session layout handling - #220
Merged
Conversation
ptr1337
commented
May 9, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts keyboard layout handling with a focus on live-session behavior (group switching, KWin/Gnome integration), and tightens how layout/variant lists are generated when an extra ASCII-capable layout is added.
Changes:
- Refactors group-switcher option selection into a shared helper and reuses it across XKB/locale1/KWin/Gnome apply paths.
- Improves KWin
kxkbrcrewriting by ensuring keys are written under a[Layout]group (creating it if needed) and supporting writingOptions=/Use=true. - Updates keyboard module configuration/schema: adds
configure.gnome, and changes the sample config defaults foruseLocale1andconfigure.kwin.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/modules/keyboard/SetKeyboardLayoutJob.cpp |
Adds variantList() helper to better handle variants when additional layouts are (not) present. |
src/modules/keyboard/Config.cpp |
Refactors group-switcher determination; expands KWin config rewriting; adjusts cancel/apply configuration logic. |
src/modules/keyboard/keyboard.schema.yaml |
Extends schema with configure.gnome. |
src/modules/keyboard/keyboard.conf |
Updates sample configuration defaults (useLocale1, configure.kwin). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+397
to
+400
| if ( !options.isEmpty() ) | ||
| { | ||
| setLayoutKey( content, QStringLiteral( "Options=" ), options ); | ||
| } |
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.
and a lot of fixes