From cef0994b2705b2d753d33b8e90ea68697b770b6e Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 31 Mar 2023 17:56:36 +0200 Subject: types: improve the naming of the levels, distinguishing AltGr from Alt Types like "CTRL+ALT" and "FOUR_LEVEL_X" use both AltGr and Alt as modifiers -- it is then confusing to refer to both as "Alt". Also, using the word "Base" in the name for any level above the base level is not helpful, so drop those. Signed-off-by: Benno Schulenberg --- types/caps | 32 ++++++++++++++++---------------- types/extra | 32 ++++++++++++++++---------------- types/level5 | 40 ++++++++++++++++++++-------------------- types/pc | 4 ++-- 4 files changed, 54 insertions(+), 54 deletions(-) (limited to 'types') diff --git a/types/caps b/types/caps index cc2097c..0101b32 100644 --- a/types/caps +++ b/types/caps @@ -21,8 +21,8 @@ partial xkb_types "internal" { preserve[Lock+LevelThree] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; type "FOUR_LEVEL_SEMIALPHABETIC" { @@ -38,8 +38,8 @@ partial xkb_types "internal" { preserve[Shift+Lock+LevelThree] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; }; @@ -61,8 +61,8 @@ partial xkb_types "internal_nocancel" { map[Shift+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; type "FOUR_LEVEL_SEMIALPHABETIC" { @@ -74,8 +74,8 @@ partial xkb_types "internal_nocancel" { map[Shift+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; }; @@ -101,8 +101,8 @@ partial xkb_types "shift" { map[Shift+Lock+LevelThree] = Level3; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; type "FOUR_LEVEL_SEMIALPHABETIC" { @@ -118,8 +118,8 @@ partial xkb_types "shift" { preserve[Shift+Lock+LevelThree] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; }; @@ -147,8 +147,8 @@ partial xkb_types "shift_nocancel" { map[Shift+Lock+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; type "FOUR_LEVEL_SEMIALPHABETIC" { @@ -165,7 +165,7 @@ partial xkb_types "shift_nocancel" { preserve[Shift+Lock+LevelThree] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; }; diff --git a/types/extra b/types/extra index ca38d2e..f582dae 100644 --- a/types/extra +++ b/types/extra @@ -13,8 +13,8 @@ default partial xkb_types "default" { map[Shift+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; type "FOUR_LEVEL_ALPHABETIC" { @@ -28,8 +28,8 @@ default partial xkb_types "default" { map[Shift+Lock+LevelThree] = Level3; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; type "FOUR_LEVEL_SEMIALPHABETIC" { @@ -45,8 +45,8 @@ default partial xkb_types "default" { preserve[Shift+Lock+LevelThree] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; // A four-level keypad variant. The first two levels are controlled by @@ -64,8 +64,8 @@ default partial xkb_types "default" { map[Shift+NumLock+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Number"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; }; // Base level, two shifted LevelThree levels, one Ctrl+Alt command level. @@ -76,8 +76,8 @@ default partial xkb_types "default" { map[Shift+LevelThree] = Level3; map[Control+Alt] = Level4; level_name[Level1] = "Base"; - level_name[Level2] = "Alt Base"; - level_name[Level3] = "Shift Alt"; + level_name[Level2] = "AltGr"; + level_name[Level3] = "Shift AltGr"; level_name[Level4] = "Ctrl+Alt"; }; @@ -98,7 +98,7 @@ default partial xkb_types "default" { preserve[Lock+LevelThree]= Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "AltGr Base"; + level_name[Level3] = "AltGr"; level_name[Level4] = "Shift AltGr"; }; @@ -117,8 +117,8 @@ default partial xkb_types "default" { map[Shift+Lock+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; level_name[Level5] = "Lock"; }; }; @@ -139,8 +139,8 @@ partial xkb_types "keypad" { map[NumLock+LevelThree] = Level4; map[Shift+NumLock+LevelThree] = Level3; level_name[Level1] = "Base"; - level_name[Level2] = "Number"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Alt Number"; + level_name[Level2] = "Shift/Numlock"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift/Numlock AltGr"; }; }; diff --git a/types/level5 b/types/level5 index 9b790f1..74eaaaa 100644 --- a/types/level5 +++ b/types/level5 @@ -17,12 +17,12 @@ default partial xkb_types "default" { map[Shift+LevelThree+LevelFive] = Level8; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; level_name[Level5] = "X"; level_name[Level6] = "X Shift"; - level_name[Level7] = "X Alt Base"; - level_name[Level8] = "X Shift Alt"; + level_name[Level7] = "X AltGr"; + level_name[Level8] = "X Shift AltGr"; }; type "EIGHT_LEVEL_ALPHABETIC" { @@ -47,12 +47,12 @@ default partial xkb_types "default" { level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; level_name[Level5] = "X"; level_name[Level6] = "X Shift"; - level_name[Level7] = "X Alt Base"; - level_name[Level8] = "X Shift Alt"; + level_name[Level7] = "X AltGr"; + level_name[Level8] = "X Shift AltGr"; }; type "EIGHT_LEVEL_SEMIALPHABETIC" { @@ -82,12 +82,12 @@ default partial xkb_types "default" { level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; level_name[Level5] = "X"; level_name[Level6] = "X Shift"; - level_name[Level7] = "X Alt Base"; - level_name[Level8] = "X Shift Alt"; + level_name[Level7] = "X AltGr"; + level_name[Level8] = "X Shift AltGr"; }; type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" { @@ -143,12 +143,12 @@ default partial xkb_types "default" { level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; level_name[Level5] = "X"; level_name[Level6] = "X Shift"; - level_name[Level7] = "X Alt Base"; - level_name[Level8] = "X Shift Alt"; + level_name[Level7] = "X AltGr"; + level_name[Level8] = "X Shift AltGr"; }; type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" { @@ -202,12 +202,12 @@ default partial xkb_types "default" { level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; level_name[Level5] = "X"; level_name[Level6] = "X Shift"; - level_name[Level7] = "X Alt Base"; - level_name[Level8] = "X Shift Alt"; + level_name[Level7] = "X AltGr"; + level_name[Level8] = "X Shift AltGr"; }; }; diff --git a/types/pc b/types/pc index a97deae..4a4d6d7 100644 --- a/types/pc +++ b/types/pc @@ -41,8 +41,8 @@ default partial xkb_types "default" { preserve[Shift+LevelThree] = Shift; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; - level_name[Level3] = "Alt Base"; - level_name[Level4] = "Shift Alt"; + level_name[Level3] = "AltGr"; + level_name[Level4] = "Shift AltGr"; level_name[Level5] = "Ctrl+Alt"; }; -- cgit v1.2.1