diff options
| author | Benno Schulenberg <bensberg@telfort.nl> | 2022-07-05 09:23:10 +0200 |
|---|---|---|
| committer | Sergey Udaltsov <sergey.udaltsov@gmail.com> | 2022-07-07 09:30:08 +0000 |
| commit | 17bd4e4d1d68e4f8aadaf4c30bb1469b6b9b6d3e (patch) | |
| tree | 9a276a2f89436e50527285271631124d9811dd2b /rules | |
| parent | 9976c34ae771ea04b133cc01a7e1ef036666757e (diff) | |
| download | xkeyboard-config-17bd4e4d1d68e4f8aadaf4c30bb1469b6b9b6d3e.tar.gz | |
rename three group options, to be distinct from "while-pressed" options
In general, options whose name ends in "_switch" do something *while*
the relevant key or key combination is being held -- see, for example,
grp:menu_switch, lv3:ralt_switch, or lv5:rctrl_switch.
The renamed three options, however, set a group when they are pressed,
and this group remains set when the relevant key is released.
Keep the old names around as aliases, for backward compatibility.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/0042-o_s.part | 6 | ||||
| -rw-r--r-- | rules/base.xml | 6 | ||||
| -rw-r--r-- | rules/compat/0041-o_s.part | 5 | ||||
| -rw-r--r-- | rules/meson.build | 1 |
4 files changed, 12 insertions, 6 deletions
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part index 7276bf8..f0bcd5f 100644 --- a/rules/0042-o_s.part +++ b/rules/0042-o_s.part @@ -25,8 +25,9 @@ grp:ctrls_toggle = +group(ctrls_toggle) grp:caps_toggle = +group(caps_toggle) grp:shift_caps_toggle = +group(shift_caps_toggle) - grp:shift_caps_switch = +group(shift_caps_switch) - grp:win_menu_switch = +group(win_menu_switch) + grp:caps_select = +group(caps_select) + grp:win_menu_select = +group(win_menu_select) + grp:ctrl_select = +group(ctrl_select) grp:alt_caps_toggle = +group(alt_caps_toggle) grp:alt_space_toggle = +group(alt_space_toggle) grp:menu_toggle = +group(menu_toggle) @@ -39,7 +40,6 @@ grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) grp:sclk_toggle = +group(sclk_toggle) - grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch) grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu) grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle) grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle) diff --git a/rules/base.xml b/rules/base.xml index 2e0ca68..ea5fcd0 100644 --- a/rules/base.xml +++ b/rules/base.xml @@ -6931,19 +6931,19 @@ </option> <option> <configItem> - <name>grp:shift_caps_switch</name> + <name>grp:caps_select</name> <description>Caps Lock to first layout; Shift+Caps Lock to second layout</description> </configItem> </option> <option> <configItem> - <name>grp:win_menu_switch</name> + <name>grp:win_menu_select</name> <description>Left Win to first layout; Right Win/Menu to second layout</description> </configItem> </option> <option> <configItem> - <name>grp:lctrl_rctrl_switch</name> + <name>grp:ctrl_select</name> <description>Left Ctrl to first layout; Right Ctrl to second layout</description> </configItem> </option> diff --git a/rules/compat/0041-o_s.part b/rules/compat/0041-o_s.part new file mode 100644 index 0000000..17ded7c --- /dev/null +++ b/rules/compat/0041-o_s.part @@ -0,0 +1,5 @@ +! option = symbols + grp:shift_caps_switch = +group(caps_select) + grp:win_menu_switch = +group(win_menu_select) + grp:lctrl_rctrl_switch = +group(ctrl_select) +// Delete the above three aliases in July 2027. diff --git a/rules/meson.build b/rules/meson.build index 343d47c..48fd0c6 100644 --- a/rules/meson.build +++ b/rules/meson.build @@ -46,6 +46,7 @@ if get_option('compat-rules') 'compat/0030-l2v2_c.part', 'compat/0031-l3v3_c.part', 'compat/0032-l4v4_c.part', + 'compat/0041-o_s.part', ] layout_mappings = files('compat/layoutsMapping.lst') |