Merge pull request #97 from rbreaves/hotfix

- Added uninstall option for Windows

.gitattributes

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: rbreaves
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Install Type:** Bare Metal or VM
+**Distro:** Name + Version
+**DE:** Gnome, XFCE, KDE
+**Branch:** master, dev
+**Commit:** git rev-parse --short HEAD
+
+**Kinto Input Caret Status**
+```
+cat /tmp/kinto/caret
+```
+
+**Kinto Standard Log**
+```
+journalctl --user-unit=keyswap.service -b
+```
+**Kinto Debug Log (1.0.6-2+)**
+```
+systemctl --user stop keyswap
+cd ~/.config/kinto
+./kintox11 --debug
+```
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: rbreaves
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/gratitude.md

@@ -0,0 +1,10 @@
+---
+name: Gratitude
+about: Just wants to give a shout out!
+title: ''
+labels: gratitude
+assignees: rbreaves
+
+---
+
+

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,10 @@
+---
+name: Question
+about: Question about Kinto functionality
+title: ''
+labels: question
+assignees: rbreaves
+
+---
+
+

.xkb/symbols/mac_gui

@@ -1,46 +1,140 @@
+hidden partial modifier_keys
+xkb_symbols "swapescape" {
+    key <CAPS> { [ Escape ] };
+    key <ESC>  { [ Caps_Lock ] };
+};
+hidden partial modifier_keys
+xkb_symbols "caps_shiftlock" {
+    replace key <CAPS> { [ Shift_Lock ] };
+    modifier_map Shift { Shift_Lock };
+};
+hidden partial modifier_keys
+xkb_symbols "caps_none" {
+    key <CAPS> { [ VoidSymbol ] };
+};
 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

@@ -1,29 +1,22 @@
 # Kinto
 
