diff options
| author | Benno Schulenberg <bensberg@telfort.nl> | 2022-09-18 17:03:02 +0200 |
|---|---|---|
| committer | Benno Schulenberg <bensberg@telfort.nl> | 2022-09-22 11:47:24 +0200 |
| commit | 6bba53fd305ac2e6b20ec094a0f01337da563e17 (patch) | |
| tree | fe1f5e5a4dffb9af000ad36fe742de79532e9903 /rules | |
| parent | 28b21415b6b7df13c81036cf0c49aa71d5fefa0a (diff) | |
| download | xkeyboard-config-6bba53fd305ac2e6b20ec094a0f01337da563e17.tar.gz | |
rules: rename an option, and compose its effect from two others
Making the CapsLock key into a Control key, and the left Control key
into a group toggle, can be achieved by combining two existing options
-- they just need to be combined in the correct order: the group toggle
should override the second half of `swapcaps`.
The option is also renamed, to more clearly express its result.
An alias is added for compatibilty. (An alias for another option
is also added, as commit 7124dd5127 put it in the wrong place.)
This fixes issue #349.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/0042-o_s.part | 2 | ||||
| -rw-r--r-- | rules/compat/0041-o_s.part | 3 | ||||
| -rw-r--r-- | rules/compat/variantsMapping.lst | 1 | ||||
| -rw-r--r-- | rules/xfree98 | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part index a69cf6d..289d4a7 100644 --- a/rules/0042-o_s.part +++ b/rules/0042-o_s.part @@ -81,7 +81,7 @@ ctrl:lctrl_meta = +ctrl(lctrl_meta) ctrl:swapcaps = +ctrl(swapcaps) ctrl:hyper_capscontrol = +ctrl(hyper_capscontrol) - ctrl:swapcaps_and_switch_layout = +ctrl(swapcaps_and_switch_layout) + ctrl:grouptoggle_capscontrol = +ctrl(swapcaps)+group(lctrl_toggle) ctrl:ac_ctrl = +ctrl(ac_ctrl) ctrl:aa_ctrl = +ctrl(aa_ctrl) ctrl:rctrl_ralt = +ctrl(rctrl_ralt) diff --git a/rules/compat/0041-o_s.part b/rules/compat/0041-o_s.part index 17ded7c..89bc685 100644 --- a/rules/compat/0041-o_s.part +++ b/rules/compat/0041-o_s.part @@ -3,3 +3,6 @@ grp:win_menu_switch = +group(win_menu_select) grp:lctrl_rctrl_switch = +group(ctrl_select) // Delete the above three aliases in July 2027. + ctrl:swapcaps_hyper = +ctrl(hyper_capscontrol) + ctrl:swapcaps_and_switch_layout = +ctrl(swapcaps)+group(lctrl_toggle) +// Delete the above two aliases in September 2027. diff --git a/rules/compat/variantsMapping.lst b/rules/compat/variantsMapping.lst index 7c10067..4afdb40 100644 --- a/rules/compat/variantsMapping.lst +++ b/rules/compat/variantsMapping.lst @@ -1,6 +1,5 @@ ben basic in ben ben probhat in ben_probhat -ctrl swapcaps_hyper ctrl hyper_capscontrol dev basic in deva dzdwi basic bt basic fi basic fi classic diff --git a/rules/xfree98 b/rules/xfree98 index 0621377..022811a 100644 --- a/rules/xfree98 +++ b/rules/xfree98 @@ -24,7 +24,7 @@ ctrl:lctrl_meta = +ctrl(lctrl_meta) ctrl:swapcaps = +ctrl(swapcaps) ctrl:hyper_capscontrol = +ctrl(hyper_capscontrol) - ctrl:swapcaps_and_switch_layout = +ctrl(swapcaps_and_switch_layout) + ctrl:grouptoggle_capscontrol = +ctrl(swapcaps)+group(lctrl_toggle) ctrl:ac_ctrl = +ctrl(ac_ctrl) ctrl:aa_ctrl = +ctrl(aa_ctrl) |