diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/types')
| -rw-r--r-- | xorg-server/xkeyboard-config/types/README | 6 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/basic | 12 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/caps | 27 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/extra | 71 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/iso9995 | 6 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/level5 | 34 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/mousekeys | 6 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/nokia | 3 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/numpad | 8 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/types/pc | 17 |
10 files changed, 96 insertions, 94 deletions
diff --git a/xorg-server/xkeyboard-config/types/README b/xorg-server/xkeyboard-config/types/README index 1a1e2c01e..ff0f61b9d 100644 --- a/xorg-server/xkeyboard-config/types/README +++ b/xorg-server/xkeyboard-config/types/README @@ -1,4 +1,4 @@ The types component of a keyboard mapping specifies the key types that can be -associated with the various keyboard keys. The types component can also -optionally contain real modifiers binding and symbolic names for one -or more virtual modifiers. +associated with the various keyboard keys. The types component can optionally +contain also real modifier bindings and symbolic names for one or more virtual +modifiers. diff --git a/xorg-server/xkeyboard-config/types/basic b/xorg-server/xkeyboard-config/types/basic index 552b83400..341931fe5 100644 --- a/xorg-server/xkeyboard-config/types/basic +++ b/xorg-server/xkeyboard-config/types/basic @@ -1,7 +1,7 @@ default xkb_types "basic" { // Fairly standard definitions for - // the four required key types + // the three required key types. virtual_modifiers NumLock; @@ -19,11 +19,11 @@ default xkb_types "basic" { }; type "ALPHABETIC" { - modifiers = Shift+Lock; - map[Shift] = Level2; - map[Lock] = Level2; - level_name[Level1] = "Base"; - level_name[Level2] = "Caps"; + modifiers = Shift+Lock; + map[Shift] = Level2; + map[Lock] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Caps"; }; }; diff --git a/xorg-server/xkeyboard-config/types/caps b/xorg-server/xkeyboard-config/types/caps index dd7fa2eaf..baff8c4f8 100644 --- a/xorg-server/xkeyboard-config/types/caps +++ b/xorg-server/xkeyboard-config/types/caps @@ -1,5 +1,5 @@ -// CapsLock uses internal capitalization rules -// Shift "pauses" CapsLock +// CapsLock uses internal capitalization rules, +// Shift "pauses" CapsLock. partial xkb_types "internal" { type "ALPHABETIC" { modifiers = Shift+Lock; @@ -17,7 +17,7 @@ partial xkb_types "internal" { map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level3; + map[Lock+Shift+LevelThree] = Level3; preserve[Lock+LevelThree] = Lock; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; @@ -33,7 +33,7 @@ partial xkb_types "internal" { map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level4; + map[Lock+Shift+LevelThree] = Level4; preserve[Lock+LevelThree] = Lock; preserve[Lock+Shift+LevelThree] = Lock; level_name[Level1] = "Base"; @@ -42,8 +42,9 @@ partial xkb_types "internal" { level_name[Level4] = "Shift Alt"; }; }; -// CapsLock uses internal capitalization rules -// Shift doesn't cancel CapsLock + +// CapsLock uses internal capitalization rules, +// Shift doesn't cancel CapsLock. partial xkb_types "internal_nocancel" { type "ALPHABETIC" { modifiers = Shift; @@ -77,8 +78,9 @@ partial xkb_types "internal_nocancel" { level_name[Level4] = "Shift Alt"; }; }; -// CapsLock acts as Shift with locking -// Shift "pauses" CapsLock + +// CapsLock acts as Shift with locking, +// Shift "pauses" CapsLock. partial xkb_types "shift" { type "ALPHABETIC" { modifiers = Shift+Lock; @@ -111,7 +113,7 @@ partial xkb_types "shift" { map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level4; + map[Lock+Shift+LevelThree] = Level4; preserve[Lock+LevelThree] = Lock; preserve[Lock+Shift+LevelThree] = Lock; level_name[Level1] = "Base"; @@ -120,8 +122,9 @@ partial xkb_types "shift" { level_name[Level4] = "Shift Alt"; }; }; -// CapsLock acts as Shift with locking -// Shift doesn't cancel CapsLock + +// CapsLock acts as Shift with locking, +// Shift doesn't cancel CapsLock. partial xkb_types "shift_nocancel" { type "ALPHABETIC" { modifiers = Shift+Lock; @@ -157,7 +160,7 @@ partial xkb_types "shift_nocancel" { map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level4; + map[Lock+Shift+LevelThree] = Level4; preserve[Lock+LevelThree] = Lock; preserve[Lock+Shift+LevelThree] = Lock; level_name[Level1] = "Base"; diff --git a/xorg-server/xkeyboard-config/types/extra b/xorg-server/xkeyboard-config/types/extra index 465796b53..e7529f40d 100644 --- a/xorg-server/xkeyboard-config/types/extra +++ b/xorg-server/xkeyboard-config/types/extra @@ -1,20 +1,20 @@ partial default xkb_types "default" { - // Definition for a key type used for the czech keymap, for instance. - // Defines style a with four level shift. It is similar to three_level - // type used for iso9995 but it lets the shift key behave "normally". + + // Defines a type with a four-level shift, similar to the three-level + // type used for iso9995, but it lets the Shift key behave "normally". virtual_modifiers LevelThree; type "FOUR_LEVEL" { - modifiers = Shift+LevelThree; + modifiers = Shift+LevelThree; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; 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] = "Alt Base"; + level_name[Level4] = "Shift Alt"; }; type "FOUR_LEVEL_ALPHABETIC" { @@ -40,7 +40,7 @@ partial default xkb_types "default" { map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level4; + map[Lock+Shift+LevelThree] = Level4; preserve[Lock+LevelThree] = Lock; preserve[Lock+Shift+LevelThree] = Lock; level_name[Level1] = "Base"; @@ -49,11 +49,9 @@ partial default xkb_types "default" { level_name[Level4] = "Shift Alt"; }; - // Another four level keypad variant - // First two levels are controled by NumLock (with active Shift-ing like - // in KEYPAD). LevelThree overrides this mode, with two additional - // Shift-ed levels - // NumLock state is intentionnaly ignored when LevelThree is active + // A four-level keypad variant. The first two levels are controlled by + // 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; map[None] = Level1; @@ -61,32 +59,32 @@ partial default xkb_types "default" { map[NumLock] = Level2; map[Shift] = Level2; map[LevelThree] = Level3; - map[NumLock+LevelThree] = Level3; + map[NumLock+LevelThree] = Level3; map[Shift+LevelThree] = Level4; - map[Shift+NumLock+LevelThree] = Level4; + map[Shift+NumLock+LevelThree] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Number"; level_name[Level3] = "Alt Base"; level_name[Level4] = "Shift Alt"; }; - // Base level, two Shift-ed LevelThree levels, one Ctrl+Alt command level + // Base level, two shifted LevelThree levels, one Ctrl+Alt command level. type "FOUR_LEVEL_X" { modifiers = Shift+LevelThree+Control+Alt; map[None] = Level1; map[LevelThree] = Level2; - map[Shift+LevelThree] = Level3; - map[Control+Alt] = Level4; + map[Shift+LevelThree] = Level3; + map[Control+Alt] = Level4; level_name[Level1] = "Base"; level_name[Level2] = "Alt Base"; level_name[Level3] = "Shift Alt"; - level_name[Level4] = "Ctrl+Alt"; + level_name[Level4] = "Ctrl+Alt"; }; -// Special type for keys used in Serbian Latin Unicode map -// It makes it possible to use all three forms of latin letters -// present in Unicode that are made up of two separate letters -// (forms like LJ, Lj, and lj; NJ, Nj, and nj; etc) +// A special type for keys used in the Serbian Latin Unicode keymap. +// It makes it possible to use all three forms of latin letters +// 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; @@ -105,21 +103,20 @@ partial default xkb_types "default" { level_name[Level4] = "Shift AltGr"; }; -// type for e.g. german ssharp which is capitalized SS. +// A key type for the German ssharp (for example), which is capitalized as SS. // CHARACTERISTICS: -// It is FOUR_LEVEL with the exception that the fifth level -// is mapped to the Lock modifier. -// If other modifiers are used, the Lock state is ignored. +// It is FOUR_LEVEL with the exception that the fifth level is mapped to the +// Lock modifier. If other modifiers are used, the Lock state is ignored. // DETAILS ABOUT GERMAN: -// The capital form of ssharp (called sharp s) only exists for -// completely capitalized Text, not at the beginning of sentences -// or nouns (nouns have a captial letter at the beginning in german). -// The ssharp key, to the right of the zero key, takes this into -// account and has a questionmark mapped on shift-ssharp since -// normally no capital version is needed. -// When typing with active capsLock, this key type is needed to -// output two capital letters S because this is the only german key -// whose capital letter is not the same as the one typed with shift. +// The capital form of ssharp (called sharp s) only exists for completely +// capitalized text, not for words at the beginning of sentences nor for +// nouns (nouns in German normally start with a captial letter). +// The ssharp key, to the right of the zero key, takes this into account +// and has a questionmark mapped to Shift-ssharp since normally no capital +// version is needed. +// When typing with active CapsLock, this key type is needed to +// output two capital letters S because this is the only German key +// whose capital letter is not the same as the one typed with Shift. type "FOUR_LEVEL_PLUS_LOCK" { modifiers = Shift+Lock+LevelThree; @@ -139,7 +136,7 @@ partial default xkb_types "default" { }; }; -// This enables the four level shifting also for the keypad. +// This enables the four-level shifting also for the keypad. partial xkb_types "keypad" { virtual_modifiers LevelThree; @@ -157,5 +154,5 @@ partial xkb_types "keypad" { level_name[Level2] = "Number"; level_name[Level3] = "Alt Base"; level_name[Level4] = "Alt Number"; - }; + }; }; diff --git a/xorg-server/xkeyboard-config/types/iso9995 b/xorg-server/xkeyboard-config/types/iso9995 index 0cf34203c..d3c4e0bf6 100644 --- a/xorg-server/xkeyboard-config/types/iso9995 +++ b/xorg-server/xkeyboard-config/types/iso9995 @@ -1,8 +1,8 @@ partial default xkb_types "default" { - // Definition for a key type which - // can be used to implement ISO9995 - // style level three shift + // A key type which can be used to implement + // an ISO9995-style level-three shift. + virtual_modifiers LevelThree; type "THREE_LEVEL" { diff --git a/xorg-server/xkeyboard-config/types/level5 b/xorg-server/xkeyboard-config/types/level5 index 672f0a1b3..1796f502d 100644 --- a/xorg-server/xkeyboard-config/types/level5 +++ b/xorg-server/xkeyboard-config/types/level5 @@ -1,12 +1,12 @@ partial default xkb_types "default" { - // Definition for a key type used for the czech keymap, for instance. - // Defines style a with four level shift. It is similar to three_level - // type used for iso9995 but it lets the shift key behave "normally". + + // Defines a type with an eight-level shift, similar to the three-level + // type used for iso9995, but it lets the Shift key behave "normally". virtual_modifiers LevelThree,ScrollLock,LevelFive; type "EIGHT_LEVEL" { - modifiers = Shift+LevelThree+LevelFive; + modifiers = Shift+LevelThree+LevelFive; map[None] = Level1; map[Shift] = Level2; map[LevelThree] = Level3; @@ -17,8 +17,8 @@ partial default 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] = "Alt Base"; + level_name[Level4] = "Shift Alt"; level_name[Level5] = "X"; level_name[Level6] = "X Shift"; level_name[Level7] = "X Alt Base"; @@ -33,7 +33,7 @@ partial default xkb_types "default" { map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level4; - map[Lock+Shift+LevelThree] = Level3; + map[Lock+Shift+LevelThree] = Level3; map[LevelFive] = Level5; map[Shift+LevelFive] = Level6; @@ -41,7 +41,7 @@ partial default xkb_types "default" { map[LevelThree+LevelFive] = Level7; map[Shift+LevelThree+LevelFive] = Level8; map[Lock+LevelThree+LevelFive] = Level8; - map[Lock+Shift+LevelThree+LevelFive] = Level7; + map[Lock+Shift+LevelThree+LevelFive] = Level7; level_name[Level1] = "Base"; level_name[Level2] = "Shift"; @@ -54,9 +54,9 @@ partial default xkb_types "default" { }; // type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" { -// // Level5-Lock is implemented by using NumLock, because a real modifier -// // is required. -// +// // Level5-Lock is implemented by using NumLock, because a real modifier +// // is required. +// // modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; // // map[None] = Level1; @@ -116,11 +116,11 @@ partial default xkb_types "default" { // }; // // type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" { -// // Level5-Lock is implemented by using NumLock, because a real modifier -// // is required. -// +// // Level5-Lock is implemented by using NumLock, because a real modifier +// // is required. +// // modifiers = Shift + Lock + LevelThree + NumLock + LevelFive; -// +// // map[None] = Level1; // map[Shift] = Level2; // map[LevelThree] = Level3; @@ -183,7 +183,7 @@ partial default xkb_types "default" { map[LevelThree] = Level3; map[Shift+LevelThree] = Level4; map[Lock+LevelThree] = Level3; - map[Lock+Shift+LevelThree] = Level4; + map[Lock+Shift+LevelThree] = Level4; map[LevelFive] = Level5; map[Shift+LevelFive] = Level6; @@ -192,7 +192,7 @@ partial default xkb_types "default" { map[LevelThree+LevelFive] = Level7; map[Shift+LevelThree+LevelFive] = Level8; map[Lock+LevelThree+LevelFive] = Level7; - map[Lock+Shift+LevelThree+LevelFive] = Level8; + map[Lock+Shift+LevelThree+LevelFive] = Level8; preserve[Lock+LevelThree] = Lock; preserve[Lock+Shift+LevelThree] = Lock; diff --git a/xorg-server/xkeyboard-config/types/mousekeys b/xorg-server/xkeyboard-config/types/mousekeys index 88d88a21e..901848aa3 100644 --- a/xorg-server/xkeyboard-config/types/mousekeys +++ b/xorg-server/xkeyboard-config/types/mousekeys @@ -2,9 +2,9 @@ partial default xkb_types "default" { virtual_modifiers Alt; type "SHIFT+ALT" { - modifiers = Shift+Alt; - map[Shift+Alt] = Level2; - level_name[Level1] = "Base"; + modifiers = Shift+Alt; + map[Shift+Alt] = Level2; + level_name[Level1] = "Base"; level_name[Level2] = "Shift+Alt"; }; }; diff --git a/xorg-server/xkeyboard-config/types/nokia b/xorg-server/xkeyboard-config/types/nokia index f77d8868a..300fe4169 100644 --- a/xorg-server/xkeyboard-config/types/nokia +++ b/xorg-server/xkeyboard-config/types/nokia @@ -1,6 +1,7 @@ partial default xkb_types "default" { - // Some types that are used by Nokia devices and keyboard. + // A type that is used by Nokia devices and keyboards. + virtual_modifiers LevelThree; type "PC_FN_LEVEL2" { diff --git a/xorg-server/xkeyboard-config/types/numpad b/xorg-server/xkeyboard-config/types/numpad index 7888d7db1..5861f118a 100644 --- a/xorg-server/xkeyboard-config/types/numpad +++ b/xorg-server/xkeyboard-config/types/numpad @@ -11,7 +11,7 @@ partial default xkb_types "pc" { include "extra(keypad)" }; -// On Mac keypads, level 1 and 2 are swapped +// On Mac keypads, level 1 and 2 are swapped. partial xkb_types "mac" { type "KEYPAD" { modifiers = None; @@ -33,11 +33,11 @@ partial xkb_types "microsoft" { include "extra(keypad)" }; -// Swiss-German style numeric keypad: Shift and NumLock operates as +// Swiss-German style numeric keypad: Shift and NumLock operate as // two independent modifiers; however, since we want shift state for // the cursor keys, only three levels are used from the key mappings. -// Closest type is actually FOUR_LEVEL_X, but most numpad layouts uses -// FOUR_LEVEL_MIXED_KEYPAD so that's the one we are going to override. +// Closest type is actually FOUR_LEVEL_X, but most numpad layouts use +// 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; diff --git a/xorg-server/xkeyboard-config/types/pc b/xorg-server/xkeyboard-config/types/pc index daebe7442..17e494b30 100644 --- a/xorg-server/xkeyboard-config/types/pc +++ b/xorg-server/xkeyboard-config/types/pc @@ -2,7 +2,8 @@ partial default xkb_types "default" { // Some types that are necessary // for a full implementation of - // a PC compatible keyboard. + // a PC-compatible keyboard. + virtual_modifiers Alt; virtual_modifiers LevelThree; virtual_modifiers LAlt; @@ -74,13 +75,13 @@ partial default xkb_types "default" { level_name[Level5] = "Ctrl+Alt"; }; - // Local eight level - // Needed when you want part of your layout eight-level but can not use - // LevelFive as modifier, as this will take over right ctrl by default - // for all the layout and is too invasive for your average four-level user - // Needed to fix bug #9529 - // FIXME Should really use RControl but it's seems not to be enabled by - // default and touching this requires a lot of testing + // Local eight level. + // Needed when you want part of your layout eight-level but cannot use + // LevelFive as modifier, as this will take over the right Ctrl by default + // for the whole layout and is too invasive for the average four-level user. + // Needed to fix bug #9529. + // 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; |