Mappen von LevelFive auf Mod3 in die einzelnen Optionen ausgelagert.

git-svn-id: https://svn.neo-layout.org@1865 b9310e46-f624-0410-8ea1-cfbb3a30dc96

2 files changed, 61 insertions, 18 deletions

diff --git a/linux/X/symbols/de b/linux/X/symbols/de
index ef040c0..fd7d9eb 100644
--- a/linux/X/symbols/de
+++ b/linux/X/symbols/de
@@ -253,14 +253,6 @@ xkb_symbols "neo_base" {
     // Neo:        Ebene1                   Ebene2                   Ebene3                   Ebene5                   Ebene4                   ???                      Ebene6                   ???                      
     // Keys (Neo): None                     Shift                    Mod3                     Mod3 + Shift             Mod4                     Mod4 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      
 
-    key <LVL3> {
-        type[Group1] = "ONE_LEVEL",
-    	vmods[Group1] = LevelFive,
-        symbols[Group1] = [ NoSymbol ],
-        actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-    };
-    modifier_map Mod3 { <LVL3> };
-
 
     // Alphanumeric-keys
     // ===============
diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5
index 288555b..8bda615 100644
--- a/linux/X/symbols/level5
+++ b/linux/X/symbols/level5
@@ -19,12 +19,17 @@ xkb_symbols "rctrl_switch" {
 
 // The following modifier keys are used to switch to the third shift and to set a
 // corresponding lock, implemented as NumLock.  They do not use *Level5* keysyms,
-// as some applications get confused by it.  The modifiers are to be used in
-// pairs of a 'left' and a 'right' one.
+// as some applications get confused by it.
 
-// Left modifier
 partial modifier_keys
 xkb_symbols "lsgt_switch_numlock" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <LSGT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -33,9 +38,16 @@ xkb_symbols "lsgt_switch_numlock" {
   };
   modifier_map Mod2 { <LSGT> };
 };
-// Left modifier
+
 partial modifier_keys
 xkb_symbols "lwin_switch_numlock" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <LWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -45,9 +57,15 @@ xkb_symbols "lwin_switch_numlock" {
   modifier_map Mod2 { <LWIN> };
 };
 
-// Right modifier
 partial modifier_keys
 xkb_symbols "ralt_switch_numlock" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <RALT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -56,9 +74,16 @@ xkb_symbols "ralt_switch_numlock" {
   };
   modifier_map Mod2 { <RALT> };
 };
-// Right modifier
+
 partial modifier_keys
 xkb_symbols "rwin_switch_numlock" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <RWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -68,9 +93,15 @@ xkb_symbols "rwin_switch_numlock" {
   modifier_map Mod2 { <RWIN> };
 };
 
-// Left modifier
 partial modifier_keys
 xkb_symbols "lsgt_switch_numlock_cancel" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <LSGT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
@@ -79,9 +110,16 @@ xkb_symbols "lsgt_switch_numlock_cancel" {
   };
   modifier_map Mod2 { <LSGT> };
 };
-// Left modifier
+
 partial modifier_keys
 xkb_symbols "lwin_switch_numlock_cancel" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <LWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
@@ -91,9 +129,15 @@ xkb_symbols "lwin_switch_numlock_cancel" {
   modifier_map Mod2 { <LWIN> };
 };
 
-// Right modifier
 partial modifier_keys
 xkb_symbols "ralt_switch_numlock_cancel" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <RALT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
@@ -102,9 +146,16 @@ xkb_symbols "ralt_switch_numlock_cancel" {
   };
   modifier_map Mod2 { <RALT> };
 };
-// Right modifier
+
 partial modifier_keys
 xkb_symbols "rwin_switch_numlock_cancel" {
+  key <LVL3> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = LevelFive,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+   };
+  modifier_map Mod3 { <LVL3> };
   key <RWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",