summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@telfort.nl>2023-04-23 08:34:01 +0200
committerBenno Schulenberg <bensberg@telfort.nl>2023-04-23 08:55:20 +0200
commita8dc56354a165cdf9bb29de1d3de7be4379a217c (patch)
treefe6325ce6178731519f0a9ebe79d472203019949
parent265a9bfdb29749ce12d41a89be70ed3c57a4b903 (diff)
downloadxkeyboard-config-a8dc56354a165cdf9bb29de1d3de7be4379a217c.tar.gz
rules: put also the general `grp:` rules last, so they overrule others
Arguably, when options conflict, the group-switching options should overrule others, because when one has multiple groups one definitely wants to be able to switch. This fixes issue #384. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-rw-r--r--rules/0042-o_s.part76
1 files changed, 38 insertions, 38 deletions
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part
index fa0f3f5..6d0b6be 100644
--- a/rules/0042-o_s.part
+++ b/rules/0042-o_s.part
@@ -14,44 +14,6 @@
altwin:swap_alt_win = +altwin(swap_alt_win)
altwin:prtsc_rwin = +altwin(prtsc_rwin)
grab:debug = +srvr_ctrl(grab_debug)
- grp:switch = +group(switch)
- grp:lswitch = +group(lswitch)
- grp:win_switch = +group(win_switch)
- grp:lwin_switch = +group(lwin_switch)
- grp:rwin_switch = +group(rwin_switch)
- grp:menu_switch = +group(menu_switch)
- grp:caps_switch = +group(caps_switch)
- grp:shifts_toggle = +group(shifts_toggle)
- grp:ctrls_toggle = +group(ctrls_toggle)
- grp:caps_toggle = +group(caps_toggle)
- grp:shift_caps_toggle = +group(shift_caps_toggle)
- 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:menu_toggle = +group(menu_toggle)
- grp:lwin_toggle = +group(lwin_toggle)
- grp:rwin_toggle = +group(rwin_toggle)
- grp:lshift_toggle = +group(lshift_toggle)
- grp:rshift_toggle = +group(rshift_toggle)
- grp:rctrl_switch = +group(rctrl_switch)
- grp:lctrl_toggle = +group(lctrl_toggle)
- grp:rctrl_toggle = +group(rctrl_toggle)
- grp:lalt_toggle = +group(lalt_toggle)
- grp:sclk_toggle = +group(sclk_toggle)
- 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)
- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
- grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir)
- grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
- grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir)
- grp:lalt_lshift_toggle = +group(lalt_lshift_toggle)
- grp:ralt_rshift_toggle = +group(ralt_rshift_toggle)
- grp:alt_shift_toggle = +group(alt_shift_toggle)
- grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir)
- grp:lctrl_lwin_toggle = +group(lctrl_lwin_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -193,4 +155,42 @@
lv5:lwin_switch_lock_cancel = +level5(lwin_switch_lock_cancel)
lv5:rwin_switch_lock_cancel = +level5(rwin_switch_lock_cancel)
parens:swap_brackets = +parens(swap_brackets)
+ grp:switch = +group(switch)
+ grp:lswitch = +group(lswitch)
+ grp:win_switch = +group(win_switch)
+ grp:lwin_switch = +group(lwin_switch)
+ grp:rwin_switch = +group(rwin_switch)
+ grp:rctrl_switch = +group(rctrl_switch)
+ grp:menu_switch = +group(menu_switch)
+ grp:caps_switch = +group(caps_switch)
+ grp:shifts_toggle = +group(shifts_toggle)
+ grp:ctrls_toggle = +group(ctrls_toggle)
+ grp:caps_toggle = +group(caps_toggle)
+ grp:shift_caps_toggle = +group(shift_caps_toggle)
+ 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:menu_toggle = +group(menu_toggle)
+ grp:lwin_toggle = +group(lwin_toggle)
+ grp:rwin_toggle = +group(rwin_toggle)
+ grp:lshift_toggle = +group(lshift_toggle)
+ grp:rshift_toggle = +group(rshift_toggle)
+ grp:lctrl_toggle = +group(lctrl_toggle)
+ grp:rctrl_toggle = +group(rctrl_toggle)
+ grp:lalt_toggle = +group(lalt_toggle)
+ grp:sclk_toggle = +group(sclk_toggle)
+ grp:lctrl_lwin_toggle = +group(lctrl_lwin_toggle)
+ 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)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir)
+ grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir)
+ grp:lalt_lshift_toggle = +group(lalt_lshift_toggle)
+ grp:ralt_rshift_toggle = +group(ralt_rshift_toggle)
+ grp:alt_shift_toggle = +group(alt_shift_toggle)
+ grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir)