diff options
author | marha <marha@users.sourceforge.net> | 2011-06-16 08:06:24 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-06-16 08:06:24 +0200 |
commit | 26686c98bac306ee4e6502850e2dc8afbe4a496a (patch) | |
tree | cee1b3d5fb6414da25f6bfe9aafd618c676a7d90 /xorg-server/xkeyboard-config/types | |
parent | 0e661faf8cf2e3460b5e2389414f99c035ad4d6a (diff) | |
download | vcxsrv-26686c98bac306ee4e6502850e2dc8afbe4a496a.tar.gz vcxsrv-26686c98bac306ee4e6502850e2dc8afbe4a496a.tar.bz2 vcxsrv-26686c98bac306ee4e6502850e2dc8afbe4a496a.zip |
xserver xkeyboard-config xkbcomp git update 16 June 2011
Diffstat (limited to 'xorg-server/xkeyboard-config/types')
-rw-r--r-- | xorg-server/xkeyboard-config/types/pc | 223 |
1 files changed, 115 insertions, 108 deletions
diff --git a/xorg-server/xkeyboard-config/types/pc b/xorg-server/xkeyboard-config/types/pc index c2d085ed5..01a5634ad 100644 --- a/xorg-server/xkeyboard-config/types/pc +++ b/xorg-server/xkeyboard-config/types/pc @@ -1,108 +1,115 @@ -partial default xkb_types "default" {
-
- // Some types that are necessary
- // for a full implementation of
- // a PC compatible keyboard.
- virtual_modifiers Alt;
- virtual_modifiers LevelThree;
- virtual_modifiers LAlt;
- virtual_modifiers RAlt;
- virtual_modifiers RControl;
- virtual_modifiers LControl;
-
- type "PC_CONTROL_LEVEL2" {
- modifiers = Control;
- map[None] = Level1;
- map[Control] = Level2;
- level_name[Level1] = "Base";
- level_name[Level2] = "Control";
- };
-
- type "PC_LCONTROL_LEVEL2" {
- modifiers = LControl;
- map[None] = Level1;
- map[LControl] = Level2;
- level_name[Level1] = "Base";
- level_name[Level2] = "LControl";
- };
-
- type "PC_RCONTROL_LEVEL2" {
- modifiers = RControl;
- map[None] = Level1;
- map[RControl] = Level2;
- level_name[Level1] = "Base";
- level_name[Level2] = "RControl";
- };
-
- type "PC_ALT_LEVEL2" {
- modifiers = Alt;
- map[None] = Level1;
- map[Alt] = Level2;
- level_name[Level1] = "Base";
- level_name[Level2] = "Alt";
- };
-
- type "PC_LALT_LEVEL2" {
- modifiers = LAlt;
- map[None] = Level1;
- map[LAlt] = Level2;
- level_name[Level1] = "Base";
- level_name[Level2] = "LAlt";
- };
-
- type "PC_RALT_LEVEL2" {
- modifiers = RAlt;
- map[None] = Level1;
- map[RAlt] = Level2;
- level_name[Level1] = "Base";
- level_name[Level2] = "RAlt";
- };
-
- type "CTRL+ALT" {
- modifiers = Control+Alt;
- map[Control+Alt] = Level2;
- level_name[Level1] = "Base";
- level_name[Level2] = "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
- type "LOCAL_EIGHT_LEVEL" {
- modifiers = Shift+Lock+LevelThree+Control;
-
- map[None] = Level1;
- map[Lock+Shift] = Level1;
- map[Shift] = Level2;
- map[Lock] = Level2;
-
- map[LevelThree] = Level3;
- map[Lock+Shift+LevelThree] = Level3;
- map[Shift+LevelThree] = Level4;
- map[Lock+LevelThree] = Level4;
-
- map[Control] = Level5;
- map[Lock+Shift+Control] = Level5;
- map[Shift+Control] = Level6;
- map[Lock+Control] = Level6;
-
- map[LevelThree+Control] = Level7;
- map[Lock+Shift+LevelThree+Control] = Level7;
- map[Shift+LevelThree+Control] = Level8;
- map[Lock+LevelThree+Control] = Level8;
-
- level_name[Level1] = "Base";
- level_name[Level2] = "Shift";
- level_name[Level3] = "Level3";
- level_name[Level4] = "Shift Level3";
- level_name[Level5] = "Ctrl";
- level_name[Level6] = "Shift Ctrl";
- level_name[Level7] = "Level3 Ctrl";
- level_name[Level8] = "Shift Level3 Ctrl";
- };
-
-};
+partial default xkb_types "default" { + + // Some types that are necessary + // for a full implementation of + // a PC compatible keyboard. + virtual_modifiers Alt; + virtual_modifiers LevelThree; + virtual_modifiers LAlt; + virtual_modifiers RAlt; + virtual_modifiers RControl; + virtual_modifiers LControl; + + type "PC_CONTROL_LEVEL2" { + modifiers = Control; + map[None] = Level1; + map[Control] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Control"; + }; + + type "PC_LCONTROL_LEVEL2" { + modifiers = LControl; + map[None] = Level1; + map[LControl] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "LControl"; + }; + + type "PC_RCONTROL_LEVEL2" { + modifiers = RControl; + map[None] = Level1; + map[RControl] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "RControl"; + }; + + type "PC_ALT_LEVEL2" { + modifiers = Alt; + map[None] = Level1; + map[Alt] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Alt"; + }; + + type "PC_LALT_LEVEL2" { + modifiers = LAlt; + map[None] = Level1; + map[LAlt] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "LAlt"; + }; + + type "PC_RALT_LEVEL2" { + modifiers = RAlt; + map[None] = Level1; + map[RAlt] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "RAlt"; + }; + + type "CTRL+ALT" { + modifiers = Control+Alt+Shift+LevelThree; + map[None] = Level1; + map[Shift] = Level2; + map[LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Control+Alt] = Level5; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Alt Base"; + level_name[Level4] = "Shift Alt"; + 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 + type "LOCAL_EIGHT_LEVEL" { + modifiers = Shift+Lock+LevelThree+Control; + + map[None] = Level1; + map[Lock+Shift] = Level1; + map[Shift] = Level2; + map[Lock] = Level2; + + map[LevelThree] = Level3; + map[Lock+Shift+LevelThree] = Level3; + map[Shift+LevelThree] = Level4; + map[Lock+LevelThree] = Level4; + + map[Control] = Level5; + map[Lock+Shift+Control] = Level5; + map[Shift+Control] = Level6; + map[Lock+Control] = Level6; + + map[LevelThree+Control] = Level7; + map[Lock+Shift+LevelThree+Control] = Level7; + map[Shift+LevelThree+Control] = Level8; + map[Lock+LevelThree+Control] = Level8; + + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Level3"; + level_name[Level4] = "Shift Level3"; + level_name[Level5] = "Ctrl"; + level_name[Level6] = "Shift Ctrl"; + level_name[Level7] = "Level3 Ctrl"; + level_name[Level8] = "Shift Level3 Ctrl"; + }; + +}; |