From 9b97bd9ea6827462ebe5a9ba7e89c2597fa71f1f Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Mon, 24 Feb 2020 00:02:40 -0600
Subject: [PATCH] - Updated mac_term for the changes in added GUI and DE
 support

---
 .xkb/symbols/mac_term | 27 +++++++++++++++++++++++++++
 .xkb/types/mac_term   | 33 ++++++++++++++++++++++++++-------
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term
index 514e788..50d8388 100644
--- a/.xkb/symbols/mac_term
+++ b/.xkb/symbols/mac_term
@@ -27,6 +27,33 @@ partial xkb_symbols "mac_win" {
     };
 };
 partial xkb_symbols "mac_global" {
+    // Cycle App and In App Tab Switching
+    replace key <TAB> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            Tab,
+            Tab,
+            slash,
+            NoSymbol,
+            NoSymbol,
+            slash,
+            Tab,
+            Tab
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<BKSL>,clearmods=Shift),
+            // FK18 is just to clear Alt
+            RedirectKey(key=<FK18>,clearmods=Mod1),
+            RedirectKey(key=<FK18>,clearmods=Mod1),
+            // Also need to remap on the DE level 
+            // to backslash \ for Cmd+Tab
+            RedirectKey(key=<TAB>),
+            RedirectKey(key=<TAB>,modifiers=Control,clearmods=Mod4),
+            RedirectKey(key=<TAB>,modifiers=Control+Shift,clearmods=Mod4)
+        ]
+    };
     // Page Up
     replace key <UP> {
         type[Group1]= "ONE_LEVEL_CTRL",
diff --git a/.xkb/types/mac_term b/.xkb/types/mac_term
index 533e933..0be72de 100644
--- a/.xkb/types/mac_term
+++ b/.xkb/types/mac_term
@@ -1,10 +1,29 @@
 default partial xkb_types "addmac_levels" {
+    Virtual_modifiers Super;
     type "ONE_LEVEL_CTRL" {
-        modifiers= Shift+Control;
-        map[Shift]= Level2;
-        map[Shift+Control]= Level3;
-        level_name[Level1]= "Base";
-        level_name[Level2]= "Alt";
-        level_name[Level3]= "With Control";
+        modifiers = Shift+Mod1+Super+Control;
+        map[Shift] = Level2;
+        map[Shift+Control] = Level3;
+        map[Mod1] = Level4;
+        map[Shift+Mod1] = Level5;
+        map[Control] = Level6;
+        map[Super] = Level7;
+        map[Shift+Super] = Level8;
+        map[Mod1+Control] = 9;
+        map[Super+Control] = 10;
+        map[Super+Mod1] = 11;
+        map[Super+Mod1+Control] = 12;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Shift Control";
+        level_name[Level4] = "Alt";  
+        level_name[Level5] = "Shift Alt";
+        level_name[Level6] = "Control";
+        level_name[Level7] = "Super";
+        level_name[Level8] = "Shift Super";
+        level_name[9] = "Control Alt";
+        level_name[10] = "Super Control";
+        level_name[11] = "Super Alt";
+        level_name[12] = "Super Control Alt";
     };
-};
\ No newline at end of file
+};