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.
This is a refactor of #485 (and of the first attempt #446, see #484 for the rational). The differences is that is it rebased on master and without exposing the new format
XKB_KEYMAP_FORMAT_TEXT_V1_1
yet. We use an experimentalXKB_EXPERIMENTAL_LOCKS
environment variable to activate it, until we agree on an API (see #484). Note that this is only temporary, in order to be able to test it in real conditions, without waiting for DE to enable configuration of the keymap format.In order to fix #372 and #420, one must set the env variable
XKB_EXPERIMENTAL_LOCKS
to something, e.g.true
.Additionally for #420, on must must also modify
/usr/share/xkb/symbols/group
(preferably by overriding it via~/.config/xkb
), that is use multiple actions thanks to #487:Changes:
XKB_KEYMAP_FORMAT_TEXT_V1_1
lockOnRelease
forLockGroup
. It locks the group on release rather than press as in the protocol. Intended to fix issue for group lock on e.g.shift+alt
. It is the default forXKB_KEYMAP_FORMAT_TEXT_V1_1
, so that it fixes the issue with thexkeyboard-config
files unchanged.unlockOnPress
forLockMods
. It unlocks the modifiers on second press rather than the second release, as in the protocol. Intended to fix issue withCapsLock
for fast typists. It is the default forXKB_KEYMAP_FORMAT_TEXT_V1_1
, so that it fixes the issue with thexkeyboard-config
files unchanged.--format
options to tools, in order to select the keymap format for parsing and serializing.A lot of files are affected, but hopefully it is easier to review per commit. The first commit should be in an independent PR (hence the WIP title).
TODO:
@whot @bluetech @fooishbar