Merge pull request #46 from rbreaves/hotfix

- Resolved possible issue with Display env variable

.gitattributes

@@ -0,0 +1,3 @@
+*.py linguist-detectable=false
+*.json liguist-detectable=false
+*.c linguist-detectable=true

.xkb/symbols/mac_gui

@@ -2,45 +2,125 @@ default partial xkb_symbols "mac_levelssym" {
     // LEFT to Begin Line or Beginning of word
     replace key <LEFT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Left,         Left, NoSymbol ],
-        actions[Group1]= [      NoAction(), RedirectKey(key=<LEFT>,modifiers=Control,clearmods=Mod1), RedirectKey(key=<HOME>,clearmods=Control)]
+        symbols[Group1]= [         Left,         Left, NoSymbol,NoSymbol,Left ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<LEFT>,modifiers=Control,clearmods=Mod1),
+            RedirectKey(key=<HOME>,clearmods=Control),
+            RedirectKey(key=<HOME>,modifiers=Shift,clearmods=Control+Mod1),
+            RedirectKey(key=<LEFT>,modifiers=Shift+Control,clearmods=Mod1)
+        ]
     };
     // Right to End of Line or end of word
     replace key <RGHT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Right,         Right, NoSymbol ],
-        actions[Group1]= [      NoAction(), RedirectKey(key=<RGHT>,modifiers=Control,clearmods=Mod1), RedirectKey(key=<END>,clearmods=Control)]
+        symbols[Group1]= [         Right,         Right, NoSymbol, NoSymbol,Right ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<RGHT>,modifiers=Control,clearmods=Mod1),
+            RedirectKey(key=<END>,clearmods=Control),
+            RedirectKey(key=<END>,modifiers=Shift,clearmods=Control+Mod1),
+            RedirectKey(key=<RGHT>,modifiers=Shift+Control,clearmods=Mod1)
+        ]
     };
     // Up to Mac Home
     replace key <UP> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Up,         Up, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<HOME>)]
+        symbols[Group1]= [
+            Up,
+            Up,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<HOME>)
+        ]
     };
     // Down to Mac End
     replace key <DOWN> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Down,         Down, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<END>)]
+        symbols[Group1]= [
+            Down,
+            Down,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<END>)
+        ]
     };
     // Alt BKSP to DELETE
     replace key <BKSP> {
        type[Group1]= "ONE_LEVEL_CTRL",
-       symbols[Group1]= [       BackSpace,       BackSpace, NoSymbol ],
-       actions[Group1]= [      NoAction(),      RedirectKey(key=<DELE>,clearmods=Mod1), NoAction()]
+       symbols[Group1]= [
+           BackSpace,
+           BackSpace,
+           NoSymbol
+       ],
+       actions[Group1]= [
+           NoAction(),
+           RedirectKey(key=<DELE>,clearmods=Mod1),
+           NoAction()
+       ]
     };
+    // // Full Print Screen
+    // // GalliumOS
+    // replace key <AE03> {
+    //     type[Group1]= "ONE_LEVEL_CTRL",
+    //     symbols[Group1]= [         3,         3, 3, F5 ],
+    //     actions[Group1]= [      NoAction(),      NoAction(), NoAction(), RedirectKey(key=<FK05>,clearmods=Shift) ]
+    // };
+    // // Region Print Screen
+    // // GalliumOS
+    // replace key <AE04> {
+    //     type[Group1]= "ONE_LEVEL_CTRL",
+    //     symbols[Group1]= [         4,         4, 4, F5 ],
+    //     actions[Group1]= [      NoAction(),      NoAction(), NoAction(), RedirectKey(key=<FK05>) ]
+    // };
+    // // Full Print Screen
+    // // Standard Ubuntu
+    // replace key <AE03> {
+    //     type[Group1]= "ONE_LEVEL_CTRL",
+    //     symbols[Group1]= [         3,         3, 3, F5 ],
+    //     actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<PRSC>,clearmods=Shift+Control) ]
+    // };
+    // // Region Print Screen
+    // // Standard Ubuntu
+    // replace key <AE04> {
+    //     type[Group1]= "ONE_LEVEL_CTRL",
+    //     symbols[Group1]= [         4,         4, 4, F5 ],
+    //     actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<PRSC>,clearmods=Control) ]
+    // };
 };
 partial xkb_symbols "mac_chrome" {
     // Back Button
     replace key <LEFT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Left, Left, Left ],
