diff options
Diffstat (limited to 'types')
-rw-r--r-- | types/basic | 2 | ||||
-rw-r--r-- | types/cancel | 2 | ||||
-rw-r--r-- | types/caps | 22 | ||||
-rw-r--r-- | types/extra | 17 | ||||
-rw-r--r-- | types/iso9995 | 2 | ||||
-rw-r--r-- | types/level5 | 6 | ||||
-rw-r--r-- | types/mousekeys | 3 | ||||
-rw-r--r-- | types/numpad | 7 | ||||
-rw-r--r-- | types/pc | 4 |
9 files changed, 33 insertions, 32 deletions
diff --git a/types/basic b/types/basic index fff06be..32f05b9 100644 --- a/types/basic +++ b/types/basic @@ -20,7 +20,7 @@ default xkb_types "basic" { }; type "ALPHABETIC" { - modifiers = Shift+Lock; + modifiers = Shift + Lock; map[Shift] = Level2; map[Lock] = Level2; level_name[Level1] = "Base"; diff --git a/types/cancel b/types/cancel index adc9f19..b738559 100644 --- a/types/cancel +++ b/types/cancel @@ -1,7 +1,7 @@ default partial xkb_types "Shift_Cancels_Caps" { override type "TWO_LEVEL" { - modifiers = Shift+Lock; + modifiers = Shift + Lock; map[Shift] = Level2; preserve[Lock]= Lock; level_name[Level1] = "Base"; @@ -2,7 +2,7 @@ // Shift "pauses" CapsLock. partial xkb_types "internal" { type "ALPHABETIC" { - modifiers = Shift+Lock; + modifiers = Shift + Lock; map[Shift] = Level2; preserve[Lock] = Lock; level_name[Level1] = "Base"; @@ -10,7 +10,7 @@ partial xkb_types "internal" { }; type "FOUR_LEVEL_ALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; preserve[Lock] = Lock; @@ -26,7 +26,7 @@ partial xkb_types "internal" { }; type "FOUR_LEVEL_SEMIALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; preserve[Lock] = Lock; @@ -54,7 +54,7 @@ partial xkb_types "internal_nocancel" { }; type "FOUR_LEVEL_ALPHABETIC" { - modifiers = Shift+LevelThree; + modifiers = Shift + LevelThree; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; @@ -67,7 +67,7 @@ partial xkb_types "internal_nocancel" { type "FOUR_LEVEL_SEMIALPHABETIC" { // the same as FOUR_LEVEL_ALPHABETIC - modifiers = Shift+LevelThree; + modifiers = Shift + LevelThree; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; @@ -83,7 +83,7 @@ partial xkb_types "internal_nocancel" { // Shift "pauses" CapsLock. partial xkb_types "shift" { type "ALPHABETIC" { - modifiers = Shift+Lock; + modifiers = Shift + Lock; map[Shift] = Level2; map[Lock] = Level2; level_name[Level1] = "Base"; @@ -91,7 +91,7 @@ partial xkb_types "shift" { }; type "FOUR_LEVEL_ALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; @@ -106,7 +106,7 @@ partial xkb_types "shift" { }; type "FOUR_LEVEL_SEMIALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; @@ -127,7 +127,7 @@ partial xkb_types "shift" { // Shift does not cancel CapsLock. partial xkb_types "shift_nocancel" { type "ALPHABETIC" { - modifiers = Shift+Lock; + modifiers = Shift + Lock; map[Shift] = Level2; map[Lock] = Level2; map[Shift+Lock] = Level2; @@ -136,7 +136,7 @@ partial xkb_types "shift_nocancel" { }; type "FOUR_LEVEL_ALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; @@ -152,7 +152,7 @@ partial xkb_types "shift_nocancel" { }; type "FOUR_LEVEL_SEMIALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; diff --git a/types/extra b/types/extra index 156b8e5..3cf7ba7 100644 --- a/types/extra +++ b/types/extra @@ -6,7 +6,7 @@ default partial xkb_types "default" { virtual_modifiers LevelThree; type "FOUR_LEVEL" { - modifiers = Shift+LevelThree; + modifiers = Shift + LevelThree; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; @@ -18,7 +18,7 @@ default partial xkb_types "default" { }; type "FOUR_LEVEL_ALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; @@ -33,7 +33,7 @@ default partial xkb_types "default" { }; type "FOUR_LEVEL_SEMIALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; @@ -53,7 +53,7 @@ default partial xkb_types "default" { // NumLock (with active shifting like in KEYPAD). LevelThree overrides // this mode, with two additional shifted levels. type "FOUR_LEVEL_MIXED_KEYPAD" { - modifiers = Shift+NumLock+LevelThree; + modifiers = Shift + NumLock + LevelThree; map[None] = Level1; map[Shift+NumLock] = Level1; map[NumLock] = Level2; @@ -70,7 +70,7 @@ default partial xkb_types "default" { // Base level, two shifted LevelThree levels, one Ctrl+Alt command level. type "FOUR_LEVEL_X" { - modifiers = Shift+LevelThree+Control+Alt; + modifiers = Shift + LevelThree + Control + Alt; map[None] = Level1; map[LevelThree] = Level2; map[Shift+LevelThree] = Level3; @@ -86,7 +86,7 @@ default partial xkb_types "default" { // present in Unicode that are made up of two separate letters // (forms like LJ, Lj, and lj; NJ, Nj, and nj; etcetera). type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level4; @@ -106,7 +106,7 @@ default partial xkb_types "default" { // plus a fifth level when CapsLock (and only CapsLock) is active // -- CapsLock is ignored when Shift and/or LevelThree is held. type "FOUR_LEVEL_PLUS_LOCK" { - modifiers = Shift+Lock+LevelThree; + modifiers = Shift + Lock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; @@ -125,10 +125,11 @@ default partial xkb_types "default" { // This enables the four-level shifting also for the keypad. partial xkb_types "keypad" { + virtual_modifiers LevelThree; type "FOUR_LEVEL_KEYPAD" { - modifiers = Shift+NumLock+LevelThree; + modifiers = Shift + NumLock + LevelThree; map[None] = Level1; map[Shift] = Level2; map[NumLock] = Level2; diff --git a/types/iso9995 b/types/iso9995 index 137a522..74b3ff9 100644 --- a/types/iso9995 +++ b/types/iso9995 @@ -6,7 +6,7 @@ default partial xkb_types "default" { virtual_modifiers LevelThree; type "THREE_LEVEL" { - modifiers = Shift+LevelThree; + modifiers = Shift + LevelThree; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; diff --git a/types/level5 b/types/level5 index f4c6a9d..9403cd6 100644 --- a/types/level5 +++ b/types/level5 @@ -6,7 +6,7 @@ default partial xkb_types "default" { virtual_modifiers LevelThree, LevelFive; type "EIGHT_LEVEL" { - modifiers = Shift+LevelThree+LevelFive; + modifiers = Shift + LevelThree + LevelFive; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; @@ -26,7 +26,7 @@ default partial xkb_types "default" { }; type "EIGHT_LEVEL_ALPHABETIC" { - modifiers = Shift+Lock+LevelThree+LevelFive; + modifiers = Shift + Lock + LevelThree + LevelFive; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; @@ -54,7 +54,7 @@ default partial xkb_types "default" { }; type "EIGHT_LEVEL_SEMIALPHABETIC" { - modifiers = Shift+Lock+LevelThree+LevelFive; + modifiers = Shift + Lock + LevelThree + LevelFive; map[None] = Level1; map[Shift] = Level2; map[Lock] = Level2; diff --git a/types/mousekeys b/types/mousekeys index 0bf8384..36434ed 100644 --- a/types/mousekeys +++ b/types/mousekeys @@ -1,8 +1,9 @@ default partial xkb_types "default" { + virtual_modifiers Alt; type "SHIFT+ALT" { - modifiers = Shift+Alt; + modifiers = Shift + Alt; map[Shift+Alt] = Level2; level_name[Level1] = "Base"; level_name[Level2] = "Shift+Alt"; diff --git a/types/numpad b/types/numpad index 8903b16..458a64f 100644 --- a/types/numpad +++ b/types/numpad @@ -1,6 +1,6 @@ default partial xkb_types "pc" { type "KEYPAD" { - modifiers = Shift+NumLock; + modifiers = Shift + NumLock; map[None] = Level1; map[NumLock] = Level2; map[Shift+NumLock] = Level1; @@ -22,7 +22,7 @@ partial xkb_types "mac" { partial xkb_types "microsoft" { type "KEYPAD" { - modifiers = Shift+NumLock; + modifiers = Shift + NumLock; map[None] = Level1; preserve[Shift] = Shift; map[NumLock] = Level2; @@ -39,7 +39,7 @@ partial xkb_types "microsoft" { // FOUR_LEVEL_MIXED_KEYPAD, so that's the one we are going to override. partial xkb_types "shift3" { type "FOUR_LEVEL_MIXED_KEYPAD" { - modifiers = Shift+NumLock+Control+Alt; + modifiers = Shift + NumLock + Control + Alt; // NumLock Off => navigate using cursor keys map[None] = Level1; @@ -57,7 +57,6 @@ partial xkb_types "shift3" { // Ctrl + Alt, regardless of NumLock and Shift => command keys map[Control+Alt] = Level4; - // reverse map from levels to modifiers level_name[Level1] = "Base"; level_name[Level2] = "NumLock"; level_name[Level3] = "Shift+NumLock"; @@ -32,7 +32,7 @@ default partial xkb_types "default" { }; type "CTRL+ALT" { - modifiers = Control+Alt+Shift+LevelThree; + modifiers = Shift + LevelThree + Control + Alt; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; @@ -55,7 +55,7 @@ default partial xkb_types "default" { // FIXME: Should really use RControl but it seems not to be enabled by // default and touching this requires a lot of testing. type "LOCAL_EIGHT_LEVEL" { - modifiers = Shift+Lock+LevelThree+Control; + modifiers = Shift + Lock + LevelThree + Control; map[None] = Level1; map[Lock+Shift] = Level1; |