- Resolved instability issue under KDE and xkb keymaps

.xkb/symbols/mac_gui

@@ -1,4 +1,19 @@
 // Template
+//
+// ONE_LEVEL_CTRL
+// Base
+// Shift
+// Alt
+// Shift Alt
+// Control
+// Shift Control
+// Super
+// Shift Super
+// Control Alt
+// Super Control
+// Super Alt
+// Super Control Alt
+//
 // replace key <KEY> {
 //     type[Group1]= "ONE_LEVEL_CTRL",
 //     symbols[Group1]= [
@@ -163,17 +178,27 @@ default partial xkb_symbols "mac_levelssym" {
     replace key <AD01> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
+            // Base
             q,
+            // Shift
             Q,
+            // Alt
             q,
+            // Shift Alt
             Q,
+            // Control
             F4
         ],
         actions[Group1]= [
+            // Base
             NoAction(),
+            // Shift
             NoAction(),
+            // Alt
             NoAction(),
+            // Shift Alt
             NoAction(),
+            // Control
             RedirectKey(key=<FK04>,modifiers=Mod1,clearmods=Control)
         ]
     };
@@ -181,10 +206,15 @@ default partial xkb_symbols "mac_levelssym" {
     replace key <FK03> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
+            // Base
             F3,
+            // Shift
             F3,
+            // Alt
             F3,
+            // Shift Alt
             F3,
+            // Control
             d
         ],
         actions[Group1]= [
@@ -199,17 +229,29 @@ default partial xkb_symbols "mac_levelssym" {
     replace key <AC05> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
+            // Base
             g,
+            // Shift
             G,
+            // Alt
             g,
+            // Shift Alt
             G,
+            // Control
             g,
+            // Shift Control
             G,
+            // Super
             NoSymbol,
+            // Shift Super
             NoSymbol,
+            // Control Alt
             g,
+            // Super Control
             g,
+            // Super Alt
             g,
+            // Super Control Alt
             g
         ],
         actions[Group1]= [
@@ -237,99 +279,155 @@ default partial xkb_symbols "mac_levelssym" {
     replace key <LEFT> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
+            // Base
             Left,
+            // Shift
             Left,
+            // Alt
             Left,
+            // Shift Alt
             Left,
+            // Control
             NoSymbol,
+            // Shift Control
             NoSymbol,
+            // Super
             Left
         ],
         actions[Group1]= [
+            // Base
             NoAction(),
+            // Shift
             NoAction(),
-            // Wordwise
+            // Alt - Wordwise
             RedirectKey(key=<LEFT>,mods=Control,clearmods=Mod1),
+            // Shift Alt
             RedirectKey(key=<LEFT>,mods=Control,clearmods=Mod1),
+            // Control
             RedirectKey(key=<HOME>,clearmods=Control),
+            // Shift Control
             RedirectKey(key=<HOME>,clearmods=Control),
-            // Change workspace
-            NoAction(),
             // Super - Change workspace
             NoAction()
         ]
     };
+
     // Right to End of Line or end of word
     replace key <RGHT> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
+            // Base
             Right,
+            // Shift
             Right,
+            // Alt
             Right,
+            // Shift Alt
             Right,
+            // Control
             NoSymbol,
-            NoSymbol
+            // Shift Control
+            NoSymbol,
+            // Super
+            Right
         ],
         actions[Group1]= [
+            // Base
             NoAction(),
+            // Shift
             NoAction(),
-            // Wordwise
+            // Alt - Wordwise
             RedirectKey(key=<RGHT>,mods=Control,clearmods=Mod1),
+            // Shift Alt
             RedirectKey(key=<RGHT>,mods=Control,clearmods=Mod1),
+            // Control
             RedirectKey(key=<END>,clearmods=Control),
+            // Shift Control
             RedirectKey(key=<END>,clearmods=Control),
-            // Change workspace
+            // Super - Change workspace
             NoAction()
         ]
     };
