xkeyboard-config git update 9/5/2010

1 files changed, 151 insertions, 132 deletions

diff --git a/xorg-server/xkbdata.src/symbols/level5 b/xorg-server/xkbdata.src/symbols/level5
index 19db36ccd..99cb4601c 100644
--- a/xorg-server/xkbdata.src/symbols/level5
+++ b/xorg-server/xkbdata.src/symbols/level5
@@ -1,132 +1,151 @@
-// $XKeyboardConfig$
-
-// these variants assign various XKB keycodes to ISO_Level5_Shift so that
-// the third shift level can be reached
-//
-// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $
-//
-
-// using the level(switch) map, the right Control key temporarily
-// chooses the fifth shift level (until it is released).
-partial modifier_keys
-xkb_symbols "rctrl_switch" {
-  key <RCTL> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift ]
-    };
-  modifier_map Mod3   { ISO_Level5_Shift };
-};
-
-// The following modifier keys are used to switch to the third shift and to set a
-// corresponding lock, implemented as NumLock.
-
-partial modifier_keys
-xkb_symbols "lock" {
-  // This adds the definitions needed to create a level5-lock behaviour, using
-  // the real modifier NumLock as a lock indicator.
-  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
-  // See also: compat/level5(level5_lock)
-  key.type[Group1] = "ONE_LEVEL";
-
-  replace key <MDSW> {
-    vmods = LevelFive,
-    symbols[Group1] = [ ISO_Level5_Shift ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-  };
-  modifier_map Mod3 { <MDSW> };
-
-  replace key <HYPR> {
-    vmods = NumLock,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=NumLock) ]
-  };
-  modifier_map Mod2 { <HYPR> };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch_lock" {
-
-  include "level5(lock)"
-
-  key <LSGT> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lwin_switch_lock" {
-
-  include "level5(lock)"
-
-  key <LWIN> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_lock" {
-
-  include "level5(lock)"
-
-  key <RALT> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "rwin_switch_lock" {
-
-  include "level5(lock)"
-
-  key <RWIN> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <LSGT> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lwin_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <LWIN> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <RALT> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "rwin_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <RWIN> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
+// $XKeyboardConfig$

+

+// these variants assign various XKB keycodes to ISO_Level5_Shift so that

+// the third shift level can be reached

+//

+// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $

+//

+

+// using the level(switch) map, the right Control key temporarily

+// chooses the fifth shift level (until it is released).

+partial modifier_keys

+xkb_symbols "rctrl_switch" {

+  key <RCTL> {

+    type[Group1]="ONE_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift ]

+    };

+  modifier_map Mod3   { ISO_Level5_Shift };

+};

+

+partial modifier_keys

+xkb_symbols "lsgt_switch" {

+  key <LSGT> {

+    type[Group1]="ONE_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift ]

+    };

+  modifier_map Mod3   { ISO_Level5_Shift };

+};

+

+partial modifier_keys

+xkb_symbols "ralt_switch" {

+  key <RALT> {

+    type[Group1]="ONE_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift ]

+    };

+  modifier_map Mod3   { ISO_Level5_Shift };

+};

+

+

+// The following modifier keys are used to switch to the third shift and to set a

+// corresponding lock, implemented as NumLock.

+

+partial modifier_keys

+xkb_symbols "lock" {

+  // This adds the definitions needed to create a level5-lock behaviour, using

+  // the real modifier NumLock as a lock indicator.

+  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK

+  // See also: compat/level5(level5_lock)

+  key.type[Group1] = "ONE_LEVEL";

+

+  replace key <MDSW> {

+    vmods = LevelFive,

+    symbols[Group1] = [ ISO_Level5_Shift ],

+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]

+  };

+  modifier_map Mod3 { <MDSW> };

+

+  replace key <HYPR> {

+    vmods = NumLock,

+    symbols[Group1] = [ NoSymbol ],

+    actions[Group1] = [ SetMods(modifiers=NumLock) ]

+  };

+  modifier_map Mod2 { <HYPR> };

+};

+

+partial modifier_keys

+xkb_symbols "lsgt_switch_lock" {

+

+  include "level5(lock)"

+

+  key <LSGT> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "lwin_switch_lock" {

+

+  include "level5(lock)"

+

+  key <LWIN> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "ralt_switch_lock" {

+

+  include "level5(lock)"

+

+  key <RALT> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "rwin_switch_lock" {

+

+  include "level5(lock)"

+

+  key <RWIN> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "lsgt_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <LSGT> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "lwin_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <LWIN> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "ralt_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <RALT> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "rwin_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <RWIN> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};