summaryrefslogtreecommitdiff
path: root/types
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@telfort.nl>2022-06-28 12:18:48 +0200
committerBenno Schulenberg <bensberg@telfort.nl>2022-06-28 13:12:07 +0200
commit003437ad0a707b64f1b3536872ecf6e9ae8129a2 (patch)
tree280d75a7432e9e4aa3ede1e7a2de8dcb0ecf6ee6 /types
parentfeb9384a40eda6a7efbd276f903469f235a49d19 (diff)
downloadxkeyboard-config-003437ad0a707b64f1b3536872ecf6e9ae8129a2.tar.gz
types: specify the correct level for Shift+Lock+LevelFive
For alphabetic types (full or semi), Shift should cancel CapsLock. Thus, add the missing level specification for EIGHT_LEVEL_ALPHABETIC and correct the level specification for EIGHT_LEVEL_SEMIALPHABETIC. This fixes issue #332. Bug existed since commit 075eed027d from seventeen years ago, when the eight-level types were introduced, and since commit 237cbf9989 from ten years ago, when the semi-alpha type was improperly fixed. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
Diffstat (limited to 'types')
-rw-r--r--types/level57
1 files changed, 4 insertions, 3 deletions
diff --git a/types/level5 b/types/level5
index 9403cd6..95c0fdd 100644
--- a/types/level5
+++ b/types/level5
@@ -30,6 +30,7 @@ default partial xkb_types "default" {
map[None] = Level1;
map[Shift] = Level2;
map[Lock] = Level2;
+ map[Lock+Shift] = Level1;
map[LevelThree] = Level3;
map[Shift+LevelThree] = Level4;
map[Lock+LevelThree] = Level4;
@@ -38,6 +39,7 @@ default partial xkb_types "default" {
map[LevelFive] = Level5;
map[Shift+LevelFive] = Level6;
map[Lock+LevelFive] = Level6;
+ map[Lock+Shift+LevelFive] = Level5;
map[LevelThree+LevelFive] = Level7;
map[Shift+LevelThree+LevelFive] = Level8;
map[Lock+LevelThree+LevelFive] = Level8;
@@ -58,6 +60,7 @@ default partial xkb_types "default" {
map[None] = Level1;
map[Shift] = Level2;
map[Lock] = Level2;
+ map[Lock+Shift] = Level1;
map[LevelThree] = Level3;
map[Shift+LevelThree] = Level4;
map[Lock+LevelThree] = Level3;
@@ -66,7 +69,7 @@ default partial xkb_types "default" {
map[LevelFive] = Level5;
map[Shift+LevelFive] = Level6;
map[Lock+LevelFive] = Level6;
- map[Lock+Shift+LevelFive] = Level6;
+ map[Lock+Shift+LevelFive] = Level5;
map[LevelThree+LevelFive] = Level7;
map[Shift+LevelThree+LevelFive] = Level8;
map[Lock+LevelThree+LevelFive] = Level7;
@@ -74,8 +77,6 @@ default partial xkb_types "default" {
preserve[Lock+LevelThree] = Lock;
preserve[Lock+Shift+LevelThree] = Lock;
- preserve[Lock+LevelFive] = Lock;
- preserve[Lock+Shift+LevelFive] = Lock;
preserve[Lock+LevelThree+LevelFive] = Lock;
preserve[Lock+Shift+LevelThree+LevelFive] = Lock;