-        actions[Group1]= [      NoAction(), RedirectKey(key=<UP>), RedirectKey(key=<LEFT>,modifiers=Mod1,clearmods=Control)]
+        symbols[Group1]= [
+            Left,
+            Left,
+            Left
+        ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<UP>),
+            RedirectKey(key=<LEFT>,modifiers=Mod1,clearmods=Control)
+        ]
     };
     // Forwards Button
     replace key <RGHT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Right,         Right, Right ],
-        actions[Group1]= [      NoAction(), RedirectKey(key=<DOWN>), RedirectKey(key=<RGHT>,modifiers=Mod1,clearmods=Control)]
+        symbols[Group1]= [
+            Right,
+            Right,
+            Right
+        ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<DOWN>),
+            RedirectKey(key=<RGHT>,modifiers=Mod1,clearmods=Control)
+        ]
     };
 };

.xkb/symbols/mac_term

@@ -1,4 +1,4 @@
-default partial xkb_symbols "mac_levelssym" {
+default partial xkb_symbols "mac_apple" {
     key <LWIN> {
       repeat= no,
       type= "ONE_LEVEL",
@@ -11,28 +11,105 @@ default partial xkb_symbols "mac_levelssym" {
       symbols[Group1]= [ Hyper_R ],
       actions[group1]=[ SetMods(modifiers=Shift+Control) ]
     };
+};
+partial xkb_symbols "mac_win" {
+    key <LALT> {
+      repeat= no,
+      type= "ONE_LEVEL",
+      symbols[Group1]= [ Hyper_L ],
+      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
+    };
+    key <RALT> {
+      repeat= no,
+      type= "ONE_LEVEL",
+      symbols[Group1]= [ Hyper_R ],
+      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
+    };
+};
+partial xkb_symbols "mac_global" {
     // Page Up
     replace key <UP> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Up,         Up, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<PGUP>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+        Up,
+        Up,
+        NoSymbol ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<PGUP>,clearmods=Shift+Control)
+        ]
     };
     // Page Down
     replace key <DOWN> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Down,         Down, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<PGDN>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+            Down,
+            Down,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<PGDN>,clearmods=Shift+Control)
+        ]
     };
     // HOME
     replace key <LEFT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Up,         Up, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<HOME>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+            Left,
+            Left,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<HOME>,clearmods=Shift+Control)
+        ]
     };
     // END
     replace key <RGHT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Down,         Down, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<END>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+            Right,
+            Right,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<END>,clearmods=Shift+Control)
+        ]
+    };
+    // Full Print Screen
+    // Standard Ubuntu
+    replace key <AE03> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            3,
+            numbersign,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<PRSC>,clearmods=Shift+Control)
+        ]
+    };
+    // Region Print Screen
+    // Standard Ubuntu
+    replace key <AE04> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            4,
+            dollar,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<PRSC>,clearmods=Control)
+        ]
     };
 };

.xkb/symbols/mac_term_chromebook

@@ -14,25 +14,87 @@ default partial xkb_symbols "mac_levelssym" {
     // Page Up
     replace key <UP> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Up,         Up, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<PGUP>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+            Up,
+            Up,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<PGUP>,clearmods=Shift+Control)
+        ]
     };
     // Page Down
     replace key <DOWN> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Down,         Down, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<PGDN>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+            Down,
+            Down,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<PGDN>,clearmods=Shift+Control)
+        ]
     };
     // HOME
     replace key <LEFT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Up,         Up, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<HOME>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+            Left,
+            Left,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<HOME>,clearmods=Shift+Control)
+        ]
     };
     // END
     replace key <RGHT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Down,         Down, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<END>,clearmods=Shift+Control)]