+
     //Up to Mac Home
     replace key <UP> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
+            // Base
             Up,
+            // Shift
             Up,
+            // Alt
             Up,
+            // Shift Alt
             Up,
+            // Control
             NoSymbol,
+            // Shift Control
             NoSymbol,
+            // Super
+            Up,
+            // Shift Super
             Up
         ],
         actions[Group1]= [
+            // Base
             NoAction(),
+            // Shift
             NoAction(),
-            // Wordwise
+            // Alt - Wordwise
             RedirectKey(key=<UP>,clearmods=Mod1),
+            // Shift Alt
             // RedirectKey(key=<UP>), // Chromebook multicursor
             RedirectKey(key=<UP>,clearmods=Mod1), // Default multicursor
+            // Control
             RedirectKey(key=<HOME>),
+            // Shift Control
             RedirectKey(key=<HOME>),
-            // Wordwise - Sublime?
+            // Super - Wordwise - Sublime?
             RedirectKey(key=<PGUP>,clearmods=Super),
+            // Shift Super
             RedirectKey(key=<UP>,modifiers=Mod1,clearmods=Super)
         ]
     };
+
     // Down to Mac End
     replace key <DOWN> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
+            // Base
             Down,
+            // Shift
             Down,
+            // Alt
             Down,
+            // Shift Alt
             Down,
+            // Control
             NoSymbol,
+            // Shift Control
             NoSymbol,
+            // Super
+            Down,
+            // Shift Super
             Down
         ],
         actions[Group1]= [
+            // Base
             NoAction(),
+            // Shift
             NoAction(),
-            // Wordwise
+            // Alt - Wordwise
             RedirectKey(key=<DOWN>,clearmods=Mod1),
+            // Shift Alt
             RedirectKey(key=<DOWN>,clearmods=Mod1),
+            // Control
             RedirectKey(key=<END>),
+            // Shift Control
             RedirectKey(key=<END>),
-            // Wordwise - Sublime?
+            // Super - Wordwise - Sublime?
             RedirectKey(key=<PGDN>,clearmods=Super),
+            // Shift Super
             RedirectKey(key=<DOWN>,modifiers=Mod1,clearmods=Super)
         ]
     };

.xkb/symbols/mac_term

@@ -93,9 +93,11 @@ partial xkb_symbols "mac_global" {
             RedirectKey(key=<AC03>,modifiers=Super,clearmods=Control+Shift)
         ]
     };
+
     // Cycle App and In App Tab Switching
     key <FK13> { [ F13 ] };
     key <FK14> { [ F14 ] };
+
     replace key <TAB> {
         type[Group1]= "ONE_LEVEL_CMD",
         symbols[Group1]= [
@@ -113,9 +115,10 @@ partial xkb_symbols "mac_global" {
             Redirect(key=<PGDN>,mods=Control,clearmods=Mod4+Super) // Default
         ]
     };
+
     // Page Up
     replace key <UP> {
-        type[Group1]= "ONE_LEVEL_CMD",
+        type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [ 
             Up,
             Up,
@@ -127,9 +130,10 @@ partial xkb_symbols "mac_global" {
             RedirectKey(key=<PGUP>,clearmods=Shift+Control) 
         ]
     };
+
     // Page Down
     replace key <DOWN> {
-        type[Group1]= "ONE_LEVEL_CMD",
+        type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
             Down,
             Down,

.xkb/types/mac_term

@@ -40,4 +40,14 @@ default partial xkb_types "addmac_levels" {
         level_name[Level5] = "Super";
         level_name[Level6] = "Super Shift";
     };
+    type "ONE_LEVEL_SUPER" {
+        modifiers = Shift+Super;
+        map[Shift] = Level2;
+        map[Super] = Level3;
+        map[Shift+Super] = Level4;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Super";
+        level_name[Level4] = "Super Shift";
+    };
 };