diff options
| author | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-11 17:20:02 +0200 |
|---|---|---|
| committer | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-24 11:46:16 +0200 |
| commit | 8877d052b1d60bc6c9ce87b2cfb092a6fb865b91 (patch) | |
| tree | e920c4ce99c4efcd3edd06e4be9cead2ea41d969 | |
| parent | dfce90b2b3f3412d29b619f248e0ed4cbeaa31f0 (diff) | |
| download | xkeyboard-config-8877d052b1d60bc6c9ce87b2cfb092a6fb865b91.tar.gz | |
rules: make the `Shifts` group toggle override any layout's Shift keys
In order to make the option `grp:shifts_toggle` effective also with
the few layouts that define the Shift keys too, the option should be
applied to each group separately, and the option should specify the
key type explicitly.
This fixes issue #380.
Problem existed since the T3 layout was added in 2013,
and worsened when the E1 layout was added in 2020.
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
| -rw-r--r-- | rules/0036-lo_s.part | 1 | ||||
| -rw-r--r-- | rules/0037-l1o_s.part | 1 | ||||
| -rw-r--r-- | rules/0038-l2o_s.part | 1 | ||||
| -rw-r--r-- | rules/0039-l3o_s.part | 1 | ||||
| -rw-r--r-- | rules/0040-l4o_s.part | 1 | ||||
| -rw-r--r-- | rules/0042-o_s.part | 1 | ||||
| -rw-r--r-- | symbols/group | 4 |
7 files changed, 7 insertions, 3 deletions
diff --git a/rules/0036-lo_s.part b/rules/0036-lo_s.part index 39f579d..a3c6ca6 100644 --- a/rules/0036-lo_s.part +++ b/rules/0036-lo_s.part @@ -9,3 +9,4 @@ * grp:win_space_toggle = +group(win_space_toggle) * grp:ctrl_space_toggle = +group(ctrl_space_toggle) * grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) + * grp:shifts_toggle = +group(shifts_toggle) diff --git a/rules/0037-l1o_s.part b/rules/0037-l1o_s.part index 1775512..32c0939 100644 --- a/rules/0037-l1o_s.part +++ b/rules/0037-l1o_s.part @@ -9,3 +9,4 @@ * grp:win_space_toggle = +group(win_space_toggle):1 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):1 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle):1 + * grp:shifts_toggle = +group(shifts_toggle):1 diff --git a/rules/0038-l2o_s.part b/rules/0038-l2o_s.part index fbac126..3c0482c 100644 --- a/rules/0038-l2o_s.part +++ b/rules/0038-l2o_s.part @@ -9,3 +9,4 @@ * grp:win_space_toggle = +group(win_space_toggle):2 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):2 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle):2 + * grp:shifts_toggle = +group(shifts_toggle):2 diff --git a/rules/0039-l3o_s.part b/rules/0039-l3o_s.part index 9a10f48..e1d0fe1 100644 --- a/rules/0039-l3o_s.part +++ b/rules/0039-l3o_s.part @@ -9,3 +9,4 @@ * grp:win_space_toggle = +group(win_space_toggle):3 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):3 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle):3 + * grp:shifts_toggle = +group(shifts_toggle):3 diff --git a/rules/0040-l4o_s.part b/rules/0040-l4o_s.part index 11fe901..07ce633 100644 --- a/rules/0040-l4o_s.part +++ b/rules/0040-l4o_s.part @@ -9,3 +9,4 @@ * grp:win_space_toggle = +group(win_space_toggle):4 * grp:ctrl_space_toggle = +group(ctrl_space_toggle):4 * grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle):4 + * grp:shifts_toggle = +group(shifts_toggle):4 diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part index ca1a93d..f4f512a 100644 --- a/rules/0042-o_s.part +++ b/rules/0042-o_s.part @@ -165,7 +165,6 @@ 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) diff --git a/symbols/group b/symbols/group index ad36b02..9378cef 100644 --- a/symbols/group +++ b/symbols/group @@ -65,8 +65,8 @@ xkb_symbols "lalt_toggle" { // (depending on which Shift is pressed first). partial modifier_keys xkb_symbols "shifts_toggle" { - key <LFSH> {[ Shift_L, ISO_Prev_Group ]}; - key <RTSH> {[ Shift_R, ISO_Next_Group ]}; + key <LFSH> {[ Shift_L, ISO_Prev_Group ], type[group1] = "TWO_LEVEL" }; + key <RTSH> {[ Shift_R, ISO_Next_Group ], type[group1] = "TWO_LEVEL" }; }; // Pressing Caps_Lock switches to the next group, |