+![kinto_carrot](https://user-images.githubusercontent.com/10969616/77842401-4744b500-7157-11ea-854a-d7dec6f9a250.gif)
+
 ![alt text](https://raw.githubusercontent.com/rbreaves/kinto/master/Kinto.png)
 
 [![GitHub release](https://img.shields.io/github/release/rbreaves/kinto.svg)](https://github.com/rbreaves/kinto/releases/latest)
 
-![alt text](https://github.com/rbreaves/kinto/blob/master/splash.png)
-
 \- 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?
 
 Kinto works for standard Windows, Apple and Chromebook keyboards. The following however describes the dynamic rebinding based on a standard Windows keyboard. (Alt location is Cmd for Apple keyboards)
 
-- Normal apps - Alt will be Ctrl, Win/Super will be Alt, Ctrl will be Win/Super
+- Normal apps - Alt → Ctrl, Win/Super → Alt, Ctrl → Win/Super
 
-- Terminal apps - Alt will be Ctrl+Shift, Win/Super will be Alt, Ctrl will be Ctrl
+- Terminal apps - Alt → Ctrl+Shift, Win/Super → Alt, Ctrl → Ctrl
 
 - Cursor/word-wise shortcut keys have been added to align with macOS keyboard shortcuts.
 
@@ -33,15 +26,19 @@ 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.
+- Windows 10 & WSL is now supported
+- Powershell - run as Administrator (for install)
+- Chocolatey (for install)
+- Python (for install)
+- Autohotkey
 
-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.
+Binary is included and will be installed, but you can also compile kintox11.c on your system. 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.
+On most distros you can confirm navigate to your "Language Support" and set "Keyboard input method system:" to IBus for full word-wise support with web browsers. 
 
 Wayland support is planned, but not ready yet.
 
@@ -64,6 +61,276 @@ sudo apt install python3
 ./setup.py
 ```
 
+To Uninstall Kinto
+
+```
+./uninstall.sh
+```
+
+## Other Notes Related to Install
+
+**Manjaro with Gnome there are issues.** 
+
+Please see this ticket for more information.
+
+https://github.com/rbreaves/kinto/issues/59
+
+https://wiki.archlinux.org/index.php/IBus
+
+**For other Arch based distros.**
+
+Append the following and logoff and back on, but only after running setup.py to install all packages and the kinto service. Please report if there are any difficulties.
+nano ~/.bashrc
+```
+export GTK_IM_MODULE=xim
+export XMODIFIERS=@im=ibus
+export QT_IM_MODULE=xim
+```
+
+## How to Upgrade Kinto
+
+Simply bring down the latest in either the master branch or dev, but dev is sometimes in flux as new features are being developed. Then you can re-run the setup.py installer, it will stop the service and re-install Kinto.
+
+Note: If you have made any custom changes to ~/.xkb or ~/.config/kinto then you will need to backup or rename those directories before running an update.
+
+```
+git pull origin master
+./setup.py
+```
+
+## How to Control Kinto
+
+Under systemd this is how you control Kinto.
+
+Status
+```
+systemctl --user status keyswap
+```
+
+Stop (your keymap will return to normal)
+```
+systemctl --user stop keyswap
+```
+
+Start
+```
+systemctl --user start keyswap
+```
+
+Restart
+```
+systemctl --user restart keyswap
+```
+
+Enable
+```
+systemctl --user enable keyswap
+```
+
+Disable
+```
+systemctl --user disable keyswap
+```
+
+## How to Add Setxkbmap Option inside Kinto
+
+To summarize you'll need to pull the partial out of the symbols file the option resides in and then add that to the mac_gui file and lastly reference it in the keymap file(s) you want it in.
+
+symbols directory
+```
+/usr/share/X11/xkb/symbols/ 
+```
+
+symbols file
+```
+~/.xkb/symbols/mac_gui
+```
+
+keymap files
+```
+~/.xkb/keymap/kbd.mac.gui
+~/.xkb/keymap/kbd.mac.term
+```
+
+A more detailed explaination is here.
+https://github.com/rbreaves/kinto/issues/50#issuecomment-595953373
+
+## How to Add or Change keymaps for Applications
+
+Note: All of the following is already done in Kinto (but may also change as improvements are made). The following is purely for documentation and example sake as they are real examples of how to leverage the json config to support additional keymaps.
+
+**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 +342,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","kitty" ],
+		"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"],
@@ -125,40 +423,6 @@ You can also add additional Desktop Environment related tweaks to user_config.js
 }
 ```
 
-## How to Control Kinto
-
-Under systemd this is how you control Kinto.
-
-Status
-```
-systemctl --user status keyswap
-```
-
-Stop (and reset keyboard to normal)
-```
-systemctl --user stop keyswap && setxkbmap -option
-```
-
-Start
-```
-systemctl --user start keyswap
-```
-
-Restart
-```
-systemctl --user restart keyswap
-```
-
-Enable
-```
-systemctl --user enable keyswap
-```
-
-Disable
-```
-systemctl --user disable keyswap
-```
-
 ## Learning macOS style hotkeys on Linux
 
 You can use websites like https://www.shortcutfoo.com in Google Chrome while using the terminal style keymap, but Firefox is not compatible due to detecting "cmd" as keycode 224. Chrome detects Win/Super/Cmd as keycode 91 on all OS's.
@@ -223,6 +487,16 @@ cd ~/.config/kinto
 ./kintox11
 ```
 
+## Debug
+
+If all else fails you can now run Kinto in debug mode as of 1.0.6-2. The output will become more verbose and I'd recommend running this directly after stopping the service.
+
+```
+systemctl --user stop keyswap
+cd ~/.config/kinto
+./kintox11 --debug
+```
+
 ## Language Support
 I'd appreciate any help from people with non-US based keyboards, to help ensure that these keymaps and keyswap methods work in all or most languages.
 
@@ -252,7 +526,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

@@ -1,6 +1,6 @@
 {"defaultapps":[{
 		"name":"term",
-		"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","kitty" ]
 	}],
 	"defaulttypes":["windows","mac","chromebook"],
 	"defaults":[{
@@ -9,37 +9,37 @@
 		"type":"windows",
 		"active": false,
 		"description":"Standard Windows 104 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",
+		"gui":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"term":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
 		"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",
+		"gui":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"term":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
 		"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",
+		"gui":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"term":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
 		"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)"
 	},
@@ -49,8 +49,8 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Standard Chromebook 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",
+		"gui":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"term":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
 		"xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
@@ -62,9 +62,9 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Chromebook with Windows 104 Keyboard",
-		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY; setxkbmap -device $usbid -option altwin:ctrl_alt_win",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
-		"fallbackgui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
+		"gui":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen; setxkbmap -device $usbid -option altwin:ctrl_alt_win",
+		"term":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"fallbackgui":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen",
 		"xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
@@ -76,8 +76,8 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Chromebook with Mac Keyboard",
-		"gui":"setxkbmap -option;setxkbmap -option ctrl:swap_lwin_lctl; xkbcomp -w0 -i $internalid -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
+		"gui":"setxkbmap -option ctrl:swap_lwin_lctl; xkbcomp -w0 -i $internalid -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"term":"xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
 		"xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",

keyswap_service.sh

@@ -4,18 +4,23 @@ 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
 cp ./system-config/kinto.desktop ~/.config/autostart/kinto.desktop
+cp ./system-config/keyswap.timer ~/.config/systemd/user/keyswap.timer
 cp ./kintox11/binary/kintox11 ~/.config/kinto/kintox11
 cp ./system-config/xactive.sh ~/.config/kinto/xactive.sh
 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
+sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
+systemctl --user enable keyswap.timer
+systemctl --user start keyswap.timer

kintox11/src/kintox11.c

@@ -13,8 +13,10 @@
 // gcc -L/usr/local/lib/ kintox11.c -ljson-c -lXmu -lXt -lX11 -O2 -o kintox11
 //
 
+#define _GNU_SOURCE 1
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <locale.h>
 #include <string.h>
 #include <ctype.h>
@@ -26,6 +28,13 @@
 #include <math.h>
 #include <sys/time.h>
 
+char * append(char * string1, char * string2)
+{
+  char * result = NULL;
+  asprintf(&result, "%s,%s", string1, string2);
+  return result;
+}
+
 long long timeInMilliseconds(void) {
     struct timeval tv;
 
@@ -53,7 +62,7 @@ int XNextEventTimeout(Display *d, XEvent *e, double seconds, long long event_ts,
         long long int new_ts = timeInMilliseconds();
 
         // Make sure window dragging or resizing is not occuring
-        if(!(e->type == 22 && (e->type == last_event) && timeInMilliseconds()-event_ts < 419)){
+        if(!(e->type == ConfigureNotify && (e->type == last_event) && timeInMilliseconds()-event_ts < 419)){
           *event_ts_ptr = new_ts;
           *last_event_ptr = e->type;
           break;
@@ -175,15 +184,26 @@ int handle_error(Display* display, XErrorEvent* error){
   return 1;
 }
 
-Window get_focus_window(Display* d){
+Window get_focus_window(Display* d, int etype, char const *eventName, char const *current_app, bool debug){
   Window w;
   int revert_to;
-  XGetInputFocus(d, &w, &revert_to); // see man
+
+  if(debug == true){
+    printf("\n  get focus window\n");
+  }
+
+  if(!(etype == DestroyNotify || etype == UnmapNotify)) {
+    XGetInputFocus(d, &w, &revert_to); // see man
+    if(debug == true){
+      printf("  -%s: event: %d, window_id: %ld\n",current_app,etype,w);
+    }
+  }
+
   if(xerror){
-    printf("Error getting focused window\n");
+    printf("*Error getting focused window, e.type: %d, current_app: %s\n",etype,current_app);
     exit(1);
   }else if(w == None){
-    printf("no focus window\n");
+    printf("*no focus window, e.type: %d, current_app: %s\n",etype,current_app);
     exit(1);
   }
 
@@ -194,40 +214,68 @@ Window get_focus_window(Display* d){
 // a top window have the following specifications.
 //  * the start window is contained the descendent windows.
 //  * the parent window is the root window.
-Window get_top_window(Display* d, Window start){
+Window get_top_window(Display* d, Window start, int etype, char const *eventName, char const *current_app, bool debug){
   Window w = start;
   Window parent = start;
   Window root = None;
   Window *children;
   unsigned int nchildren;
   Status s;
+  char * ws;
+  char * wstr;
+  ws = malloc(sizeof(char)*4096);
+  wstr = malloc(sizeof(char)*100);
+  // strcpy(wstr,"test,");
 
-  while (parent != root && parent != 0) {
+  if(debug == true){
+    printf("\n  get top window\n");
+  }
+  // Checking for Destroy and Unmap Notify events here too
+  // Sometimes they still get passed through and if so need
+  // to be ignored or XQueryTree will cause a segmentation fault
+  while (parent != root && parent != 0 && !(etype == DestroyNotify || etype == UnmapNotify)) {
     w = parent;
+
     s = XQueryTree(d, w, &root, &parent, &children, &nchildren); // see man
+    
+    sprintf(wstr, "%ld", w);
+    if ((ws != NULL) && (ws[0] == '\0')) {
+      strcpy(ws,wstr);
+    }
+    else{
+      ws = append(ws, wstr);
+    }
 
     if (s)
       XFree(children);
 
     if(xerror){
-      printf("fail to get top window: %ld\n",w);
-      exit(1);
+      printf("*fail to get top window: %ld, e.type: %d, current_app: %s\n",w,etype,current_app);
+      break;
     }
-
-    // printf("  get parent (window: %d)\n", (int)w);
   }
 
-  // printf("success (window: %d)\n", (int)w);
+  if(debug == true){
+    printf("  -%s: event: %d, window_id: %s\n",current_app,etype,ws);
+  }
 
   return w;
 }
 
 // search a named window (that has a WM_STATE prop)
 // on the descendent windows of the argment Window.
-Window get_named_window(Display* d, Window start){
+Window get_named_window(Display* d, Window start, int etype, char const *eventName, char const *current_app, bool debug){
   Window w;
+
+  if(debug == true){
+    printf("\n  get named window\n");
+  }
   // printf("getting named window ... ");
   w = XmuClientWindow(d, start); // see man
+
+  if(debug == true){
+    printf("  -%s: event: %d, window_id: %ld\n\n",current_app,etype,w);
+  }
   // if(w == start)
   //   printf("fail\n");
   // printf("success (window: %d)\n", (int) w);
@@ -258,7 +306,53 @@ const char * str_window_class(Display* d, Window w, char *prior_app ){
   }
 }
 
-int main(void){
+int main(int argc, char *argv[]){
+
+  bool debug;
+
+  if(argc < 2){
+    debug = false;
+  }
+  if(argc > 1 && (strcmp(argv[1], "-d") == 0 || strcmp(argv[1], "--debug") == 0 )){
+    debug = true; 
+    printf("Running in debug mode\n");  
+  }
+
+  const char *eventNames[34];
+  eventNames[0] = "None";
+  eventNames[1] = "KeyPress";
+  eventNames[2] = "KeyRelease";
+  eventNames[3] = "ButtonPress";
+  eventNames[4] = "ButtonRelease";
+  eventNames[5] = "MotionNotify";
+  eventNames[6] = "EnterNotify";
+  eventNames[7] = "LeaveNotify";
+  eventNames[8] = "FocusIn";
+  eventNames[9] = "FocusOut";
+  eventNames[10] = "KeymapNotify";
+  eventNames[11] = "Expose";
+  eventNames[12] = "GraphicsExpose";
+  eventNames[13] = "NoExpose";
+  eventNames[14] = "VisibilityNotify";
+  eventNames[15] = "CreateNotify";
+  eventNames[16] = "DestroyNotify";
+  eventNames[17] = "UnmapNotify";
+  eventNames[18] = "MapNotify";
+  eventNames[19] = "MapRequest";
+  eventNames[20] = "ReparentNotify";
+  eventNames[21] = "ConfigureNotify";
+  eventNames[22] = "ConfigureRequest";
+  eventNames[23] = "ResizeRequest";
+  eventNames[25] = "CirculateNotify";
+  eventNames[26] = "CirculateRequest";
+  eventNames[27] = "PropertyNotify";
+  eventNames[28] = "SelectionClear";
+  eventNames[29] = "SelectionRequest";
+  eventNames[30] = "SelectionNotify";
+  eventNames[31] = "ColormapNotify";
+  eventNames[32] = "ClientMessage";
+  eventNames[33] = "MappingNotify";
+
 
   FILE *fp;
   char buffer[10240];
@@ -430,13 +524,13 @@ int main(void){
   printf("Starting keyswap...\n");
 
   // get active window
-  w = get_focus_window(d);
-  w = get_top_window(d, w);
-  w = get_named_window(d, w);
+  w = get_focus_window(d, 0, eventNames[0], current_app, debug);
+  w = get_top_window(d, w, 0, eventNames[0], current_app, debug);
+  w = get_named_window(d, w, 0, eventNames[0], current_app, debug);
 
   // XFetchName(d, w, &name);
   // printf("window:%#x name:%s\n", w, name);
-  printf("First window name: %s \n",str_window_class(d, w,prior_app));
+  printf("First window name: %s \n\n",str_window_class(d, w,prior_app));
 
   int breakouter;
   int last_event=0;
@@ -483,7 +577,9 @@ int main(void){
 
     if(strcicmp(prior_category, current_category) != 0){
       printf("%s: %s\n",current_category,current_app);
-      // printf("run: %s\n",run_array[category_idx]);
+      if(debug == true){
+        printf("run: %s\n",run_array[category_idx]);
+      }
       system(run_array[category_idx]);
       strcpy(run_normal,run_array[category_idx]);
       ran_onInput = 0;
@@ -494,11 +590,15 @@ int main(void){
         if(config_de_array[category_idx][r] != -1){
           int de_id_idx = in_int(de_id_array, de_len, config_de_array[category_idx][r]);
           if(strcicmp(current_category, "term") == 0){
-            // printf("Running de term command: %s\n",de_runterm_array[de_id_idx]);
+            if(debug == true){
+              printf("Running de term command: %s\n",de_runterm_array[de_id_idx]);
+            }
             system(de_runterm_array[de_id_idx]);
           }
           else{
-            // printf("Running de gui command: %s\n",de_rungui_array[de_id_idx]);
+            if(debug == true){
+              printf("Running de gui command: %s\n",de_rungui_array[de_id_idx]);
+            }
             system(de_rungui_array[de_id_idx]);
           }
         }
@@ -519,12 +619,16 @@ int main(void){
     if(strlen(run_onInput) > 0){
       while(XNextEventTimeout(d, &e, .5, event_ts, last_event, &event_ts, &last_event)){
         if(check_caret() && ran_onInput == 0){
-          // printf("run_onInput: %s\n",run_onInput);
+          if(debug == true){
+            printf("run_onInput: %s\n",run_onInput);
+          }
           system(run_onInput);
           ran_onInput = 1;
         }
         else if(!check_caret() && ran_onInput == 1){
-          // printf("run_offInput: %s\n",run_offInput);
+          if(debug == true){
+            printf("run_offInput: %s\n",run_offInput);
+          }
           system(run_offInput);
           ran_onInput = 0;
         }
@@ -534,9 +638,11 @@ int main(void){
       while (1) {
         XNextEvent(d, &e);
         // Make sure window dragging or resizing is not occuring
-        if(!(e.type == 22 && (e.type == last_event) && timeInMilliseconds()-event_ts < 300)){
-          // printf("%d == %d\n",e.type, last_event);
-          // printf("Timestamp: %lld\n",timeInMilliseconds()-event_ts);
+        if(!(e.type == ConfigureNotify && (e.type == last_event) && timeInMilliseconds()-event_ts < 300)){
+          if(debug == true){
+            printf("  event: %s %d\n",eventNames[e.type-1],e.type);
+            printf("  duration: %lldms\n",timeInMilliseconds()-event_ts);
+          }
           event_ts = timeInMilliseconds();
           last_event = e.type;
           break;
@@ -546,8 +652,17 @@ int main(void){
       }
     }
 
-    w = get_focus_window(d);
-    w = get_top_window(d, w);
-    w = get_named_window(d, w);
+    // Reference http://www.rahul.net/kenton/xproto/xevents_errors.html
+    // event type 17 - DestroyNotify
+    // event type 18 - UnmapNotify
+    // event type 22 - ConfigureNotify
+    // Dismiss the following events by initiating another XNextEvent
+    while(e.type != ConfigureNotify){
+      XNextEvent(d, &e);
+    }
+
+    w = get_focus_window(d, e.type, eventNames[e.type-1], current_app, debug);
+    w = get_top_window(d, w, e.type, eventNames[e.type-1], current_app, debug);
+    w = get_named_window(d, w, e.type, eventNames[e.type-1], current_app, debug);
   }
 }

setup.py

@@ -15,47 +15,118 @@ 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():
 	print(bcolors.CYELLOW + "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.CYELLOW + "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")
 	run_install = yn_choice(bcolors.CYELLOW + "Would you like to run it now? (Will require logoff and logon.)\n" + bcolors.ENDC)
 	if(run_install):
+		os.system("ibus-setup")
 		os.system("im-config -n ibus")
 		print("\n")
 		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()
+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"]
+	for index, item in enumerate(keymaps):
+		print("    %i. %s" % (index+1, item.capitalize()))
+	default = 0
+	while not int(default) in range(1,len(keymaps)+1):
+		default = int(input("\nPlease enter your desired keymap (1 - " + str(len(keymaps)) + ") : "))
+	print("")
+	path= cmdline('echo %cd%')[:-1]
+	if default == 1:
+		os.system("regedit " + path + "\\windows\\macbook_winctrl_swap.reg")
+	elif default == 2:
+		os.system("regedit " + path + "\\windows\\macbook_winctrl_capsesc_swap.reg")
+	elif default == 3:
+		os.system("regedit " + path + "\\windows\\standard_ctrlalt_swap.reg")
+	elif default == 4:
+		os.system("regedit " + path + "\\windows\\standard_ctrlalt_capsesc_swap.reg")
+	elif default == 5:
+		os.system("regedit " + path + "\\windows\\remove_keyswap.reg")
+	if default > 0 and default < 5:
+		print("Will now install chocolatey and autohotkey with elevated privileges...")
+		print("This install will fail if you are not running with elevated privileges")
+		os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"')
+		print("\nWill now install Ubuntu Terminal Theme as default...")
+		os.system("regedit " + path + "\\windows\\theme_ubuntu.reg")
+		print("Copying autohotkey combinations for Terminals & Editors...")
+		os.system("copy /Y " + path + "\\windows\\kinto.ahk \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
+		print("\nPlease log off and back on for changes to take full effect.")
+		print("If using WSL then please remember to right click on title bar -> Properties -> Edit Options -> Use Ctrl+Shift+C/V as Copy/Paste and enable it.")
+	else:
+		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
+
+
+# check_x11 = cmdline("env | grep -i x11").strip()
+check_x11 = cmdline("env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type | awk -F= '{print $2}'").strip()
+
+if len(check_x11) == 0:
+	if os.name != 'nt':
+		print("You are not using x11, please logout and back in using x11/Xorg")
+		sys.exit()
+	else:
+		print("You are detected as running Windows.")
+		windows_setup()
+		sys.exit()
+
+check_xbind = cmdline("which xbindkeys 2>/dev/null").strip()
+check_xdotool = cmdline("which xdotool 2>/dev/null").strip()
+check_ibus = cmdline("which ibus-setup 2>/dev/null").strip()
+
+pkgm = cmdline("which apt-get 2>/dev/null").strip()
+
+if len(pkgm) == 0:
+	pkgm = cmdline("which dnf 2>/dev/null").strip()
+	if len(pkgm) > 0:
+		pkgm += " check-update;sudo dnf install -y "
+else:
+	pkgm += " update; sudo apt-get install -y "
+
+if len(pkgm) == 0:
+	pkgm = cmdline("which pacman 2>/dev/null").strip()
+	if len(pkgm) > 0:
+		pkgm += " -Syy; sudo pacman -S "
+
+
+if len(pkgm) == 0:
+	print("No supported package manager found. Exiting...")
+	sys.exit()
+
 
 runpkg = 0
 run_pkg = ""
 
-if len(check_xbind) > 0 and len(check_xdotool) > 0:
-	print("Xbindkeys, and xdotool requirement is installed.")
+if len(check_xbind) > 0 and len(check_xdotool) > 0 and len(check_ibus) > 0:
+	print("Xbindkeys, xdotool and IBus requirement is installed.")
 if len(check_xbind) == 0:
 	run_pkg = "xbindkeys"
 	runpkg = 1
 if len(check_xdotool) == 0:
 	run_pkg += " xdotool"
 	runpkg = 1
+if len(check_ibus) == 0:
+	# may differ with distro, but for now
+	run_pkg += " ibus"
+	runpkg = 1
 
 if runpkg != 0:
-	requirements()
+	requirements(pkgm)
 
-if os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "":
+if not os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "":
 	install_ibus()
 
-
-
 try:
 	f = open("defaults.json")
 except IOError:
@@ -180,7 +251,7 @@ if(onetime):
 	print(bcolors.CYELLOW + "Please enter your init tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
 	defaultinit = [int(i) for i in input().split()]
 	if len(defaultinit) != 0:
-		user_config['init'] = defaultinit
+		user_config['init'] = [intents[defaultinit[0]-1]['id']]
 
 print("\nDynamic shortcut tweaks\n")
 

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"

system-config/keyswap.timer

@@ -0,0 +1,11 @@
+# keyswap.timer
+[Unit]
+Description=Runs the keyswap.service 5 seconds after boot up
+
+[Timer]
+#OnBootSec=5s
+OnActiveSec=5s
+Unit=keyswap.service
+
+[Install]
+WantedBy=default.target

system-config/kinto.desktop

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

uninstall.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 
-systemctl --user stop keyswap
+systemctl --user stop keyswap 2>/dev/null
 systemctl --user disable keyswap
+systemctl --user stop keyswap.timer 2>/dev/null
+systemctl --user disable keyswap.timer
+rm ~/.config/systemd/user/keyswap.service
+rm ~/.config/systemd/user/keyswap.timer
 rm -rf ~/.config/autostart/kinto.desktop
 rm -rf ~/.config/kinto
 rm -rf ~/.xkb
-
-sed -i '/xkb/d' ~/.Xsession
+systemctl daemon-reload
+sed -i '/xkb/d' ~/.Xsession 2>/dev/null

user_config.json

@@ -16,7 +16,7 @@
 		"symbols":"",
 		"types":"",
 		"de":[],
-		"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","kitty" ]
 	},
 	{
         "name": "firefox",
@@ -36,7 +36,7 @@
         "symbols": "",
         "types": "",
         "de": [],
-        "appnames": [ "Chromium","Chromium-browser","Google-chrome" ]
+        "appnames": [ "Chromium","Chromium-browser","Google-chrome","Epiphany" ]
     }],
 	"init": [],
 	"detypes":["gnome2","gnome3","kde4","kde5","xfce","i3wm"],

windows/autohotkey.ps1

@@ -0,0 +1,12 @@
+$testchoco = powershell choco -v
+if(-not($testchoco)){
+    Write-Output "Seems Chocolatey is not installed, installing now"
+    Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+}
+else{
+    Write-Output "Chocolatey Version $testchoco is already installed"
+}
+
+if(-not(test-path "C:\Program Files\AutoHotkey\AutoHotkey.exe")){
+	choco install autohotkey.install
+}

windows/kinto.ahk

@@ -0,0 +1,30 @@
+#IfWinActive ahk_exe sublime_text.exe
+	; Remap Ctrl+Shift to behave like macOS Sublimetext
+	; Will extend cursor to multiple lines
+	#+Up::send {shift up}^!{Up}
+	#+Down::send {shift up}^!{Down}
+
+	; Remap Ctrl+Cmd+G to select all matches
+	#^g::send !{F3}
+#If
+
+#IfWinActive ahk_exe ubuntu.exe
+	^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up}
+	#c::Send {LCtrl down}c{LCtrl Up}
+	#x::Send {LCtrl down}x{LCtrl Up}
+	#o::Send {LCtrl down}o{LCtrl Up}
+	#r::Send {LCtrl down}r{LCtrl Up}
+	#w::Send {LCtrl down}w{LCtrl Up}
+	#\::Send {LCtrl down}\{LCtrl Up}
+	#k::Send {LCtrl down}k{LCtrl Up}
+	#u::Send {LCtrl down}u{LCtrl Up}
+	#j::Send {LCtrl down}j{LCtrl Up}
+	#t::Send {LCtrl down}t{LCtrl Up}
+	#_::Send {LCtrl down}_{LCtrl Up}
+	^v::Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up}
+#If
+
+#IfWinActive ahk_exe powershell.exe
+	^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up}
+	#c::Send {LCtrl down}c{LCtrl Up}
+#If

windows/remove_keyswap.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Keyboard Layout]
+"Scancode Map"=-