+        symbols[Group1]= [
+            Right,
+            Right,
+            NoSymbol
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<END>,clearmods=Shift+Control)
+        ]
+    };
+    // Full Print Screen
+    // GalliumOS
+    replace key <AE03> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            3,
+            numbersign,
+            F5
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<FK05>,clearmods=Shift)
+        ]
+    };
+    // Region Print Screen
+    // GalliumOS
+    replace key <AE04> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            4,
+            dollar,
+            F5
+        ],
+        actions[Group1]= [
+            NoAction(),
+            NoAction(),
+            RedirectKey(key=<FK05>)
+        ]
     };
 };

.xkb/types/mac_gui

@@ -1,11 +1,15 @@
 default partial xkb_types "addmac_levels" {
     type "ONE_LEVEL_CTRL" {
-        modifiers= Mod1+Control;
+        modifiers= Mod1+Control+Shift;
         map[Mod1]= Level2;
         map[Control]= Level3;
         map[Mod1+Control]= Level3;
+        map[Shift+Control]= Level4;
+        map[Shift+Mod1] = Level5;
         level_name[Level1]= "Base";
         level_name[Level2]= "Alt";
-        level_name[Level3]= "With Control";
+        level_name[Level3]= "Control";
+        level_name[Level4]= "Shift with Control";
+        level_name[Level5] = "Shift Alt";
     };
 };

.xkb/types/mac_term

