ONE_LEVEL fixing by Frank

1 files changed, 28 insertions, 27 deletions

diff --git a/symbols/level3 b/symbols/level3
index e626e5c..70f5e12 100644
--- a/symbols/level3
+++ b/symbols/level3
@@ -1,19 +1,22 @@
-// using the level(switch) map, the right Control key temporarily
-// chooses the third group level (until it is released).
+// these variants assign various XKB keycodes to ISO_Level3_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 $
 //
 
-partial modifier_keys
-xkb_symbols "switch" {
-  key <RCTL> {
+// the default behavior is for the right Alt key (AltGr) to generate the
+// third engraved symbol
+default partial modifier_keys
+xkb_symbols "ralt_switch" {
+  key <RALT> {
+    type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
     };
   modifier_map Mod5   { ISO_Level3_Shift };
 };
 
-// using the level(alt_switch) map, both Alt keys temporarily choose the third
-// group level.  This will mostly be used for imitating Mac OS functionality.
+// using the level(alt_switch) map, either Alt key temporarily chooses
+// the third shift level.  (Mostly be used to imitate Mac OS functionality.)
 partial modifier_keys
 xkb_symbols "alt_switch" {
   include "level3(lalt_switch)"
@@ -26,38 +29,35 @@ xkb_symbols "lalt_switch" {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
     };
+  modifier_map Mod5   { ISO_Level3_Shift };
 };
 
+// using the level(switch) map, the right Control key temporarily
+// chooses the third shift level (until it is released).
 partial modifier_keys
-xkb_symbols "ralt_switch" {
-  key <RALT> {
+xkb_symbols "switch" {
+  key <RCTL> {
     type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
     };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_multikey" {
-  key <RALT> {
-    type[Group1]="TWO_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
-    };
+  modifier_map Mod5   { ISO_Level3_Shift };
 };
 
 // using the level(menu_switch) map, the Menu key temporarily
-// chooses the third group level (until it is released).
+// chooses the third shift level (until it is released).
 partial modifier_keys
 xkb_symbols "menu_switch" {
   key <MENU> {
+    type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
     };
   modifier_map Mod5   { ISO_Level3_Shift };
 };
 
-// using the level(win_switch) map, the both Windows' logo keys
-// temporarily choose the third group level.  If you use this map, you
-// would define you keyboard as pc101 or pc102 instead of pc104 or
-// pc105.
+// using the level(win_switch) map, the either Windows' logo key
+// temporarily chooses the third shift level.  If you use this map,
+// you should define your keyboard as pc101 or pc102 instead of pc104
+// or pc105.
 partial modifier_keys
 xkb_symbols "win_switch" {
   include "level3(lwin_switch)"
@@ -65,26 +65,27 @@ xkb_symbols "win_switch" {
 };
 
 // using the level(lwin_switch) map, the left Windows' logo key
-// temporarily chooses the third group level.  If you use this map,
-// you would define you keyboard as pc101 or pc102 instead of pc104
+// temporarily chooses the third shift level.  If you use this map,
+// you should define your keyboard as pc101 or pc102 instead of pc104
 // or pc105.
 partial modifier_keys
 xkb_symbols "lwin_switch" {
   key <LWIN> {
+    type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
     };
   modifier_map Mod5   { ISO_Level3_Shift };
 };
 
 // using the level(rwin_switch) map, the right Windows' logo key
-// temporarily chooses the third group level.  If you use this map,
-// you would define you keyboard as pc101 or pc102 instead of pc104
+// temporarily chooses the third shift level.  If you use this map,
+// you should define your keyboard as pc101 or pc102 instead of pc104
 // or pc105.
 partial modifier_keys
 xkb_symbols "rwin_switch" {
   key <RWIN> {
+    type[Group1]="ONE_LEVEL",
     symbols[Group1] = [ ISO_Level3_Shift ]
     };
   modifier_map Mod5   { ISO_Level3_Shift };
 };
-