Make xkb_layout reset xkb_file and vice versa #8761
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
Users that generally use a custom keyboard layout via xkb_file
likely want to reset it to `us` for other devices that pretend to be
keyboards like security keys, barcode scanners or shortcut remotes.
For example:
input 10429:2395:UGTABLET_Artist_Pro_16_(Gen2) {
xkb_layout us
}
input type:keyboard {
xkb_file ~/.config/sway/my_weird_layout.xkb
}
Such configuration however didn't work because the config merge logic
merged both commands together and then the xkb_file took precedence.
Fixes swaywm#8329.
| free(dst->xkb_file); | ||
| dst->xkb_file = src->xkb_file ? strdup(src->xkb_file) : NULL; | ||
| dst->xkb_file_is_set = dst->xkb_file != NULL; | ||
| dst->xkb_layout = NULL; |
There was a problem hiding this comment.
xkb_file overrides not just xkb_layout, but also xkb_model, xkb_options, xkb_rules, and xkb_variant.
There was a problem hiding this comment.
Yes but I would have assumed that these other options don't take effect if xkb_file is set and xkb_layout isn't. Looking at sway_keyboard_compile_keymap that does seem to be the case?
In any case I think it would be nice to log or display an error in case conflicting xkb_ options are specified in the same config block. But I'd defer that to another PR.
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.
Users that generally use a custom keyboard layout via xkb_file likely want to reset it to
usfor other devices that pretend to be keyboards like security keys, barcode scanners or shortcut remotes. For example:Such configuration however didn't work because the config merge logic merged both commands together and then the xkb_file took precedence.
Fixes #8329.