From 89beeb427b8f0fdc5fae105bb9621037bf347d82 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Sun, 1 Mar 2020 18:09:24 -0600
Subject: [PATCH] - Fixed issue related to the F key trigger Control like
 behavior when shift is held on terminal. Also updated keymap profiles to be
 set properly on all installs - chromebook update broke it.

---
 .xkb/symbols/mac_term | 53 ++++++++++++++++++++-----------------------
 setup.py              |  4 ++--
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term
index 30f3e46..d07f3c6 100644
--- a/.xkb/symbols/mac_term
+++ b/.xkb/symbols/mac_term
@@ -41,21 +41,30 @@ partial xkb_symbols "mac_global" {
     //         RedirectKey(key=<AC06>,modifiers=Super,clearmods=Control+Shift)
     //     ]
     // };
-    // Maximize Window Ctrl + Cmd + F = Alt+F10
-    replace key <AC04> {
-        type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [
-            f,
-            F,
-            F
-        ],
-        actions[Group1]= [
-            NoAction(),
-            NoAction(),
-            RedirectKey(key=<FK10>,modifiers=Mod1,clearmods=Control+Shift)
-        ]
-    };
-    // Close App Cmd + Q/W = Alt + F4
+
+    //
+    // Some sort of glitch occurs on shifting F while this segment is active
+    // it is like the Control key is being held down when it isn't.
+    //
+    // // Maximize Window Ctrl + Cmd + F = Alt+F10
+    // replace key <AC04> {
+    //     type[Group1]= "ONE_LEVEL_CTRL",
+    //     symbols[Group1]= [
+    //         f,
+    //         F,
+    //         F
+    //     ],
+    //     actions[Group1]= [
+    //         // Base
+    //         NoAction(),
+    //         // Shift
+    //         NoAction(),
+    //         // Ctrl + Shift
+    //         RedirectKey(key=<FK10>,modifiers=Mod1,clearmods=Control+Shift)
+    //     ]
+    // };
+    
+    // Close App Cmd + Q = Alt + F4
     replace key <AD01> {
         type[Group1]= "ONE_LEVEL_CTRL",
         symbols[Group1]= [
@@ -69,19 +78,7 @@ partial xkb_symbols "mac_global" {
             RedirectKey(key=<FK04>,modifiers=Mod1,clearmods=Control+Shift)
         ]
     };
-    replace key <AD02> {
-        type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [
-            w,
-            W,
-            F4
-        ],
-        actions[Group1]= [
-            NoAction(),
-            NoAction(),
-            RedirectKey(key=<FK04>,modifiers=Mod1,clearmods=Control+Shift)
-        ]
-    };
+
     // Show Desktop Cmd + F3 = Super + D
     replace key <FK03> {
         type[Group1]= "ONE_LEVEL_CTRL",
diff --git a/setup.py b/setup.py
index 2e13c94..52b2595 100755
--- a/setup.py
+++ b/setup.py
@@ -268,8 +268,8 @@ cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1][
 
 # Set chrome file accordingly for chromebooks or normal
 if default != 3:
-	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
-	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
+	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
+	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
 else:
 	# Fix multicursor in mac_gui
 	cmdline('sed -i "s/\/\/ RedirectKey(key=<UP>), \/\/ C/RedirectKey(key=<UP>), \/\/ C/g" ~/.xkb/symbols/mac_gui')