From 65df97e8bf9f796c5678f1e8d677afdc5a7a17f3 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Sun, 12 Apr 2020 16:31:55 -0500
Subject: [PATCH] - Fixed Cmd+Tab App Switching for KDE

---
 .xkb/symbols/mac_gui  | 4 ++--
 .xkb/symbols/mac_term | 6 ++++--
 setup.py              | 7 +++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui
index 5019f23..9865b9a 100644
--- a/.xkb/symbols/mac_gui
+++ b/.xkb/symbols/mac_gui
@@ -527,9 +527,9 @@ partial xkb_symbols "mac_appcycle" {
             NoAction(),
             // Shift
             NoAction(),
-            // Control
-            Redirect(key=<FK14>),
             // Control + Shift
+            Redirect(key=<FK14>),
+            // Control
             Redirect(key=<FK13>),
             // Super
             Redirect(key=<TAB>,mods=Control,clearmods=Mod4+Super),
diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term
index 73e38cc..97f1391 100644
--- a/.xkb/symbols/mac_term
+++ b/.xkb/symbols/mac_term
@@ -103,14 +103,16 @@ partial xkb_symbols "mac_global" {
         symbols[Group1]= [
             Tab,
             Tab,
-            F13,
+            // F13, // Default cmdtab
+            // F14, // KDE cmdtab
             // Right // Elementary
             NoSymbol // Default
         ],
         actions[Group1]= [
             NoAction(),
             NoAction(),
-            Redirect(key=<FK13>),
+            // Redirect(key=<FK13>), // Default cmdtab
+            // Redirect(key=<FK14>), // KDE cmdtab
             // Redirect(key=<RGHT>,mods=Control+Shift,clearmods=Mod4+Super) // Elementary
             Redirect(key=<PGDN>,mods=Control,clearmods=Mod4+Super) // Default
         ]
diff --git a/setup.py b/setup.py
index 2bd94ef..4ea79f2 100755
--- a/setup.py
+++ b/setup.py
@@ -125,8 +125,11 @@ def setShortcuts():
 			# org.gnome.mutter.keybindings toggle-tiled-right ['<Super>Right']
 			# org.gnome.mutter.keybindings toggle-tiled-left ['<Super>Left']
 		elif distro == "manjaro linux" and dename == "kde":
+			# cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "krunner.desktop" --key "_launch","Alt+Space\tAlt+F2\tSearch,Alt+Space\tAlt+F2\tSearch,KRunner"')
 			# Remove Alt+F3 Operations Menu - Sublimetext Select-All
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu","none,Alt+F3,Window Operations Menu"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows","Ctrl+F13,Alt+Tab,Walk Through Windows"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)","Ctrl+Shift+F14,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Meta+PgUp,Maximize Window"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"')
@@ -342,9 +345,13 @@ else:
 if dename == "kde":
 	# Fix maximize shortcut
 	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
+	# term app switching
+	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
 else:
 	# Fix maximize shortcut
 	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
+	# term app switching
+	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
 cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
 cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')