From aa1558e403c7d626fe38d8ec452557c5f2037dc4 Mon Sep 17 00:00:00 2001
From: stephan <stephan@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Thu, 28 May 2009 18:22:07 +0000
Subject: Alles auf xkeyboard-config Version 1.6 angeglichen. Modifier mit
 Hilfe von compat-Regeln definiert. Damit sollten alle Multi-Layout-Bugs
 behoben sein. Allerdings tritt wahrscheinlich #135 wieder auf.

git-svn-id: https://svn.neo-layout.org@1879 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 linux/X/symbols/level5 | 142 ++++++++++++++++++-------------------------------
 1 file changed, 52 insertions(+), 90 deletions(-)

(limited to 'linux/X/symbols/level5')

diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5
index 35b8186..c722d87 100644
--- a/linux/X/symbols/level5
+++ b/linux/X/symbols/level5
@@ -22,7 +22,7 @@ xkb_symbols "rctrl_switch" {
 // as some applications get confused by it.
 
 partial modifier_keys
-xkb_symbols "lsgt_switch_numlock" {
+xkb_symbols "neomod_map" {
   key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
@@ -30,137 +30,99 @@ xkb_symbols "lsgt_switch_numlock" {
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
   modifier_map Mod3 { <MDSW> };
+  key <HYPR> {
+    type[Group1] = "ONE_LEVEL",
+   	vmods[Group1] = NumLock,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=NumLock) ]
+   };
+  modifier_map Mod2 { <HYPR> };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_numlock" {
+
+  include "level5(neomod_map)"
+
   key <LSGT> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    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 ]
   };
-  modifier_map Mod2 { <LSGT> };
 };
 
 partial modifier_keys
 xkb_symbols "lwin_switch_numlock" {
-  key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-   	vmods[Group1] = LevelFive,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-   };
-  modifier_map Mod3 { <MDSW> };
+
+  include "level5(neomod_map)"
+
   key <LWIN> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    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 ]
   };
-  modifier_map Mod2 { <LWIN> };
 };
 
 partial modifier_keys
 xkb_symbols "ralt_switch_numlock" {
-  key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-   	vmods[Group1] = LevelFive,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-   };
-  modifier_map Mod3 { <MDSW> };
+
+  include "level5(neomod_map)"
+
   key <RALT> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    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 ]
   };
-  modifier_map Mod2 { <RALT> };
 };
 
 partial modifier_keys
 xkb_symbols "rwin_switch_numlock" {
-  key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-   	vmods[Group1] = LevelFive,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-   };
-  modifier_map Mod3 { <MDSW> };
+
+  include "level5(neomod_map)"
+
   key <RWIN> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    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 ]
   };
-  modifier_map Mod2 { <RWIN> };
 };
 
 partial modifier_keys
 xkb_symbols "lsgt_switch_numlock_cancel" {
-  key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-   	vmods[Group1] = LevelFive,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-   };
-  modifier_map Mod3 { <MDSW> };
+
+  include "level5(neomod_map)"
+
   key <LSGT> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
+    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 ]
   };
-  modifier_map Mod2 { <LSGT> };
 };
 
 partial modifier_keys
 xkb_symbols "lwin_switch_numlock_cancel" {
-  key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-   	vmods[Group1] = LevelFive,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-   };
-  modifier_map Mod3 { <MDSW> };
+
+  include "level5(neomod_map)"
+
   key <LWIN> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
+    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 ]
   };
-  modifier_map Mod2 { <LWIN> };
 };
 
 partial modifier_keys
 xkb_symbols "ralt_switch_numlock_cancel" {
-  key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-   	vmods[Group1] = LevelFive,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-   };
-  modifier_map Mod3 { <MDSW> };
+
+  include "level5(neomod_map)"
+
   key <RALT> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
+    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 ]
   };
-  modifier_map Mod2 { <RALT> };
 };
 
 partial modifier_keys
 xkb_symbols "rwin_switch_numlock_cancel" {
-  key <MDSW> {
-    type[Group1] = "ONE_LEVEL",
-   	vmods[Group1] = LevelFive,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-   };
-  modifier_map Mod3 { <MDSW> };
+
+  include "level5(neomod_map)"
+
   key <RWIN> {
-    vmods= NumLock,
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
-    symbols[Group1] = [ Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock, Num_Lock ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), SetMods(modifiers=LevelFive), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock), LockMods(modifiers=NumLock) ]
+    type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
+    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 ]
   };
-  modifier_map Mod2 { <RWIN> };
 };
-- 
cgit v1.2.3