Added xfce4-terminal to xkb remap

- Fixed another global variable reference

.xkb/symbols/mac_gui

@@ -534,7 +534,7 @@ partial xkb_symbols "mac_appcycle" {
             // Control + Shift
             Redirect(key=<FK14>),
             // Control
-            Redirect(key=<FK13>,mods=Shift),
+            Redirect(key=<FK13>),
             // Super
             Redirect(key=<TAB>,mods=Control,clearmods=Mod4+Super),
             // Super + Shift

.xkb/symbols/mac_term

@@ -2,14 +2,14 @@ default partial xkb_symbols "mac_apple" {
     key <LWIN> {
       repeat= no,
       type= "ONE_LEVEL",
-      symbols[Group1]= [ Hyper_L ],
+      symbols[Group1]= [ Control_L ],
-      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
+      actions[group1]=[ SetMods(modifiers=Control+Shift) ]
     };
     key <RWIN> {
       repeat= no,
       type= "ONE_LEVEL",
-      symbols[Group1]= [ Hyper_R ],
+      symbols[Group1]= [ Control_R ],
-      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
+      actions[group1]=[ SetMods(modifiers=Control+Shift) ]
     };
 };
 partial xkb_symbols "mac_win" {
@@ -111,7 +111,7 @@ partial xkb_symbols "mac_global" {
             NoAction(),
             NoAction(),
             // Redirect(key=<FK13>) // Default cmdtab
-            // Redirect(key=<FK13>) // KDE cmdtab
+            // Redirect(key=<FK13>,clearmods=Shift) // KDE cmdtab
             // Redirect(key=<RGHT>,mods=Control+Shift,clearmods=Mod4+Super) // Elementary cmdtab
         ]
     };

defaults.json

@@ -1,6 +1,6 @@
 {"defaultapps":[{
 		"name":"term",
-		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ]
+		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","xfce4-terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ]
 	}],
 	"defaulttypes":["windows","mac","chromebook"],
 	"defaults":[{

kintox11/src/kintox11.c

@@ -98,6 +98,9 @@ int check_caret(){
     char *buffer = NULL;
     size_t size = 0;
     FILE *fp = fopen(fpname, "r");
+    if (fp == NULL){
+        return (0);
+    }
     fseek(fp, 0, SEEK_END);
     size = ftell(fp);
     rewind(fp);
@@ -106,6 +109,7 @@ int check_caret(){
     buffer[size] = '\0';
     trimwhitespace(buffer);
     caretint = atoi(buffer);
+    fclose(fp);
     if(caretint == 1){
       // printf("caret: %s\n", buffer);
       return 1;

setup.py

@@ -14,7 +14,7 @@ def cmdline(command):
         shell=True
     )
     return process.communicate()[0]
-
+distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0]
 dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0].lower()
 
 def requirements(pkgm):
@@ -26,12 +26,21 @@ def requirements(pkgm):
 		print("\n")
 
 def install_ibus():
+	global distro
 	print(bcolors.CYELLOW2 + "You need to set IBus as the default Input Method for full word-wise support and re-run this installer.\n" + bcolors.ENDC)
 	print(bcolors.CYELLOW2 + "Confirm the IBus Setup by saying Yes and then closing the window.\n" + bcolors.ENDC)
 	print("ibus-setup\n")
-	print("im-config -n ibus\n")
+	print("im-config -n ibus or im-chooser\n")
 	run_install = yn_choice(bcolors.CYELLOW2 + "Would you like to run it now? (Will require logoff and logon.)\n" + bcolors.ENDC)
 	if(run_install):
+		if distro=="fedora":
+			os.system("ibus-setup")
+			os.system("im-chooser")
+			print("\n")
+			print("IBus needs to have Input Method set to your language.")
+			print("im-chooser needs IBus to be selected & closed.")
+			input("Will need to log off and back on for it take effect...")
+		else:
 			os.system("ibus-setup")
 			os.system("im-config -n ibus")
 			print("\n")
@@ -39,7 +48,7 @@ def install_ibus():
 		sys.exit()
 
 def setShortcuts():
-	distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0]
+	global distro
 	distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip()
 	
 	print("\nIf Kinto is already running it will be stopped...")
@@ -134,7 +143,8 @@ def setShortcuts():
 			cmdline('cp ~/.config/kglobalshortcutsrc ./kde_kglobalshortcutsrc_`date +"%Y.%m.%d-%s"`')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"')
 			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+Shift+F13,Alt+Tab,Walk Through Windows"')
+			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 Alternative" "none,none,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 "Maximize Window" "none,Meta+PgUp,Maximize Window"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Alt+F10,Maximize Window"')
@@ -144,6 +154,14 @@ def setShortcuts():
 		else:
 			print('distro: ' + distro + ' de: ' + dename)
 			print("A supported OS and DE was not found, you may not have full system level shortcuts installed.")
+		if dename == "gnome":
+			# Apply dconf update to make updates survive reboots
+			cmdline('dconf dump /org/gnome/desktop/wm/keybindings/ > tempkb.conf')
+			cmdline('dconf dump /org/gnome/mutter/keybindings/ > tempmt.conf')
+			cmdline('dconf load /org/gnome/desktop/wm/keybindings/ < tempkb.conf')
+			cmdline('dconf load /org/gnome/mutter/keybindings/ < tempmt.conf')
+			cmdline('sleep 1 && rm -f ./tempkb.conf;rm -f ./tempmt.conf')
+			# cmdline('dconf update')
 
 def windows_setup():
 	keymaps = ["Apple keyboard standard", "Apple keyboard w/ Caps lock as Esc", "Windows keyboard standard", "Windows keyboard w/ Caps lock as Esc","Uninstall"]

system-config/cleanup.sh

@@ -7,3 +7,4 @@ killall xbindkeys > /dev/null 2>&1 || :
 
 gsettings set org.gnome.desktop.wm.keybindings switch-applications "['<Alt>Tab']"
 gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['<Shift><Alt>Tab']"
+pkill -f /.config/kinto/xactive.sh

system-config/kinto.desktop

@@ -2,7 +2,7 @@
 Name=Kinto
 GenericName=Kinto
 Comment=Make Linux Type Like it's a Mac
-Exec=/bin/sleep 5 /usr/bin/systemctl --user start keyswap
+Exec=/bin/bash -c "/bin/sleep 5 && /usr/bin/systemctl --user start keyswap"
 Terminal=false
 Type=Application
 X-GNOME-Autostart-enabled=true

user_config.json

@@ -16,13 +16,13 @@
 		"symbols":"",
 		"types":"",
 		"de":[],
-		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ]
+		"appnames":[ "Gnome-terminal","konsole","xfce4-terminal","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ]
 	},
 	{
         "name": "firefox",
         "run": "",
-        "run_onInput": "killall xbindkeys > /dev/null 2>&1",
+        "run_onInput": "pkill -f ~/.config/kinto/.firefox-nw",
-        "run_offInput": "killall xbindkeys > /dev/null 2>&1;xbindkeys -f $HOME/.config/kinto/.firefox-nw",
+        "run_offInput": "xbindkeys -f $HOME/.config/kinto/.firefox-nw",
         "symbols": "",
         "types": "",
         "de": [],

xkeysnail/kinto.py

@@ -0,0 +1,210 @@
+# -*- coding: utf-8 -*-
+
+import re
+from xkeysnail.transform import *
+
+# [Global modemap] Change modifier keys as in xmodmap
+define_conditional_modmap(lambda wm_class: wm_class not in ("Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty"),{
+    # # Chromebook
+    # Key.LEFT_ALT: Key.RIGHT_CTRL,   # Chromebook
+    # Key.LEFT_CTRL: Key.LEFT_ALT,    # Chromebook
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # Chromebook
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,  # Chromebook
+
+    # Default Mac/Win
+    Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
+    Key.LEFT_META: Key.LEFT_ALT,    # WinMac
+    Key.LEFT_CTRL: Key.LEFT_META,   # WinMac
+    Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac
+    Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
+    Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac
+
+    # # Mac Only
+    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
+    # Key.LEFT_CTRL: Key.LEFT_META,   # Mac
+    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac
+    # Key.RIGHT_CTRL: Key.RIGHT_META, # Mac
+})
+
+# [Conditional modmap] Change modifier keys in certain applications
+define_conditional_modmap(re.compile("Gnome-terminal|konsole|io.elementary.terminal|terminator|sakura|guake|tilda|xterm|eterm|kitty"), {
+    # # Chromebook
+    # Key.LEFT_ALT: Key.RIGHT_CTRL,
+    # # Left Ctrl Stays Left Ctrl
+    # Key.LEFT_META: Key.LEFT_ALT,
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,
+    # # Right Meta does not exist on chromebooks
+
+    # Default Mac/Win
+    Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
+    Key.LEFT_META: Key.LEFT_ALT,    # WinMac
+    Key.LEFT_CTRL: Key.LEFT_CTRL,   # WinMac
+    Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac
+    Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
+    Key.RIGHT_CTRL: Key.LEFT_CTRL,  # WinMac
+
+    # # Mac Only
+    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
+    # # Left Ctrl Stays Left Ctrl
+    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac
+    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # Mac
+})
+
+# Keybindings for Sublime Text
+define_keymap(re.compile("Sublime_text"),{
+    K("C-Super-up"): K("M-o"),                  # Switch file
+    K("C-M-f"): K("f11"),                       # toggle_full_screen
+    K("C-M-v"): [K("C-k"), K("C-v")],           # paste_from_history
+    K("C-up"): pass_through_key,                # cancel scroll_lines up
+    K("Super-M-up"): K("C-up"),                 # scroll_lines up
+    K("C-down"): pass_through_key,              # cancel scroll_lines down
+    K("Super-M-down"): K("C-down"),             # scroll_lines down
+    K("C-PAGE_DOWN"): pass_through_key,         # cancel next_view
+    K("C-PAGE_UP"): pass_through_key,           # cancel prev_view
+    K("C-Shift-left_brace"): K("C-PAGE_DOWN"),  # next_view
+    K("C-Shift-right_brace"): K("C-PAGE_UP"),   # prev_view
+    K("C-M-right"): K("C-PAGE_DOWN"),           # next_view
+    K("C-M-left"): K("C-PAGE_UP"),              # prev_view
+    K("insert"): pass_through_key,              # cancel toggle_overwrite
+    K("C-M-o"): K("insert"),                    # toggle_overwrite
+    K("M-c"): pass_through_key,                 # cancel toggle_case_sensitive
+    K("C-M-c"): K("M-c"),                       # toggle_case_sensitive
+    K("C-h"): pass_through_key,                 # cancel replace
+    K("C-M-f"): K("C-h"),                       # replace
+    K("C-Shift-h"): pass_through_key,           # cancel replace_next
+    K("C-M-e"): K("C-Shift-h"),                 # replace_next
+    K("f3"): pass_through_key,                  # cancel find_next
+    K("C-g"): K("f3"),                          # find_next
+    K("Shift-f3"): pass_through_key,            # cancel find_prev
+    K("C-Shift-g"): K("Shift-f3"),              # find_prev
+    K("C-f3"): pass_through_key,                # cancel find_under
+    K("Super-M-g"): K("C-f3"),                  # find_under
+    K("C-Shift-f3"): pass_through_key,          # cancel find_under_prev
+    K("Super-M-Shift-g"): K("C-Shift-f3"),      # find_under_prev
+    K("M-f3"): pass_through_key,                # Default - cancel find_all_under
+    # K("M-Refresh"): pass_through_key,           # Chromebook - cancel find_all_under
+    # K("M-C-g"): K("M-Refresh"),                 # Chromebook - find_all_under
+    K("Super-C-g"): K("M-f3"),                  # Default - find_all_under
+    K("C-Shift-up"): pass_through_key,          # cancel swap_line_up
+    K("Super-C-up"): K("C-Shift-up"),           # swap_line_up
+    K("C-Shift-down"): pass_through_key,        # cancel swap_line_down
+    K("Super-C-down"): K("C-Shift-down"),       # swap_line_down
+    K("C-Pause"): pass_through_key,             # cancel cancel_build
+    K("Super-c"): K("C-Pause"),                 # cancel_build
+    K("f9"): pass_through_key,                  # cancel sort_lines case_s false
+    K("f5"): K("f9"),                           # sort_lines case_s false
+    K("Super-f9"): pass_through_key,            # cancel sort_lines case_s true
+    K("Super-f5"): K("Super-f9"),               # sort_lines case_s true
+    K("M-Shift-Key_1"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_1"): K("M-Shift-Key_1"),         # set_layout
+    K("M-Shift-Key_2"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_2"): K("M-Shift-Key_2"),         # set_layout
+    K("M-Shift-Key_3"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_3"): K("M-Shift-Key_3"),         # set_layout
+    K("M-Shift-Key_4"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_4"): K("M-Shift-Key_4"),         # set_layout
+    K("M-Shift-Key_8"): pass_through_key,       # cancel set_layout
+    K("C-M-Shift-Key_2"): K("M-Shift-Key_8"),   # set_layout
+    K("M-Shift-Key_9"): pass_through_key,       # cancel set_layout
+    K("C-M-Shift-Key_3"): K("M-Shift-Key_9"),   # set_layout
+    K("M-Shift-Key_5"): pass_through_key,       # cancel set_layout
+    K("C-M-Shift-Key_5"): K("M-Shift-Key_5"),   # set_layout
+    # K(""): pass_through_key,                    # cancel
+    # K(""): K(""),                               #
+}, "Sublime Text")
+
+define_keymap(None,{
+    # Cmd Tab - App Switching Default
+    K("RC-Tab"): K("RC-F13"),
+    K("RC-Shift-Tab"): K("RC-Shift-F13"),
+    K("RC-Grave"): K("RC-Shift-F13"),
+    # In-App Tab switching
+    # K("M-Tab"): K("C-Tab"),                   # Chromebook
+    # K("M-Shift-Tab"): K("C-Shift-Tab"),       # Chromebook
+    K("Super-Tab"): K("LC-Tab"),                # Default
+    K("Super-Shift-Tab"): K("LC-Shift-Tab"),    # Default
+    K("LC-Grave") : K("LC-Shift-Tab"),          # Default
+
+    # Wordwise
+    K("RC-Left"): K("Home"),        # Beginning of Line
+    K("RC-Right"): K("End"),        # End of Line
+    K("M-Left"): K("C-Left"),       # Left of Word
+    K("M-Right"): K("C-Right"),     # Right of Word
+    K("RC-Up"): K("C-Home"),        # Beginning of File
+    K("RC-Down"): K("C-End"),       # End of File
+    K("M-Backspace"): K("Delete"),  # Delete
+    # K(""): pass_through_key,        # cancel
+    # K(""): K(""),                   #
+})
+
+# define_keymap(re.compile("Gnome-terminal|io.elementary.terminal|terminator|sakura|guake|tilda|xterm|eterm|kitty"),{
+#     # Ctrl Tab - In App Tab Switching
+#     # LC is already set
+#     K("LC-Grave") : K("LC-Shift-Tab"),
+# }, "Terminals tab switching")
+
+define_keymap(re.compile("konsole"),{
+    # Ctrl Tab - In App Tab Switching
+    K("LC-Tab") : K("Shift-Right"),
+    K("LC-Shift-Tab") : K("Shift-Left"),
+    K("LC-Grave") : K("Shift-Left"),
+
+}, "Konsole tab switching")
+
+
+
+define_keymap(re.compile("Gnome-terminal|konsole|io.elementary.terminal|terminator|sakura|guake|tilda|xterm|eterm|kitty"),{
+    # Ctrl Tab - In App Tab Switching
+    K("LC-Tab") : K("LC-PAGE_DOWN"),
+    K("LC-Shift-Tab") : K("LC-PAGE_UP"),
+    K("LC-Grave") : K("LC-PAGE_UP"),
+    # Converts Cmd to use Ctrl-Shift
+    K("RC-Tab"): K("RC-F13"),
+    K("RC-Shift-Tab"): K("RC-Shift-F13"),
+    K("RC-V"): K("C-Shift-V"),
+    K("RC-MINUS"): K("C-Shift-MINUS"),
+    K("RC-EQUAL"): K("C-Shift-EQUAL"),
+    K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"),
+    K("RC-Q"): K("C-Shift-Q"),
+    K("RC-W"): K("C-Shift-W"),
+    K("RC-E"): K("C-Shift-E"),
+    K("RC-R"): K("C-Shift-R"),
+    K("RC-T"): K("C-Shift-t"),
+    K("RC-Y"): K("C-Shift-Y"),
+    K("RC-U"): K("C-Shift-U"),
+    K("RC-I"): K("C-Shift-I"),
+    K("RC-O"): K("C-Shift-O"),
+    K("RC-P"): K("C-Shift-P"),
+    K("RC-LEFT_BRACE"): K("C-Shift-LEFT_BRACE"),
+    K("RC-RIGHT_BRACE"): K("C-Shift-RIGHT_BRACE"),
+    K("RC-A"): K("C-Shift-A"),
+    K("RC-S"): K("C-Shift-S"),
+    K("RC-D"): K("C-Shift-D"),
+    K("RC-F"): K("C-Shift-F"),
+    K("RC-G"): K("C-Shift-G"),
+    K("RC-H"): K("C-Shift-H"),
+    K("RC-J"): K("C-Shift-J"),
+    K("RC-K"): K("C-Shift-K"),
+    K("RC-L"): K("C-Shift-L"),
+    K("RC-SEMICOLON"): K("C-Shift-SEMICOLON"),
+    K("RC-APOSTROPHE"): K("C-Shift-APOSTROPHE"),
+    K("RC-GRAVE"): K("C-Shift-GRAVE"),
+    K("RC-BACKSLASH"): K("C-Shift-BACKSLASH"),
+    K("RC-Z"): K("C-Shift-Z"),
+    K("RC-X"): K("C-Shift-X"),
+    K("RC-C"): K("C-Shift-C"),
+    K("RC-V"): K("C-Shift-V"),
+    K("RC-B"): K("C-Shift-B"),
+    K("RC-N"): K("C-Shift-N"),
+    K("RC-M"): K("C-Shift-M"),
+    K("RC-COMMA"): K("C-Shift-COMMA"),
+    K("RC-DOT"): K("C-Shift-DOT"),
+    K("RC-SLASH"): K("C-Shift-SLASH"),
+    K("RC-KPASTERISK"): K("C-Shift-KPASTERISK"),
+}, "terminals")
+
+# define_keymap(re.compile("Chromium-browser"),{
+#     # K("RC-Tab"): K("C-F13"),
+#     # K("RC-Shift-Tab"): K("C-f1"),
+# }, "Chromium-browser")