diff options
author | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-23 10:28:56 +0200 |
---|---|---|
committer | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-23 10:46:58 +0200 |
commit | 5076a4693be05f1ad3b87473d1e7dda4460c8e2a (patch) | |
tree | 870f1b4ad539d8847223d76a2311d97803d440cd | |
parent | a8dc56354a165cdf9bb29de1d3de7be4379a217c (diff) | |
download | xkeyboard-config-5076a4693be05f1ad3b87473d1e7dda4460c8e2a.tar.gz |
rules: group the options for level3, keypad, and sundry things together
This looks better and should mostly have no effect as the options are
largely independent. Only the moved `lv3:` options will now overrule
some of the `caps:`, `ctrl:` and `compose:` options, instead of being
overruled by them. In my opinion this is more consistent: all level3
options overrule most other options.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
-rw-r--r-- | rules/0042-o_s.part | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part index 6d0b6be..92475e2 100644 --- a/rules/0042-o_s.part +++ b/rules/0042-o_s.part @@ -13,19 +13,6 @@ altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) altwin:swap_alt_win = +altwin(swap_alt_win) altwin:prtsc_rwin = +altwin(prtsc_rwin) - grab:debug = +srvr_ctrl(grab_debug) - lv3:switch = +level3(switch) - lv3:ralt_switch = +level3(ralt_switch) - lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) - lv3:lalt_switch = +level3(lalt_switch) - lv3:alt_switch = +level3(alt_switch) - lv3:menu_switch = +level3(menu_switch) - lv3:win_switch = +level3(win_switch) - lv3:lwin_switch = +level3(lwin_switch) - lv3:rwin_switch = +level3(rwin_switch) - lv3:enter_switch = +level3(enter_switch) - lv3:4_switch_isolated = +level3(4_switch_isolated) - lv3:9_switch_isolated = +level3(9_switch_isolated) caps:capslock = +capslock(capslock) caps:numlock = +capslock(numlock) caps:shiftlock = +capslock(shiftlock) @@ -73,12 +60,6 @@ compose:paus = +compose(paus) compose:prsc = +compose(prsc) compose:sclk = +compose(sclk) - srvrkeys:none = +srvr_ctrl(no_srvr_keys) - eurosign:e = +eurosign(e) - eurosign:2 = +eurosign(2) - eurosign:4 = +eurosign(4) - eurosign:5 = +eurosign(5) - rupeesign:4 = +rupeesign(4) keypad:oss = +keypad(oss) keypad:legacy = +keypad(legacy) keypad:legacy_wang = +keypad(legacy_wang) @@ -87,6 +68,15 @@ keypad:future_wang = +keypad(future_wang) keypad:hex = +keypad(ops)+keypad(hex) keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) + keypad:pointerkeys = +keypad(pointerkeys) + kpdl:dot = +kpdl(dot) + kpdl:comma = +kpdl(comma) + kpdl:dotoss = +kpdl(dotoss) + kpdl:dotoss_latin9 = +kpdl(dotoss_latin9) + kpdl:commaoss = +kpdl(commaoss) + kpdl:momayyezoss = +kpdl(momayyezoss) + kpdl:kposs = +kpdl(kposs) + kpdl:semi = +kpdl(semi) nbsp:none = +nbsp(none) nbsp:level2 = +nbsp(level2) nbsp:level3 = +nbsp(level3) @@ -101,29 +91,29 @@ nbsp:zwnj2nb3zwj4 = +nbsp(zwnj2nb3zwj4) nbsp:zwnj2nb3nnb4 = +nbsp(zwnj2nb3nnb4) nbsp:zwnj3zwj4 = +nbsp(zwnj3zwj4) + eurosign:e = +eurosign(e) + eurosign:2 = +eurosign(2) + eurosign:4 = +eurosign(4) + eurosign:5 = +eurosign(5) + rupeesign:4 = +rupeesign(4) + esperanto:qwerty = +epo(qwerty) + esperanto:dvorak = +epo(dvorak) + esperanto:colemak = +epo(colemak) + parens:swap_brackets = +parens(swap_brackets) japan:nicola_f_bs = +jp(nicola_f_bs) japan:hztg_escape = +jp(hztg_escape) korean:ralt_hangul = +kr(ralt_hangul) korean:rctrl_hangul = +kr(rctrl_hangul) korean:ralt_hanja = +kr(ralt_hanja) korean:rctrl_hanja = +kr(rctrl_hanja) - kpdl:dot = +kpdl(dot) - kpdl:comma = +kpdl(comma) - kpdl:dotoss = +kpdl(dotoss) - kpdl:dotoss_latin9 = +kpdl(dotoss_latin9) - kpdl:commaoss = +kpdl(commaoss) - kpdl:momayyezoss = +kpdl(momayyezoss) - kpdl:kposs = +kpdl(kposs) - kpdl:semi = +kpdl(semi) + grab:debug = +srvr_ctrl(grab_debug) + srvrkeys:none = +srvr_ctrl(no_srvr_keys) + terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) + apple:alupckeys = +macintosh_vndr/apple(alupckeys) + apple:jp_pc106 = +macintosh_vndr/apple(jp_pc106) + apple:jp_oadg109a = +macintosh_vndr/apple(jp_oadg109a) + solaris:sun_compat = +sun_vndr/solaris(sun_compat) shift:breaks_caps = +shift(breaks_caps) - esperanto:qwerty = +epo(qwerty) - esperanto:dvorak = +epo(dvorak) - esperanto:colemak = +epo(colemak) - terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) - keypad:pointerkeys = +keypad(pointerkeys) - apple:alupckeys = +macintosh_vndr/apple(alupckeys) - apple:jp_pc106 = +macintosh_vndr/apple(jp_pc106) - apple:jp_oadg109a = +macintosh_vndr/apple(jp_oadg109a) shift:both_capslock = +shift(both_capslock) shift:lshift_both_capslock = +shift(lshift_both_capslock) shift:rshift_both_capslock = +shift(rshift_both_capslock) @@ -133,14 +123,27 @@ shift:both_shiftlock = +shift(both_shiftlock) shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock) shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock) - solaris:sun_compat = +sun_vndr/solaris(sun_compat) lv2:lsgt_switch = +level2(lsgt_switch) +// Third-level choosers: + lv3:switch = +level3(switch) + lv3:ralt_switch = +level3(ralt_switch) + lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) + lv3:lalt_switch = +level3(lalt_switch) + lv3:alt_switch = +level3(alt_switch) + lv3:menu_switch = +level3(menu_switch) + lv3:win_switch = +level3(win_switch) + lv3:lwin_switch = +level3(lwin_switch) + lv3:rwin_switch = +level3(rwin_switch) + lv3:enter_switch = +level3(enter_switch) lv3:caps_switch = +level3(caps_switch) lv3:bksl_switch = +level3(bksl_switch) lv3:lsgt_switch = +level3(lsgt_switch) lv3:caps_switch_latch = +level3(caps_switch_latch) lv3:bksl_switch_latch = +level3(bksl_switch_latch) lv3:lsgt_switch_latch = +level3(lsgt_switch_latch) + lv3:4_switch_isolated = +level3(4_switch_isolated) + lv3:9_switch_isolated = +level3(9_switch_isolated) +// Fifth-level choosers: lv5:caps_switch = +level5(caps_switch) lv5:lsgt_switch = +level5(lsgt_switch) lv5:ralt_switch = +level5(ralt_switch) @@ -154,7 +157,6 @@ lv5:ralt_switch_lock_cancel = +level5(ralt_switch_lock_cancel) 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) |