@@ -2,7 +2,6 @@ default partial xkb_types "addmac_levels" {
     type "ONE_LEVEL_CTRL" {
         modifiers= Shift+Control;
         map[Shift]= Level2;
-        // map[Control]= Level3;
         map[Shift+Control]= Level3;
         level_name[Level1]= "Base";
         level_name[Level2]= "Alt";

README.md

@@ -8,14 +8,7 @@
 
 \- Type in Linux like it's a Mac. \-
 
-Cmd = Ctrl+Shift for all terminals.
-
-Note: As of version 1.0 Kinto no longer maps Cmd/Alt to Super while using the Terminal, it is now mapping to Ctrl+Shift by default. Please reset your terminal's keymaps back to their defaults.
-
-Gnome-terminal reset
-```
-dconf reset -f /org/gnome/terminal/legacy/keybindings/
-```
+Seamless copy and paste with all apps and terminals. Also the only linux remapper that is aware of your cursor/caret status - meaning it avoids shortcut conflicts within an app versus wordwise shortcuts when a text field is in use.
 
 ## What does this do exactly?
 
@@ -33,13 +26,13 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following
 - systemd
 - x11
 - IBus*
-- Debian/Ubuntu based distro 16.04+
+- Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+
 
 If you need kintox11 recompiled for your distro please let me know and I will add a binary for your distro if my binary fails.
 
 You can also attempt to compile kintox11.c on your system as well, but you will need to compile and install json-c first as its libraries will be required to compile and run the program.
 
-*IBUS is needed to support wordwise during browser app usage as the keymap will need to change slightly depending if the cursor/caret is on screen waiting for input. Setup.py will set it but you can manually set it as well or check your current Input Method.
+*IBus is needed to support wordwise during browser app usage as the keymap will need to change slightly depending if the cursor/caret is on screen waiting for input. Setup.py will set it but you can manually set it as well or check your current Input Method.
 
 To confirm navigate to your "Language Support" and set "Keyboard input method system:" to IBus for full word-wise support with web browsers.
 
@@ -64,6 +57,180 @@ sudo apt install python3
 ./setup.py
 ```
 
+## How to Add or Change keymaps for Applications
+
+**First it is important to understand how Kinto operates.**
+
+1. It listens for any focus/active window changes
+2. It applies the proper keymap based on the programs name.
+3. It may monitor your caret/cursor input status, if the app is known to cause shortcut conflicts with wordwise
+4. It runs anywhere from 1 to 3 commands to fully remap your computer.
+
+Ok great, we've covered the basics, now what are your options on modifying functionality?
+It depends.
+
+Do you want to remap keys using xkb or xbindkeys with xdotool, or something else entirely?
+The choice is yours, but I'd recommend xbindkeys with xdotool for anyone that doesn't want to spend the time or learn xkb. I prefer xkb but it completely remaps your keyboard and it could break things if done poorly.
+
+**How to Remap using XBindKeys with Xdotool - Firefox**
+
+1. By default Firefox is mapped with the standard gui based xkb config, and only if no input has focus does it then run xbindkeys to map the Cmd+Left/Right arrow key location to the Back and Forwards functionality you'd expect.
+
+2. The xbindkeys script takes into account the xkb mapping being the base because it is actually remapping Home and End to Back and Forwards as there is no real reason to reload an entire xkb layout.
+
+~/.config/kinto/user_config.json
+```
+...
+{
+    "name": "firefox",
+    "run": "setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
+    "run_onInput": "killall xbindkeys > /dev/null 2>&1",
+    "run_offInput": "killall xbindkeys > /dev/null 2>&1;xbindkeys -f $HOME/.config/kinto/.firefox-nw",
+    "symbols": "",
+    "types": "",
+    "de": [
+	2
+    ],
+    "appnames": [
+	"Firefox"
+    ]
+},
+...
+```
+~/.config/kinto/.firefox-nw
+```
+"xdotool key --delay 0 --clearmodifiers Control_L+bracketleft"
+  // Alt/Cmd + Left
+  Home + Release
+
+"xdotool key --delay 0 --clearmodifiers Control_L+bracketright"
+  // Alt/Cmd + Right
+  End + Release
+  
+# Note additional keymaps can easily be added to this file and I will accept any PR's with keymaps that align with macs
+```
+
+Once you have made your changes you can restart the Kinto service and the changes will take affect.
+```
+systemctl --user restart keyswap
+```
+
+Under normal circumstances this keymap would not have worked well had Firefox not included 2 keymap options for going forwards or back. In the next example, Chrome, you will see how to solve this very same problem but in xkb format and it is the only way to fix it for Chrome due to conflicting with wordwise shortcuts.
+
+Also the choice of xdotool over something like xte (xautomation) was explicit, xdotool allows you to hold down a modifier and continue to repeat the action(s) and xte does not.
+
+**How to Remap Using XKB - Chrome**
+
+This gets to be a little more complicated, but this is what you have to do to accomplish the same on the xkb level.
+
+**Summary**
+1. Copy ~/.xkb/keymap/kbd.mac.gui and append the name of the app. (e.g. chrome)
+2. Edit ~/.xkb/keymap/kbd.mac.gui.chrome
+3. Add new keybindings to ~/.xkb/symbols/mac_gui
+4. Only edit types if you absolutely need to add another modifier level (~/.xkb/types/mac_gui)
+
+Understand that as you add or modify the ~/.xkb/symbols/ files that these two groups **symbols[Group1]** and **actions[Group1]** will be following the order of the modifier levels that are configured in the related ~/.xkb/types/mac_gui or mac_term file.
+
+Also you will have to discover the proper xkb names for keys and that they will often follow *two different* labels/names. eg RGHT vs Right ... **replace key \<RGHT\>** vs **symbols[Group1]= [ Right, ...**.
+
+A good place to get the proper names/labels are these two files.
+```
+/usr/share/X11/xkb/symbols/us
+/usr/share/X11/xkb/symbols/inet
+```
+
+Ok, so here are the detailed instructions.
+
+1. cp ~/.xkb/keymap/kbd.mac.gui ~/.xkb/keymap/kbd.mac.gui.chrome
+
+2. nano ~/.xkb/keymap/kbd.mac.gui.chrome
+```
+# Change mac_gui(mac_levelssym)
+...
+xkb_symbols   { include "pc+us+us:2+inet(evdev)+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)"	};
+...
+# To +mac_gui(mac_chrome)
+xkb_symbols   { include "pc+us+us:2+inet(evdev)+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_chrome)"	};
+...
+};
+```
+
+3. Add your new "partial xkb_symbols" via nano ~/.xkb/symbols/mac_gui
+```
+partial xkb_symbols "mac_chrome" {
+    // Back Button
+    replace key <LEFT> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            Left,
+            Left,
+            Left
+        ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<UP>),
+            RedirectKey(key=<LEFT>,modifiers=Mod1,clearmods=Control)
+        ]
+    };
+    // Forwards Button
+    replace key <RGHT> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            Right,
+            Right,
+            Right
+        ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<DOWN>),
+            RedirectKey(key=<RGHT>,modifiers=Mod1,clearmods=Control)
+        ]
+    };
+```
+
+~/.config/kinto/user_config.json
+```
+{
+    "name": "chrome",
+    "run": "setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui.chrome $DISPLAY",
+    "run_onInput": "xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
+    "run_offInput": "xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui.chrome $DISPLAY",
+    "symbols": "",
+    "types": "",
+    "de": [
+	2
+    ],
+    "appnames": [
+	"Chromium",
+	"Chromium-browser",
+	"Google-chrome"
+    ]
+}
+```
+4. Not making changes to types but it looks like this. It contains 5 levels of modifiers, Base, Alt, Control, Shift+Control, and Shift+Alt. Additional Levels can and may be added later, but please do not change the order of the Levels or existing symbols files will break!! You can add new levels however without issue.
+```
+default partial xkb_types "addmac_levels" {
+    type "ONE_LEVEL_CTRL" {
+        modifiers= Mod1+Control+Shift;
+        map[Mod1]= Level2;
+        map[Control]= Level3;
+        map[Mod1+Control]= Level3;
+        map[Shift+Control]= Level4;
+        map[Shift+Mod1] = Level5;
+        level_name[Level1]= "Base";
+        level_name[Level2]= "Alt";
+        level_name[Level3]= "Control";
+        level_name[Level4]= "Shift with Control";
+        level_name[Level5] = "Shift Alt";
+    };
+};
+```
+
+Once you have made your changes you can restart the Kinto service and the changes will take affect.
+```
+systemctl --user restart keyswap
+```
+
 ## JSON config files
 
 Features
@@ -75,20 +242,51 @@ Located at ~/.config/kinto/ you will find user_config.json which will look like
 You can also add additional Desktop Environment related tweaks to user_config.json in the install directory as well and the installer will prompt you to install them. You may also fork and submit any json or additional .xkb configurations to me for approval if you believe it makes Linux more like typing on a Mac.
 
 ```
