diff options
author | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-11 13:23:47 +0200 |
---|---|---|
committer | Benno Schulenberg <bensberg@telfort.nl> | 2023-04-11 13:23:47 +0200 |
commit | b518555e258cb27b74d1ab4407fd90c6d69a617b (patch) | |
tree | 9ff5ed0ac3830bc7a452f21981bf9a3b9642eedd /types | |
parent | 54457f7b5760de2e6de7ee759603c032eb1d8e17 (diff) | |
download | xkeyboard-config-b518555e258cb27b74d1ab4407fd90c6d69a617b.tar.gz |
compat,types: harmonize some whitespace, and reshuffle some lines
Also, add some level specifications for clarity, although unneeded.
Diffstat (limited to 'types')
-rw-r--r-- | types/basic | 2 | ||||
-rw-r--r-- | types/cancel | 2 | ||||
-rw-r--r-- | types/extra | 15 | ||||
-rw-r--r-- | types/level5 | 16 | ||||
-rw-r--r-- | types/numpad | 2 | ||||
-rw-r--r-- | types/pc | 16 |
6 files changed, 28 insertions, 25 deletions
diff --git a/types/basic b/types/basic index fe0ec91..709f4c9 100644 --- a/types/basic +++ b/types/basic @@ -8,7 +8,7 @@ default xkb_types "basic" { type "ONE_LEVEL" { modifiers = None; map[None] = Level1; - level_name[Level1]= "Any"; + level_name[Level1] = "Any"; }; type "TWO_LEVEL" { diff --git a/types/cancel b/types/cancel index 43c567f..bcbb57d 100644 --- a/types/cancel +++ b/types/cancel @@ -3,7 +3,7 @@ default partial xkb_types "Shift_Cancels_Caps" { override type "TWO_LEVEL" { modifiers = Shift + Lock; map[Shift] = Level2; - preserve[Lock]= Lock; + preserve[Lock] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; }; diff --git a/types/extra b/types/extra index b59f163..04e3351 100644 --- a/types/extra +++ b/types/extra @@ -22,6 +22,7 @@ default partial xkb_types "default" { map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; + map[Shift+Lock] = Level1; map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level4; @@ -37,6 +38,7 @@ default partial xkb_types "default" { map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; + map[Shift+Lock] = Level1; map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; @@ -71,12 +73,12 @@ default partial xkb_types "default" { type "FOUR_LEVEL_MIXED_KEYPAD" { modifiers = Shift + NumLock + LevelThree; map[None] = Level1; - map[Shift+NumLock] = Level1; - map[NumLock] = Level2; map[Shift] = Level2; + map[NumLock] = Level2; + map[Shift+NumLock] = Level1; map[LevelThree] = Level3; - map[NumLock+LevelThree] = Level3; map[Shift+LevelThree] = Level4; + map[NumLock+LevelThree] = Level3; map[Shift+NumLock+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Number"; @@ -88,6 +90,7 @@ default partial xkb_types "default" { type "FOUR_LEVEL_X" { modifiers = Shift + LevelThree + Control + Alt; map[None] = Level1; + map[Shift] = Level1; map[LevelThree] = Level2; map[Shift+LevelThree] = Level3; map[Control+Alt] = Level4; @@ -110,12 +113,12 @@ default partial xkb_types "default" { map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; map[Shift+Lock+LevelThree] = Level3; - preserve[Lock]= Lock; - preserve[Lock+LevelThree]= Lock; + preserve[Lock] = Lock; + preserve[Lock+LevelThree] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; level_name[Level3] = "AltGr"; - level_name[Level4] = "Shift AltGr"; + level_name[Level4] = "Caps / Shift AltGr"; }; // Five levels: the normal four levels with Shift and LevelThree, diff --git a/types/level5 b/types/level5 index 240be8e..99d9388 100644 --- a/types/level5 +++ b/types/level5 @@ -194,25 +194,25 @@ default partial xkb_types "default" { type "EIGHT_LEVEL_BY_CTRL" { modifiers = Shift + Lock + LevelThree + Control; - map[None] = Level1; - map[Lock+Shift] = Level1; + map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; + map[Shift+Lock] = Level1; - map[LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level3; + map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level4; + map[Shift+Lock+LevelThree] = Level3; - map[Control] = Level5; - map[Lock+Shift+Control] = Level5; + map[Control] = Level5; map[Shift+Control] = Level6; map[Lock+Control] = Level6; + map[Shift+Lock+Control] = Level5; - map[LevelThree+Control] = Level7; - map[Lock+Shift+LevelThree+Control] = Level7; + map[LevelThree+Control] = Level7; map[Shift+LevelThree+Control] = Level8; map[Lock+LevelThree+Control] = Level8; + map[Shift+Lock+LevelThree+Control] = Level7; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; diff --git a/types/numpad b/types/numpad index eb3fbdd..8d7677a 100644 --- a/types/numpad +++ b/types/numpad @@ -9,7 +9,7 @@ default partial xkb_types "pc" { }; }; -// On Mac keypads, level 1 and 2 are swapped. +// On Mac keypads, levels 1 and 2 are swapped. partial xkb_types "mac" { type "KEYPAD" { modifiers = None; @@ -6,6 +6,14 @@ default partial xkb_types "default" { virtual_modifiers Alt, LevelThree; + type "PC_ALT_LEVEL2" { + modifiers = Alt; + map[None] = Level1; + map[Alt] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Alt"; + }; + type "PC_SUPER_LEVEL2" { modifiers = Mod4; map[None] = Level1; @@ -22,14 +30,6 @@ default partial xkb_types "default" { level_name[Level2] = "Control"; }; - type "PC_ALT_LEVEL2" { - modifiers = Alt; - map[None] = Level1; - map[Alt] = Level2; - level_name[Level1] = "Base"; - level_name[Level2] = "Alt"; - }; - type "CTRL+ALT" { modifiers = Shift + LevelThree + Control + Alt; map[None] = Level1; |