-{"config":[{
+{"config":[
+	//
+	// Each config category contains the category name, and references to the de tweaks
+	// And contains the default run commands plus what behavior they should exhibit for
+	// input fields on/off focus, if any.
+	// Symbols and types are not currently used - may later replace the need for static
+	// files with xkbcomp.
+	//
+	// If you use xbindkeys outside of Kinto then you may want to remove xbindkeys from
+	// this config after setup or rewrite the command to exclude your own xbindkeys.
+	//
+	{
 		"name":"gui",
 		"run":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"de":[2],
+		"appnames":[ "" ],
+		"run_onInput":"",
+		"run_offInput": "killall xbindkeys > /dev/null 2>&1",
+		"symbols":"",
+		"types":"",
+		"de":[],
 		"appnames":[ "" ]
 	},
 	{
 		"name":"term",
 		"run":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
 		"de":[2],
-		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ]
+		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ],
+		"run_onInput":"",
+		"run_offInput": "killall xbindkeys > /dev/null 2>&1",
+		"symbols":"",
+		"types":"",
+		"de":[],
+		"appnames":[ "" ]
 	}],
+	// Init - Array that references de objects by their ID and runs the "run" command
+	// when the app initially runs.
 	"init": [1],
+	// detypes - DE's with support or planned support
 	"detypes":["gnome2","gnome3","kde4","kde5","xfce","i3wm"],
+	// de - tweak objects and initial command to be ran on start.
+	//
+	//    Intent - init or gui_term, to signify what type of tweak it is.
+	//      run, run_term, run_gui - run is only relevant for init, and the
+	//      other two relate to gui_term and running under those modes.
 	"de":[{
 		"id": 1,
 		"type": ["gnome3"],
@@ -134,9 +332,9 @@ Status
 systemctl --user status keyswap
 ```
 
-Stop (and reset keyboard to normal)
+Stop (your keymap will return to normal)
 ```
-systemctl --user stop keyswap && setxkbmap -option
+systemctl --user stop keyswap
 ```
 
 Start
@@ -252,7 +450,7 @@ I would just like to thank a few people here directly that have helped me tremen
 
 First off I'd like to thank the Stackoverflow and Stackexchange community. I have probably rubbed some mods the wrong way over there, but the people from the community in general are extremely helpful and gracious and without their contributions would have made this much more difficult. The person I'd like to thank most though from over there is Glen Whitney. Without his detailed explaining of how to rebind keys in xkb this would not have come together at all, as every other remapping solution were non-starters as complexity increases.
 
-Secondarily I'd like to thank Christian Eriksson*, as he provided information that kept me up at night.. literally. Even after I implemented a similar bash script to one he had suggested I knew that fully implementing a c/c++ solution was where Kinto needed to head to and his explaination was better than I remember it being now that I have gone back to read it again. He also never provided a full implementation of a c/c++ solution - he did hit on the pain points pretty well of what one would need to do and watch out for. I am not sure where I got the first example code of implementing a based solution, but he definitely went over it well.
+Secondarily I'd like to thank Christian Eriksson*, as he provided information that kept me up at night.. literally. Even after I implemented a similar bash script to one he had suggested I knew that fully implementing a c/c++ solution was where Kinto needed to head to and his explaination was better than I remember it being now that I have gone back to read it again. He also never provided a full implementation of a c/c++ solution - he did hit on the pain points pretty well of what one would need to do and watch out for. I am not sure where I got the first example code of implementing a c based solution, but he definitely went over it well.
 
 
 Kui and his gist file** was really the c based solution that I found had the fewest issues to resolve to making it a reliable solution. It didn't account for all failures very well, aka BadWindow issues, but it made for a great foundation on which Kintox11 is built. I cannot thank him enough for putting it out there for others to work with.

defaults.json

@@ -12,34 +12,34 @@
 		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
 		"xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)",
-		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_levelssym)",
+		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_win)+mac_term(mac_global)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
 		"xkb_types_term":"+mac_term(addmac_levels)"
 	},
 	{
 		"id": 2,
-		"name":"Mac - hid driver",
+		"name":"Mac - hid driver (Recommended - Also supports Windows keyboards)",
 		"type":"mac",
 		"active": false,
 		"description":"Standard Mac Keyboards with Apple driver",
 		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
 		"xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)",
-		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_levelssym)",
+		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_win)+mac_term(mac_global)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
 		"xkb_types_term":"+mac_term(addmac_levels)",
 		"hack": "echo '1' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd;echo 'options hid_apple swap_opt_cmd=1' | sudo tee -a /etc/modprobe.d/hid_apple.conf;sudo update-initramfs -u -k all"
 	},
 	{
 		"id": 3,
-		"name":"Mac Only",
+		"name":"Mac Only (VMs & non-official Apple keyboards)",
 		"type":"mac",
 		"active": true,
 		"description":"Standard Mac Keyboards",
 		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
 		"xkb_symbols_gui":"+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)",
-		"xkb_symbols_term":"+altwin(alt_super_win)+mac_term(mac_levelssym)",
+		"xkb_symbols_term":"+altwin(alt_super_win)+mac_term(mac_apple)+mac_term(mac_global)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
 		"xkb_types_term":"+mac_term(addmac_levels)"
 	},

keyswap_service.sh

@@ -4,8 +4,6 @@ systemctl --user stop keyswap >/dev/null 2>&1
 systemctl --user disable keyswap >/dev/null 2>&1
 systemctl --user stop keyswap.timer >/dev/null 2>&1
 systemctl --user disable keyswap.timer >/dev/null 2>&1
-swapcmd="\/bin\/bash -c \"\/home\/`whoami`\/.config\/kinto\/xactive.sh carrots\""
-swapstopcmd="\/bin\/bash \/home\/`whoami`\/.config\/kinto\/cleanup.sh"
 mkdir -p ~/.config/systemd/user
 mkdir -p ~/.config/autostart
 cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
@@ -16,6 +14,11 @@ cp ./system-config/caret_status.sh ~/.config/kinto/caret_status.sh
 cp ./system-config/cleanup.sh ~/.config/kinto/cleanup.sh
 cp ./system-config/.firefox-nw ~/.config/kinto/.firefox-nw
 sed -i "s/{username}/`whoami`/g" ~/.config/systemd/user/keyswap.service
+sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/systemd/user/keyswap.service
+if [ "${#DISPLAY}" -gt 2 ]
+	then
+	sed -i "s/#Environment/Environment/g" ~/.config/systemd/user/keyswap.service
+fi
 systemctl --user daemon-reload
 systemctl --user enable keyswap
 systemctl --user start keyswap

setup.py

@@ -15,12 +15,12 @@ def cmdline(command):
     )
     return process.communicate()[0]
 
-def requirements():
+def requirements(pkgm):
 	print(bcolors.CYELLOW + "You need to install some packages, " +run_pkg+ ", for Kinto to fully remap browsers during input focus.\n" + bcolors.ENDC)
-	print("sudo apt-get install -y " + run_pkg + "\n")
+	print("sudo " + pkgm + " " + run_pkg + "\n")
 	run_install = yn_choice(bcolors.CYELLOW + "Would you like to run it now? (Will require sudo privileges.)\n" + bcolors.ENDC)
 	if(run_install):
-		os.system("sudo apt-get install -y " + run_pkg)
+		os.system("sudo " + pkgm  + run_pkg)
 		print("\n")
 
 def install_ibus():
@@ -33,8 +33,35 @@ def install_ibus():
 		input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...")
 		sys.exit()
 
-check_xbind = symbols_gui_line = cmdline("which xbindkeys").strip()
-check_xdotool = symbols_gui_line = cmdline("which xdotool").strip()
+# check_x11 = cmdline("env | grep -i x11").strip()
+check_x11 = cmdline("loginctl show-session \"$XDG_SESSION_ID\" -p Type | awk -F= '{print $2}'").strip()
+
+if len(check_x11) == 0:
+	print("You are not using x11, please logout and back in using x11/Xorg")
+	sys.exit()
+
+check_xbind = cmdline("which xbindkeys 2>/dev/null").strip()
+check_xdotool = cmdline("which xdotool 2>/dev/null").strip()
+
+pkgm = cmdline("which apt 2>/dev/null").strip()
+
+if len(pkgm) == 0:
+	pkgm = cmdline("which dnf 2>/dev/null").strip()
+	if len(pkgm) > 0:
+		pkgm += " install -y "
+else:
+	pkgm += " install -y "
+
+if len(pkgm) == 0:
+	pkgm = cmdline("which pacman 2>/dev/null").strip()
+	if len(pkgm) > 0:
+		pkgm += " -S "
+
+
+if len(pkgm) == 0:
+	print("No supported package manager found. Exiting...")
+	sys.exit()
+
 
 runpkg = 0
 run_pkg = ""
@@ -49,7 +76,7 @@ if len(check_xdotool) == 0:
 	runpkg = 1
 
 if runpkg != 0:
-	requirements()
+	requirements(pkgm)
 
 if os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "":
 	install_ibus()

system-config/keyswap.service

@@ -5,6 +5,8 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 Restart=always
+# eg DISPLAY=:0.0
+#Environment=DISPLAY={displayid}
 RestartSec=1
 WorkingDirectory=/home/{username}/.config/kinto
 ExecStart=/bin/bash -c "/home/{username}/.config/kinto/xactive.sh carrots"