Merge pull request #34 from rbreaves/dev

Added PgUp, PgDn, Home, and End to terminal Cmd+Arrow keys
- Added PgUp, PgDn, Home, and End to terminal keymap on Cmd+Up/Dn/Left/Right
2025-08-03 01:26:40 +02:00 · 2020-02-19 02:13:03 -06:00 · 2020-02-19 02:08:46 -06:00 · 2020-02-19 00:32:38 -06:00 · 2020-02-18 23:50:45 -06:00 · 2020-02-18 22:56:32 -06:00
24 changed files with 743 additions and 139 deletions
--- a/.xkb/symbols/mac_gui
+++ b/.xkb/symbols/mac_gui
@@ -1,15 +1,15 @@
 default partial xkb_symbols "mac_levelssym" {
-    // LEFT to Begin Line
+    // LEFT to Begin Line or Beginning of word
    replace key <LEFT> {
        type[Group1]= "ONE_LEVEL_CTRL",
        symbols[Group1]= [         Left,         Left, NoSymbol ],
-        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<HOME>,clearmods=Control)]
+        actions[Group1]= [      NoAction(), RedirectKey(key=<LEFT>,modifiers=Control,clearmods=Mod1), RedirectKey(key=<HOME>,clearmods=Control)]
    };
-    // Right to End of Line
+    // 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(),      NoAction(), RedirectKey(key=<END>,clearmods=Control)]
+        actions[Group1]= [      NoAction(), RedirectKey(key=<RGHT>,modifiers=Control,clearmods=Mod1), RedirectKey(key=<END>,clearmods=Control)]
    };
    // Up to Mac Home
    replace key <UP> {
@@ -23,10 +23,24 @@ default partial xkb_symbols "mac_levelssym" {
        symbols[Group1]= [         Down,         Down, NoSymbol ],
        actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<END>)]
    };
-    // CTRL BKSP to DELETE
-    // replace key <BKSP> {
-    //    type[Group1]= "TWO_LEVEL_CTRL",
-    //    symbols[Group1]= [       BackSpace,       BackSpace, NoSymbol ],
-    //    actions[Group1]= [      NoAction(),      NoAction(), RedirectKey(key=<DELE>,clearmods=Control)]
-    // };
+    // 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()]
+    };
 };
+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)]
+    };
+};
--- a/.xkb/symbols/mac_term
+++ b/.xkb/symbols/mac_term
@@ -11,4 +11,28 @@ default partial xkb_symbols "mac_levelssym" {
      symbols[Group1]= [ Hyper_R ],
      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
    };
+    // 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)]
+    };
+    // 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)]
+    };
+    // HOME
+    replace key <LEFT> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [         Up,         Up, 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)]
+    };
 };
--- a/.xkb/symbols/mac_term_chromebook
+++ b/.xkb/symbols/mac_term_chromebook
@@ -11,4 +11,28 @@ default partial xkb_symbols "mac_levelssym" {
      symbols[Group1]= [ Hyper_R ],
      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
    };
+    // 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)]
+    };
+    // 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)]
+    };
+    // HOME
+    replace key <LEFT> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [         Up,         Up, 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)]
+    };
 };
--- a/.xkb/types/mac_gui
+++ b/.xkb/types/mac_gui
@@ -1,20 +1,11 @@
 default partial xkb_types "addmac_levels" {
    type "ONE_LEVEL_CTRL" {
-        modifiers= Shift+Control;
-        map[Shift]= Level2;
+        modifiers= Mod1+Control;
+        map[Mod1]= Level2;
        map[Control]= Level3;
-        map[Shift+Control]= Level3;
+        map[Mod1+Control]= Level3;
        level_name[Level1]= "Base";
-        level_name[Level2]= "Caps";
-        level_name[Level3]= "With Control";
-    };
-    type "TWO_LEVEL_CTRL" {
-        modifiers= Shift+Control;
-        map[Shift]= Level2;
-        map[Control]= Level3;
-        map[Shift+Control]= Level3;
-        level_name[Level1]= "Base";
-        level_name[Level2]= "Caps";
+        level_name[Level2]= "Alt";
        level_name[Level3]= "With Control";
    };
 };
--- a/.xkb/types/mac_term
+++ b/.xkb/types/mac_term
@@ -0,0 +1,11 @@
+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";
+        level_name[Level3]= "With Control";
+    };
+};
--- a/README.md
+++ b/README.md
@@ -32,12 +32,17 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following
 - Python (initial install only)
 - systemd
 - x11
+- IBus*
 - 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.
+
+To 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.

 ## How to install
@@ -129,9 +134,9 @@ Status
 systemctl --user status keyswap
 ```

-Stop
+Stop (and reset keyboard to normal)
 ```
-systemctl --user stop keyswap
+systemctl --user stop keyswap && setxkbmap -option
 ```

 Start
@@ -165,19 +170,59 @@ systemctl --user stop keyswap && setxkbmap -option;setxkbmap -option altwin:swap

 ## Troubleshooting

+### Does not start when you log in or after you reboot?
+
+1. Check the status
+```
+systemctl --user status keyswap
+```
+2. Check the service journal
+```
+journalctl --user-unit=keyswap.service -b
+```
+
+You may need to manually set your DISPLAY in the systemd service file. Normally it pulls in the proper DISPLAY value but if it doesn't you can try this.
+
+```
+echo $DISPLAY
+
+# :0.0
+```
+
+nano ~/.config/systemd/user/keyswap.service
+```
+...
+[Service]
+Type=simple
+Restart=always
+Environment=DISPLAY=:0.0
+...
+```
+
+If you continue to have issues then open a ticket and send me the info.
+
 ### Keyswap is not occurring, but it was working.

 Now that Kinto is using a custom written C program I am not aware of any specific bugs or issues, but you can start here if you having difficulties and please report it if it is reproducible.
-
-1. Restart Kinto
+1. Get status
+```
+systemctl --user status keyswap
+```
+2. Restart Kinto
 ```
 systemctl --user restart keyswap
 ```
-2. Check the Status of Kinto and open a ticket with the output.
+3. Check the Status again and open a ticket if you need to.
 ```
 systemctl --user status keyswap
 ```

+You can also do the following to see if it is an actual issue with kintox11 not running or your service file.
+```
+cd ~/.config/kinto
+./kintox11
+```
+
 ## 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.

@@ -194,8 +239,28 @@ https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste

 ## More information about Kinto

+https://medium.com/@benreaves/kinto-v1-0-released-2018e6401d2e
 https://medium.com/@benreaves/kinto-a-mac-inspired-keyboard-mapping-for-linux-58f731817c0

 ## License

 GPL v2
+
+## Credits and Contributions
+
+I would just like to thank a few people here directly that have helped me tremendously with completing this project and without their support, direct, indirect or otherwise I would have had difficulty completing this undertaking. I will list these things off in chronological order mostly.
+
+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.
+
+
+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.
+
+Lastly these four people were also very helpful to me as well. @probonopd for being one of the first people to install and use Kinto and gave me the initial feedback to include wordwise support! He also has really great articles*** posted on HackerNews & Medium about UI/UX design. Another person I'd like to thank is @owzim, his feedback allowed me to rapidly iterate and fix several bugs to support additional platforms better. The last two are members of the #ubuntu channel in IRC on freenode, tarzeau ( @alexmyczko ) and sarnold. Alex contributing a proper Makefile, so the project can be packaged properly, and sarnold help me find that IBus could resolve an issue I was having with needing to detect the caret status.
+
+If I left anyone out then I apologize, that was not intentional. I am happy to say that this project is at a state of completion. Bug fixes will primarily be the only activity happening going forward and possibly a rewrite for Wayland at some point. Contributions as mentioned above are welcomed, and will be merged into master if they help with the goal of making typing on linux more like a mac.
+
+*https://askubuntu.com/questions/1010276/can-i-act-on-the-event-that-a-window-opens-without-polling
+**https://gist.github.com/kui/2622504
+***https://medium.com/@probonopd/make-it-simple-linux-desktop-usability-part-1-5fa0fb369b42
--- a/defaults.json
+++ b/defaults.json
@@ -14,7 +14,7 @@
 		"xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_levelssym)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
-		"xkb_types_term":""
+		"xkb_types_term":"+mac_term(addmac_levels)"
 	},
 	{
 		"id": 2,
@@ -27,7 +27,7 @@
 		"xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)",
 		"xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_levelssym)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
-		"xkb_types_term":"",
+		"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"
 	},
 	{
@@ -41,7 +41,7 @@
 		"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_types_gui":"+mac_gui(addmac_levels)",
-		"xkb_types_term":""
+		"xkb_types_term":"+mac_term(addmac_levels)"
 	},
 	{
 		"id": 4,
@@ -49,12 +49,12 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Standard Chromebook Keyboards",
-		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY",
+		"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":"+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)",
-		"xkb_types_term":""
+		"xkb_types_term":"+mac_term(addmac_levels)"
 	},
 	{
 		"id": 5,
@@ -62,13 +62,13 @@
 		"type":"chromebook",
 		"active": false,
 		"description":"Chromebook with Windows 104 Keyboard",
-		"gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY; setxkbmap -device $usbid -option altwin:ctrl_alt_win",
+		"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.chromebook.gui $DISPLAY",
+		"fallbackgui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
 		"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)",
-		"xkb_types_term":""
+		"xkb_types_term":"+mac_term(addmac_levels)"
 	},
 	{
 		"id": 6,
@@ -76,11 +76,11 @@
 		"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.chromebook.gui $DISPLAY",
+		"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",
 		"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)",
-		"xkb_types_term":""
+		"xkb_types_term":"+mac_term(addmac_levels)"
 	}]
 }
--- a/keyswap_service.sh
+++ b/keyswap_service.sh
@@ -1,13 +1,21 @@
 #!/bin/bash

-swapcmd="\/bin\/bash\ \/home\/`whoami`\/.config\/kinto\/xactive.sh"
+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/keyswap.sh ~/.config/autostart/keyswap.sh
+cp ./system-config/kinto.desktop ~/.config/autostart/kinto.desktop
 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/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
+systemctl --user daemon-reload
 systemctl --user enable keyswap
-systemctl --user start keyswap
+systemctl --user start keyswap
--- a/kintopy/kinto.py
+++ b/kintopy/kinto.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+#
+# Kinto - Python implementation of Xlib
+#
+# Based on code by Stephan Sokolow
+# Source: https://gist.github.com/ssokolow/e7c9aae63fb7973e4d64cff969a78ae8
+from contextlib import contextmanager
+import Xlib
+import Xlib.display
+
+# Connect to the X server and get the root window
+disp = Xlib.display.Display()
+root = disp.screen().root
+
+# Prepare the property names we use so they can be fed into X11 APIs
+NET_ACTIVE_WINDOW = disp.intern_atom('_NET_ACTIVE_WINDOW')
+NET_WM_NAME = disp.intern_atom('_NET_WM_NAME')  # UTF-8
+WM_NAME = disp.intern_atom('WM_NAME')           # Legacy encoding
+NET_WM_CLASS = disp.intern_atom('_NET_WM_CLASS')  # UTF-8
+WM_CLASS = disp.intern_atom('WM_CLASS')
+
+last_seen = { 'xid': None, 'title': None }
+
+@contextmanager
+def window_obj(win_id):
+    """Simplify dealing with BadWindow (make it either valid or None)"""
+    window_obj = None
+    if win_id:
+        try:
+            window_obj = disp.create_resource_object('window', win_id)
+        except Xlib.error.XError:
+            pass
+    yield window_obj
+
+def get_active_window():
+    """Return a (window_obj, focus_has_changed) tuple for the active window."""
+    win_id = root.get_full_property(NET_ACTIVE_WINDOW,Xlib.X.AnyPropertyType).value[0]
+
+    focus_changed = (win_id != last_seen['xid'])
+    if focus_changed:
+        with window_obj(last_seen['xid']) as old_win:
+            if old_win:
+                old_win.change_attributes(event_mask=Xlib.X.NoEventMask)
+
+        last_seen['xid'] = win_id
+        with window_obj(win_id) as new_win:
+            if new_win:
+                new_win.change_attributes(event_mask=Xlib.X.PropertyChangeMask)
+
+    return win_id, focus_changed
+
+def _get_window_class_inner(win_obj):
+    for atom in (NET_WM_CLASS, WM_CLASS):
+        try:
+            window_class = win_obj.get_full_property(atom, 0)
+
+        except UnicodeDecodeError:  # Apparently a Debian distro package bug
+            title = "<could not decode characters>"
+        else:
+            if window_class:
+                win_class = window_class.value.split('\x00')[1]
+                if isinstance(win_class, bytes):
+                    # Apparently COMPOUND_TEXT is so arcane that this is how
+                    # tools like xprop deal with receiving it these days
+                    win_class = win_class.split('\x00')[1].decode('latin1', 'replace')
+                return win_class
+            else:
+                title = "<unnamed window>"
+
+    return "{} (XID: {})".format(title, win_obj.id)
+
+def get_window_class(win_id):
+    """Look up the window name for a given X11 window ID"""
+    if not win_id:
+        last_seen['title'] = "<no window id>"
+        return last_seen['title']
+
+    title_changed = False
+    with window_obj(win_id) as wobj:
+        if wobj:
+            win_title = _get_window_class_inner(wobj)
+            title_changed = (win_title != last_seen['title'])
+            last_seen['title'] = win_title
+
+    return last_seen['title'], title_changed
+
+def handle_xevent(event):
+    # Loop through, ignoring events until we're notified of focus/title change
+    if event.type != Xlib.X.PropertyNotify:
+        return
+
+    changed = False
+    if event.atom == NET_ACTIVE_WINDOW:
+        if get_active_window()[1]:
+            changed = changed or get_window_class(last_seen['xid'])[1]
+    elif event.atom in (NET_WM_CLASS, WM_CLASS):
+        changed = changed or get_window_class(last_seen['xid'])[1]
+
+    if changed:
+        handle_change(last_seen)
+
+def handle_change(new_state):
+    """Replace this with whatever you want to actually do"""
+    print(new_state['title'])
+
+if __name__ == '__main__':
+    # Listen for _NET_ACTIVE_WINDOW changes
+    root.change_attributes(event_mask=Xlib.X.PropertyChangeMask)
+
+    # Prime last_seen with whatever window was active when we started this
+    get_window_class(get_active_window()[0])
+    handle_change(last_seen)
+
+    while True:  # next_event() sleeps until we get an event
+        handle_xevent(disp.next_event())
--- a/kintox11/binary/kintox11
+++ b/kintox11/binary/kintox11
--- a/kintox11/src/Makefile
+++ b/kintox11/src/Makefile
@@ -0,0 +1,5 @@
+CFLAGS=-g $(shell pkg-config --cflags json-c xmu)
+LDFLAGS=-g $(shell pkg-config --libs json-c xmu)
+
+all:
+	$(CC) kintox11.c $(CFLAGS) $(LDFLAGS) -lm -o kintox11
--- a/kintox11/src/kintox11.c
+++ b/kintox11/src/kintox11.c
@@ -10,7 +10,7 @@
 //
 // To compile with static library json-c 
 // Make sure archive with object files exist ar -t /usr/local/lib/libjson-c.a
-// gcc -L/usr/local/lib/ kintox11.c -ljson-c -lXmu -lXt -lX11 -o kintox11
+// gcc -L/usr/local/lib/ kintox11.c -ljson-c -lXmu -lXt -lX11 -O2 -o kintox11
 //

 #include <stdlib.h>
@@ -18,12 +18,103 @@
 #include <locale.h>
 #include <string.h>
 #include <ctype.h>
+#include <unistd.h>
 #include <X11/Xlib.h>           // `apt-get install libx11-dev`
 #include <X11/Xmu/WinUtil.h>    // `apt-get install libxmu-dev`
 #include <json-c/json.h>        // `apt install libjson-c-dev`
+#include <sys/select.h>
+#include <math.h>
+#include <sys/time.h>
+
+long long timeInMilliseconds(void) {
+    struct timeval tv;
+
+    gettimeofday(&tv,NULL);
+    return (((long long)tv.tv_sec)*1000)+(tv.tv_usec/1000);
+}
+
+static int wait_fd(int fd, double seconds)
+{
+  struct timeval tv;
+  fd_set in_fds;
+  FD_ZERO(&in_fds);
+  FD_SET(fd, &in_fds);
+  tv.tv_sec = trunc(seconds);
+  tv.tv_usec = (seconds - trunc(seconds))*1000000;
+  return select(fd+1, &in_fds, 0, 0, &tv);
+}
+
+int XNextEventTimeout(Display *d, XEvent *e, double seconds, long long event_ts, int last_event, long long *event_ts_ptr, int *last_event_ptr)
+{
+  if (XPending(d) || wait_fd(ConnectionNumber(d),seconds)) {
+      while (1) {
+        XNextEvent(d, e);
+
+        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)){
+          *event_ts_ptr = new_ts;
+          *last_event_ptr = e->type;
+          break;
+        }
+        *event_ts_ptr = new_ts;
+        *last_event_ptr = e->type;
+      }
+      return 0;
+  } else {
+      return 1;
+  }
+}

 Bool xerror = False;

+char *trimwhitespace(char *str)
+{
+  char *end;
+  // Trim leading space
+  while(isspace((unsigned char)*str)) str++;
+  if(*str == 0)  // All spaces?
+    return str;
+  // Trim trailing space
+  end = str + strlen(str) - 1;
+  while(end > str && isspace((unsigned char)*end)) end--;
+  // Write new null terminator character
+  end[1] = '\0';
+  return str;
+}
+
+int check_caret()
+{
+  int caretint;
+  char * fpname;
+  fpname = malloc(sizeof(char)*20);
+  strcpy(fpname,"/tmp/kinto/caret");
+  if( access( fpname, F_OK ) != -1 ) {
+    char *buffer = NULL;
+    size_t size = 0;
+    FILE *fp = fopen(fpname, "r");
+    fseek(fp, 0, SEEK_END);
+    size = ftell(fp);
+    rewind(fp);
+    buffer = malloc((size + 1) * sizeof(*buffer));
+    fread(buffer, size, 1, fp);
+    buffer[size] = '\0';
+    trimwhitespace(buffer);
+    caretint = atoi(buffer);
+    if(caretint == 1){
+      // printf("caret: %s\n", buffer);
+      return 1;
+    }
+    // printf("found nothing\n");
+    return 0;
+  }
+  else{
+    // printf("file %s does not exist\n",fpname);
+    return 0;
+  }
+}
+
 int in_int(int a[],int size,int item) 
 { 
    int i,pos=-1; 
@@ -58,19 +149,30 @@ int strcicmp(char const *a, char const *b)
 }

 Display* open_display(){
+  int i;
  Display* d = XOpenDisplay(NULL);
+  for (i = 0; i < 60; i++) {
+    if(d == NULL){
+      printf("fail to open X server display...\n");
+    }
+    else{
+      break;
+    }
+    sleep(1);
+  }
  if(d == NULL){
-    printf("fail to open X server display...\n");
+    printf("fail to open X server display for 1 minute...\n");
+    printf("Kintox11 is now exiting...\n");
    exit(1);
  }
  return d;
 }

 int handle_error(Display* display, XErrorEvent* error){
-  // printf("X11 error: type=%d, serial=%lu, code=%d\n",
-  //   error->type, error->serial, (int)error->error_code);
-  // xerror = True;
-  return 0;
+  printf("X11 error: type=%d, serial=%lu, code=%d\n",
+    error->type, error->serial, (int)error->error_code);
+  xerror = True;
+  return 1;
 }

 Window get_focus_window(Display* d){
@@ -88,6 +190,49 @@ Window get_focus_window(Display* d){
  return w;
 }

+// get the top window.
+// 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 w = start;
+  Window parent = start;
+  Window root = None;
+  Window *children;
+  unsigned int nchildren;
+  Status s;
+
+  while (parent != root && parent != 0) {
+    w = parent;
+    s = XQueryTree(d, w, &root, &parent, &children, &nchildren); // see man
+
+    if (s)
+      XFree(children);
+
+    if(xerror){
+      printf("fail to get top window: %ld\n",w);
+      exit(1);
+    }
+
+    // printf("  get parent (window: %d)\n", (int)w);
+  }
+
+  // printf("success (window: %d)\n", (int)w);
+
+  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 w;
+  // printf("getting named window ... ");
+  w = XmuClientWindow(d, start); // see man
+  // if(w == start)
+  //   printf("fail\n");
+  // printf("success (window: %d)\n", (int) w);
+  return w;
+}

 const char * str_window_class(Display* d, Window w, char *prior_app ){
  Status s;
@@ -118,17 +263,18 @@ int main(void){
  FILE *fp;
  char buffer[10240];
  struct json_object *parsed_json, *config, *config_obj, 
-  *config_obj_name, *config_obj_run, *config_obj_de, 
-  *config_obj_appnames, *appnames_obj, *init, *de, 
-  *de_obj, *de_obj_id, *de_obj_active, *de_obj_run,
-  *de_obj_runterm,*de_obj_rungui;
+  *config_obj_name, *config_obj_run, *config_obj_run_oninput, 
+  *config_obj_run_offinput, *config_obj_de, *config_obj_appnames,
+  *appnames_obj, *init, *de, *de_obj, *de_obj_id, *de_obj_active, 
+  *de_obj_run, *de_obj_runterm,*de_obj_rungui;

  int arraylen;
  int appnames_len, init_len, de_len, config_de_len;
  int system(const char *command);

  size_t i,n,r; 
-
+  
+  printf("Importing user_config.json...\n");
  fp = fopen("user_config.json","r");
  fread(buffer, 10240, 1, fp);
  fclose(fp);
@@ -145,6 +291,8 @@ int main(void){

  const char *name_array[arraylen];
  const char *run_array[arraylen];
+  const char *run_oninput_array[arraylen];
+  const char *run_offinput_array[arraylen];
  int init_array[init_len];

  int de_id_array[de_len];
@@ -193,10 +341,16 @@ int main(void){

  for (i = 0; i < arraylen; i++) {
    config_obj = json_object_array_get_idx(config, i);
+
    config_obj_name = json_object_object_get(config_obj, "name");
    config_obj_run = json_object_object_get(config_obj, "run");
+    config_obj_run_oninput = json_object_object_get(config_obj, "run_onInput");
+    config_obj_run_offinput = json_object_object_get(config_obj, "run_offInput");
+
    name_array[i] = json_object_get_string(config_obj_name);
    run_array[i] = json_object_get_string(config_obj_run);
+    run_oninput_array[i] = json_object_get_string(config_obj_run_oninput);
+    run_offinput_array[i] = json_object_get_string(config_obj_run_offinput);
    // printf("%s\n%s\n", json_object_get_string(config_obj_name), json_object_get_string(config_obj_run));

    config_obj_appnames = json_object_object_get(config_obj, "appnames");
@@ -209,13 +363,13 @@ int main(void){
      }
      else{
        appnames_array[i][n] = json_object_get_string(json_object_array_get_idx(config_obj_appnames, n));
-        // printf("%s i:%ld n:%ld %s\n",name_array[i],i,n,appnames_array[i][n]);
+        //printf("%s i:%ld n:%ld %s\n",name_array[i],i,n,appnames_array[i][n]);
      }
    }
    if(appnames_max > appnames_len){
      for (n = appnames_len; n < appnames_max; n++){
        appnames_array[i][n] = NULL;
-        // printf("%s i:%ld n:%ld %s\n",name_array[i],i,n,appnames_array[i][n]);
+        //printf("%s i:%ld n:%ld %s\n",name_array[i],i,n,appnames_array[i][n]);
      }
    }

@@ -233,6 +387,8 @@ int main(void){

    }
  }
+  
+  printf("Data from user_config.json imported successfully.\n");

  for (i = 0; i < init_len; i++) {
    init_array[i] = json_object_get_int(json_object_array_get_idx(init, i));
@@ -243,6 +399,7 @@ int main(void){

  Display* d;
  Window w;
+  char *name;

  // for XmbTextPropertyToTextList
  setlocale(LC_ALL, ""); // see man locale
@@ -251,90 +408,146 @@ int main(void){
  XSelectInput(d, DefaultRootWindow(d), SubstructureNotifyMask);
  XSetErrorHandler(handle_error);

+  char * run_normal;
+  char * run_onInput;
+  char * run_offInput;
  char * prior_app;
+  char * current_app;
+  char * prior_category;
+  char * current_category;
+  run_onInput = malloc(sizeof(char)*400);
+  run_offInput = malloc(sizeof(char)*400);
+  run_normal = malloc(sizeof(char)*400);
  prior_app = malloc(sizeof(char)*100);
+  current_app = malloc(sizeof(char)*100);
+  prior_category = malloc(sizeof(char)*100);
+  current_category = malloc(sizeof(char)*100);
  strcpy(prior_app,"none");
+  strcpy(prior_category,"none");

  int remap_bool = 2;

+  printf("Starting keyswap...\n");
+
  // get active window
  w = get_focus_window(d);
+  w = get_top_window(d, w);
+  w = get_named_window(d, w);
+
+  // 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));

  int breakouter;
+  int last_event=0;
+  Bool ran_onInput = 0;
+  long long int event_ts = timeInMilliseconds();

  for (;;)
  {
+    strcpy(current_app,str_window_class(d, w,prior_app));
+    int category_idx;
+    // printf("current: %s\n",current_app);
    breakouter = 0;
-    // printf("%s\n","1");
-    // printf("%s\n",str_window_class(d, w,prior_app));
-    if(strcmp(str_window_class(d, w,prior_app),prior_app)){
-      // printf("%s\n","2");
-      for(i = 0; i < arraylen; ++i){
-        if(breakouter == 0){
-          if(strcmp(name_array[i],"gui")){
-            // printf("%s\n","3");
-            for(n = 0; n < appnames_max; ++n){
-              if (appnames_array[i][n] != NULL){
-                // printf("%s\n",appnames_array[i][n]);
-                // If statement for triggering terminal config
-                if((strcicmp(appnames_array[i][n], str_window_class(d, w,prior_app)) == 0 && (remap_bool == 1 || remap_bool == 2))) {
-                  // printf("1st if %s i:%ld n:%ld %s\n",name_array[i],i,n,appnames_array[i][n]);
-                  printf("%s\n",name_array[i]);
-                  system(run_array[i]);
-                  for(r = 0; r < config_de_max; r++){
-                    if(config_de_array[i][r] != -1){
-                      int de_id_idx = in_int(de_id_array, de_len, config_de_array[i][r]);
-                      // printf("Running de command: %s\n",de_run_array[de_id_idx]);
-                      system(de_runterm_array[de_id_idx]);
-                    }
-                  }
-                  remap_bool = 0;
-                  fflush(stdout);
-                  breakouter = 1;
-                  break;
-                } // Else command for ignoring similar app category based on config
-                else if((strcicmp(appnames_array[i][n], str_window_class(d, w,prior_app)) == 0 && remap_bool == 0)){
-                  // printf("2nd elseif %s i:%ld n:%ld %s\n",name_array[i],i,n,appnames_array[i][n]);
-                  // printf("%s\n","4");
-                  breakouter = 1;
-                  break;
-                } // Else command for triggering gui config
-                else if ((i == arraylen-1 || appnames_array[i][n+1] == NULL) && (remap_bool == 0 || remap_bool == 2)){
-                  char *find = "gui";
-                  int gui_idx = in(name_array, arraylen, find);

-                  if(gui_idx >= 0) {
-                    printf("%s\n",name_array[gui_idx]);
-                    system(run_array[gui_idx]);
-                  }
-                  for(r = 0; r < config_de_max; r++){
-                    if(config_de_array[gui_idx][r] != -1){
-                      int de_id_idx = in_int(de_id_array, de_len, config_de_array[gui_idx][r]);
-                      // printf("Running de command: %s\n",de_run_array[de_id_idx]);
-                      system(de_rungui_array[de_id_idx]);
-                    }
-                  }
-                  // printf("3rd elseif %s i:%ld n:%ld %s\n",name_array[i],i,n,appnames_array[i][n]);
-                  remap_bool = 1;
-                  fflush(stdout);
-                  breakouter = 1;
-                  break;
-                }
-              }
-            }
+    // Cycle through category name array
+    // printf("%d\n",arraylen);
+    for(i = 0; i < arraylen; ++i){
+      // Cycle through the maximum App name array in each category
+      for(n = 0; n < appnames_max; ++n){
+        if (appnames_array[i][n] != NULL){
+          // printf("%s\n",appnames_array[i][n]);
+          if(strcicmp(appnames_array[i][n], current_app) == 0){
+            strcpy(current_category,name_array[i]);
+            category_idx = i;
+            // printf("Match found: %s: %s\n",current_category,current_app);
+            breakouter = 1;
+            break;
          }
        }
-        else{
+        else if(i == arraylen-1 && breakouter==0){
+          // printf("No match found, default to gui");
+          strcpy(current_category,"gui");
+          category_idx = in(name_array, arraylen, current_category);
+          // printf("Match found: %s: %s\n",current_category,current_app);
+          break;
+        }
+        else if(appnames_array[i][n] == NULL){
+          break;
+        }
+        if(breakouter==1){
          break;
        }
      }
    }
-    // printf("%s\n","5");
-    strcpy(prior_app,str_window_class(d, w, prior_app));

+    if(strcicmp(prior_category, current_category) != 0){
+      printf("%s: %s\n",current_category,current_app);
+      // printf("run: %s\n",run_array[category_idx]);
+      system(run_array[category_idx]);
+      strcpy(run_normal,run_array[category_idx]);
+      ran_onInput = 0;
+      strcpy(run_onInput,run_oninput_array[category_idx]);
+      strcpy(run_offInput,run_offinput_array[category_idx]);
+      system(run_offInput);
+      for(r = 0; r < config_de_max; r++){
+        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]);
+            system(de_runterm_array[de_id_idx]);
+          }
+          else{
+            // printf("Running de gui command: %s\n",de_rungui_array[de_id_idx]);
+            system(de_rungui_array[de_id_idx]);
+          }
+        }
+      }
+    }
+    else if(strcicmp(prior_app, current_app) != 0){
+      int indent = strlen(current_category)+2;
+      printf("%*c%s\n", indent, ' ',current_app);
+    }
+
+    fflush(stdout);
+
+    strcpy(prior_app,current_app);
+    strcpy(prior_category,current_category);
+
+    // printf("run_onInput: %ld\n",strlen(run_onInput));
    XEvent e;
-    XNextEvent(d, &e);
-    w = get_focus_window(d);
+    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);
+          system(run_onInput);
+          ran_onInput = 1;
+        }
+        else if(!check_caret() && ran_onInput == 1){
+          // printf("run_offInput: %s\n",run_offInput);
+          system(run_offInput);
+          ran_onInput = 0;
+        }
+      }
+    }
+    else{
+      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);
+          event_ts = timeInMilliseconds();
+          last_event = e.type;
+          break;
+        }
+        event_ts = timeInMilliseconds();
+        last_event = e.type;
+      }
+    }

+    w = get_focus_window(d);
+    w = get_top_window(d, w);
+    w = get_named_window(d, w);
  }
 }
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-import json, time, os
+import json, time, os, sys
 from shutil import copyfile
 from subprocess import PIPE, Popen
 from prekinto import *
@@ -15,6 +15,54 @@ def cmdline(command):
    )
    return process.communicate()[0]

+def requirements():
+	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")
+	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)
+		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("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("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()
+
+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:
+	run_pkg = "xbindkeys"
+	runpkg = 1
+if len(check_xdotool) == 0:
+	run_pkg += " xdotool"
+	runpkg = 1
+
+if runpkg != 0:
+	requirements()
+
+if os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "":
+	install_ibus()
+
+
+
+try:
+	f = open("defaults.json")
+except IOError:
+	print("defaults.json file is missing. Will exit.\n")
+	exit()
+f.close()
+
 try:
 	f = open("defaults.json")
 except IOError:
@@ -90,22 +138,29 @@ if 'hack' in keyboardconfigs[defaultkb-1]:
 		os.system(keyboardconfigs[defaultkb-1]['hack'])

 # Setup the selected keyboards config
-os.system("cp -rf ./.xkb ~/.xkb")
+os.system("cp -TRv ./.xkb ~/.xkb/")
 if os.path.isdir(homedir + "/.xkb/keymap") == False:
 	os.mkdir(homedir + "/.xkb/keymap")
 	time.sleep(0.5)
 os.system('setxkbmap -option')
 os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui')
+os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.nw')
+os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.chrome')
 os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.term')
 time.sleep(0.5)

-symbols_gui_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_symbols' | cut -f1 -d:").strip()
-types_gui_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:").strip()
-symbols_term_line = cmdline("cat ~/.xkb/keymap/kbd.mac.term | grep -n 'xkb_symbols' | cut -f1 -d:").strip()
+symbols_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_symbols' | cut -f1 -d:").strip()
+types_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:").strip()

-cmdline('sed -i '' -e "' + symbols_gui_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
-cmdline('sed -i '' -e "' + types_gui_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
-cmdline('sed -i '' -e "' + symbols_term_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term')
+cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
+cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term')
+
+cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)","") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.nw')
+cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)","+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.nw')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')


 user_file = homedir + '/.config/kinto/user_config.json'
@@ -130,26 +185,37 @@ if(onetime):
 print("\nDynamic shortcut tweaks\n")

 intents = [obj for obj in user_config['de'] if(obj['intent'] == "gui_term")]
+tweaks = []
+tweaks_selected = []

 for index, k in enumerate(intents):
 	print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
 	print(bcolors.CYELLOW + 'Description: ' + k['description'] + bcolors.ENDC)
 	print(bcolors.CYELLOW + 'run in gui mode: ' + k['run_gui'].replace(";", "\n") + bcolors.ENDC)
 	print(bcolors.CYELLOW + 'run in terminal mode: ' + k['run_term'].replace(";", "\n") + bcolors.ENDC + '\n')
+	tweaks.append(k['id'])

 print(bcolors.CYELLOW + "Please enter your dynamic shortcut tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
 defaultde = [int(i) for i in input().split()]
-if len(defaultde) != 0:
-	# gui
-	user_config['config'][0]['de'] = defaultde
-	# term
-	user_config['config'][1]['de'] = defaultde

 for d in defaultde:
-    user_config['de'][d-1]['active'] = True
+    user_config['de'][tweaks[d-1]]['active'] = True
+    tweaks_selected.append(tweaks[d-1])
+
+if len(defaultde) != 0:
+	# gui
+	user_config['config'][0]['de'] = tweaks_selected
+	# term
+	user_config['config'][1]['de'] = tweaks_selected
+	# firefox
+	user_config['config'][2]['de'] = tweaks_selected
+	# chrome
+	user_config['config'][3]['de'] = tweaks_selected

 user_config['config'][0]['run'] = keyboardconfigs[defaultkb-1]['gui']
 user_config['config'][1]['run'] = keyboardconfigs[defaultkb-1]['term']
+user_config['config'][2]['run'] = keyboardconfigs[defaultkb-1]['gui']
+user_config['config'][3]['run'] = keyboardconfigs[defaultkb-1]['gui'].replace("kbd.mac.gui","kbd.mac.gui.chrome")

 os.remove(user_file)
 with open(user_file, 'w') as f:
--- a/system-config/.chrome-nw
+++ b/system-config/.chrome-nw
@@ -0,0 +1,7 @@
+"xdotool key --delay 0 --clearmodifiers Alt+Left"
+  Control + Left + Release
+  #Home + release
+
+"xdotool key --delay 0 --clearmodifiers Alt+Right"
+  Control + Right + Release
+  #End + release
--- a/system-config/.chrome-ww
+++ b/system-config/.chrome-ww
@@ -0,0 +1,5 @@
+"xdotool key --delay 0 --clearmodifiers Home"
+  Control + Left + Release
+
+"xdotool key --delay 0 --clearmodifiers End"
+  Control + Right + Release
--- a/system-config/.firefox-nw
+++ b/system-config/.firefox-nw
@@ -0,0 +1,7 @@
+#"xte 'keydown Control_L' 'key bracketleft' 'keyup Control_L'"
+"xdotool key --delay 0 --clearmodifiers Control_L+bracketleft"
+  Home + Release
+
+#"xte 'keydown Control_R' 'key bracketright' 'keyup Control_R'"
+"xdotool key --delay 0 --clearmodifiers Control_L+bracketright"
+  End + Release
--- a/system-config/caret_status.sh
+++ b/system-config/caret_status.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+mkdir -p /tmp/kinto
+
+IBUSADD=$(cat ~/.config/ibus/bus/`ls ~/.config/ibus/bus -1rt | tail -n1` | awk -F'IBUS_ADDRESS=' '{print $2}' | xargs)
+dbus-monitor --address $IBUSADD "path='/org/freedesktop/IBus/Panel',interface='org.freedesktop.IBus.Panel',member='FocusOut'" 2> /dev/null | grep --line-buffered -o -P '(?<=object path \"/org/freedesktop/IBus/InputContext_).*(?=[\"])' |
+while read ln
+do
+  printf '%s\n' "$ln" > /tmp/kinto/caret
+done
--- a/system-config/cleanup.sh
+++ b/system-config/cleanup.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+setxkbmap -option
+# force command to run silently and report true
+killall xbindkeys > /dev/null 2>&1 || :
+# rm /tmp/kinto/caret
--- a/system-config/keyswap.service
+++ b/system-config/keyswap.service
@@ -4,12 +4,11 @@ PartOf=graphical-session.target

 [Service]
 Type=simple
-#User={username}
-#Group={username}
-Environment=DISPLAY=:0
 Restart=always
+RestartSec=1
 WorkingDirectory=/home/{username}/.config/kinto
-ExecStart=
+ExecStart=/bin/bash -c "/home/{username}/.config/kinto/xactive.sh carrots"
+ExecStop=/bin/bash /home/{username}/.config/kinto/cleanup.sh

 [Install]
 WantedBy=default.target
--- a/system-config/keyswap.sh
+++ b/system-config/keyswap.sh
@@ -1,3 +0,0 @@
-#/bin/bash
-
-systemctl --user start keyswap
--- a/system-config/kinto.desktop
+++ b/system-config/kinto.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Kinto
+GenericName=Kinto
+Comment=Make Linux Type Like it's a Mac
+Exec=/usr/bin/systemctl --user start keyswap
+Terminal=false
+Type=Application
+X-GNOME-Autostart-enabled=true
--- a/system-config/xactive.sh
+++ b/system-config/xactive.sh
@@ -1,3 +1,4 @@
 #!/bin/bash

+./caret_status.sh &
 ./kintox11
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -2,7 +2,7 @@

 systemctl --user stop keyswap
 systemctl --user disable keyswap
-rm -rf ~/.config/autostart/keyswap.sh
+rm -rf ~/.config/autostart/kinto.desktop
 rm -rf ~/.config/kinto
 rm -rf ~/.xkb

--- a/user_config.json
+++ b/user_config.json
@@ -1,15 +1,43 @@
 {"config":[{
 		"name":"gui",
 		"run":"",
+		"run_onInput":"",
+		"run_offInput": "killall xbindkeys > /dev/null 2>&1",
+		"symbols":"",
+		"types":"",
 		"de":[],
 		"appnames":[ "" ]
 	},
 	{
 		"name":"term",
 		"run":"",
+		"run_onInput":"",
+		"run_offInput": "killall xbindkeys > /dev/null 2>&1",
+		"symbols":"",
+		"types":"",
 		"de":[],
 		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ]
-	}],
+	},
+	{
+        "name": "firefox",
+        "run": "",
+        "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": [],
+        "appnames": [ "Firefox" ]
+    },
+    {
+        "name": "chrome",
+        "run": "",
+        "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": [],
+        "appnames": [ "Chromium","Chromium-browser","Google-chrome" ]
+    }],
 	"init": [],
 	"detypes":["gnome2","gnome3","kde4","kde5","xfce","i3wm"],
 	"de":[{
Author	SHA1	Message	Date
Ben Reaves	ce99f4da23	Merge pull request #34 from rbreaves/dev Added PgUp, PgDn, Home, and End to terminal Cmd+Arrow keys	2020-02-19 02:13:03 -06:00
Ben Reaves	5207428abd	- Added PgUp, PgDn, Home, and End to terminal keymap on Cmd+Up/Dn/Left/Right	2020-02-19 02:08:46 -06:00
Ryan Reaves	b846b29ff1	- Updated script to report back true if there is no program to end or cleanup	2020-02-19 00:32:38 -06:00
Ryan Reaves	1a482e3c8c	- Removed the removal of carets on service restarts, and mention of no carets file found. IBus is optional.	2020-02-18 23:50:45 -06:00
Ryan Reaves	1e0f7259c1	- Updated readme to include a better command to check the systemd log	2020-02-18 22:56:32 -06:00
Ryan Reaves	e6dbd5ea13	- Updated setup.py installer to set the IBus Input Method for the installer if it is not currently set as the default.	2020-02-18 21:20:01 -06:00
Ryan Reaves	6b0f3fc0dd	- Updated readme with more troubleshooting tips	2020-02-18 20:24:05 -06:00
Ryan Reaves	c9bf5c1937	- cleanup script needs to be executable or an error will occur if the service has to be restarted for any reason.	2020-02-18 19:22:12 -06:00
Ryan Reaves	0f0c86af0f	- Added support for standard version of Chrome for linux, not just Chromium	2020-02-18 19:02:45 -06:00
Ryan Reaves	ce937065c9	- Updated installer, some sort of regression on a copy .xkb directory fix.. Also updated readme	2020-02-18 18:57:44 -06:00
Ben Reaves	acf6bd9317	- Updated readme with credits to people who have contributor to this project over time	2020-02-18 17:30:57 -06:00
Ben Reaves	19d58a3a05	Merge branch 'dev'	2020-02-17 23:35:45 -06:00
Ben Reaves	cf8e78073a	- Added Alt+Backspace = Delete key, particularly useful for chromebooks	2020-02-17 23:35:08 -06:00
Ben Reaves	86c5715853	Merge branch 'dev'	2020-02-17 22:01:18 -06:00
Ben Reaves	4e75cfb047	- Updated readme	2020-02-17 22:00:43 -06:00
Ben Reaves	159d2b63f0	- Removed and added comments	2020-02-17 20:52:49 -06:00
Ben Reaves	5a2299d8dc	Merge pull request #33 from rbreaves/dev Full wordwise support for Web Browsers, misc kintox11 optimizations.	2020-02-18 02:29:44 +00:00
Ben Reaves	83ae169fb7	- Added notes about IBus requirement for full wordwise support and added chromium name to json config	2020-02-17 20:22:21 -06:00
Ben Reaves	5c6e42b811	- Fixed caret status script to not over exclude matches	2020-02-17 20:16:53 -06:00
Ben Reaves	cd57efd89b	- Added missing type definition	2020-02-17 16:51:19 -06:00
Ben Reaves	28bad9ed42	- Added proper mac_chrome symbols	2020-02-17 16:40:19 -06:00
Ben Reaves	ddfcd57c6b	- Fixed setup installer	2020-02-17 16:24:54 -06:00
Ben Reaves	4b4fc7fc3f	- Added firefox xbindkeys keymap file for overlaying back and forward buttons over wordwise	2020-02-17 16:20:37 -06:00
Ben Reaves	16c4378c2e	- Added some changes to firefox and app requirements for keybinding browsers	2020-02-17 14:46:34 -06:00
Ben Reaves	9dc026695b	- Fixed chrome keymap issue with xkb and no looping issues	2020-02-17 13:51:46 -06:00
Ben Reaves	c65d68d816	Merge branch 'master' into dev	2020-02-17 12:52:59 -06:00
Ben Reaves	3983107be5	- Fixed copy issue of xkb files, prevented xkb from overwriting previous directory	2020-02-17 12:51:54 -06:00
Ben Reaves	56391169ff	Merge branch 'master' into dev	2020-02-16 20:56:07 -06:00
Ben Reaves	ac5c5f6648	- Added keyboard reset and kill any xbindkeys services running when the kinto keyswap service is stopped via systemctl	2020-02-16 20:54:57 -06:00
Ben Reaves	778d1df1ba	- Additional updates that give Firefox and Chrome separate keymap files due to shortcut differences	2020-02-16 20:11:39 -06:00
Ben Reaves	fbe2451a3c	- Fixed possible issue where the browser keymap would not fully undo if switched out with another app category	2020-02-16 18:11:57 -06:00
Ben Reaves	5a56ea823f	- Added browsers category, input/caret detection, includes xbindkeys, and xautomation for one off fixes	2020-02-16 17:38:50 -06:00
Ben Reaves	5d5d8de92e	- Updated kintox11 to filter out dragging windows	2020-02-16 03:33:51 -06:00
Ben Reaves	086ab8bb35	- Added Input Caret check to kintox11, updated json with run_onInput	2020-02-15 22:48:49 -06:00
Ben Reaves	dc016d9270	- Added timeout to blocking XNextEvent for caret/input check	2020-02-15 21:23:53 -06:00
Ben Reaves	8f1795339e	- Added script to monitor the status of the input caret	2020-02-15 20:12:10 -06:00
Ben Reaves	4fb65d7025	Merge branch 'dev'	2020-02-15 00:09:17 -06:00
Ben Reaves	93daf8707e	- Updated readme to include how to set the keyboard back to normal if the user decides to stop the running service	2020-02-15 00:09:04 -06:00
Ben Reaves	50885a7e78	Merge pull request #31 from rbreaves/dev - Refactored kintox11 to fix multiple app category bug	2020-02-14 18:46:43 +00:00
Ben Reaves	ea60bb6db5	- Refactored kintox11 to fix multiple app category bug	2020-02-14 12:44:34 -06:00
Ben Reaves	4281d97c3d	Merge pull request #30 from alexmyczko/patch-1 Makefile for .c source	2020-02-13 15:16:53 +00:00
Alex Myczko	364536b8ea	Update Makefile	2020-02-13 08:33:01 +01:00
Alex Myczko	2585ab9f45	Update Makefile	2020-02-13 08:21:10 +01:00
Alex Myczko	7969bd007d	Create Makefile	2020-02-13 08:19:13 +01:00
Ben Reaves	5d135afe5e	Merge pull request #29 from rbreaves/dev - word-wise update	2020-02-13 01:58:51 +00:00
Ben Reaves	a4fa9b225e	- word-wise update for Alt+Left/Right to send cursor to begin/end of word while in GUI apps.	2020-02-12 19:53:10 -06:00
Ben Reaves	eac62fb605	- Improved Open Display function to timeout after 60 seconds, fixes possible startup failure on boot for some distros.	2020-02-11 17:36:08 -06:00
Ben Reaves	ab679ddf9d	- Improved Open Display function in kintox11 to retry for 1 minute, may be helpful in some distro configs.	2020-02-11 17:29:05 -06:00
Ben Reaves	f4cef736be	- Updated kintox11 binary to handle errors better in the get top window function	2020-02-11 15:40:16 -06:00
Ben Reaves	2179176881	- The beginnings of a python based xlib implementation of kintox11	2020-02-06 20:05:47 -06:00
Ben Reaves	26f70ccd31	- Updated kintox11 binary to handle errors better in the get top window function	2020-02-06 16:33:23 -06:00
Ben Reaves	0ff7a42f9b	- Updated readme with more troubleshooting tips	2020-02-05 16:29:36 -06:00
Ben Reaves	58da4fcd90	Merge branch 'master' into dev	2020-02-05 16:06:41 -06:00
Ben Reaves	20170f0a7d	- Removed the explicit reference to bin bash in the service file, also removed the Environment variable to avoid issues for when Display is not 0.	2020-02-05 16:05:41 -06:00
Ben Reaves	d90829928b	Merge pull request #27 from rbreaves/dev Fixes tweak selection during install	2020-02-05 21:35:03 +00:00
Ben Reaves	6f913538e8	- Fixed tweak selection in python installer	2020-02-05 15:33:51 -06:00
Ben Reaves	7dfbe884ff	- Added medium article in readme	2020-02-05 14:11:13 -06:00
Ben Reaves	3a115f91ae	Merge branch 'dev'	2020-02-05 14:06:57 -06:00
Ben Reaves	4c218b55bd	- Updated uninstaller to remove kinto.desktop from startup	2020-02-05 14:06:37 -06:00
Ben Reaves	94cd3ed907	Merge pull request #26 from rbreaves/dev Kintox11 binary will now always apply gui keymap on init unless a term app has focus	2020-02-05 19:56:20 +00:00
Ben Reaves	b0bde4fecf	Merge branch 'master' into dev	2020-02-05 13:54:20 -06:00
Ben Reaves	b930b96066	- Fixed kintox11 to always apply gui keymap on initialization unless a term app has focus. (aka boot and user logoff/logon)	2020-02-05 13:52:25 -06:00
Ben Reaves	2df4920344	Merge pull request #25 from rbreaves/dev - Corrected path of systemctl for desktop autostart file	2020-02-05 19:17:40 +00:00
Ben Reaves	ce9c80a02f	- Corrected path of systemctl for desktop autostart file	2020-02-05 13:17:13 -06:00
Ben Reaves	e599562ec1	Merge pull request #24 from rbreaves/dev - Added desktop startup of kinto service	2020-02-05 11:28:15 +00:00
Ben Reaves	b8b81bd907	- Added desktop startup of kinto service	2020-02-05 05:24:40 -06:00
Ben Reaves	22e5462fbc	Merge pull request #23 from rbreaves/dev Updated service	2020-02-05 10:22:55 +00:00
Ben Reaves	72d2007267	- Added restartsec interval on service to 1 second to try and avoid burst limit of systemd	2020-02-05 04:19:44 -06:00
Ben Reaves	3c5b49324c	- Removed the creation of the autostart folder	2020-02-05 04:09:20 -06:00
Ben Reaves	3f37ef6e28	- Added back in the enable command for the keyswap service.	2020-02-05 04:01:17 -06:00
Ben Reaves	35cfcce748	Merge pull request #22 from rbreaves/dev Updated kintox11 binary with better error handling	2020-02-05 09:20:05 +00:00
Ben Reaves	d288048ed4	- Due to updates in kintox11 error handling the services timer is no longer needed, the application will restart properly if it encounters an unrecoverable error on boot, login or any other unexpected event.	2020-02-05 03:01:22 -06:00
Ben Reaves	a30671b08c	- Enabled full error handling	2020-02-05 02:47:53 -06:00
Ben Reaves	2f2afecb6d	- Added more verbosity to kintox11 and added more functions to increase accuracy of the keyswap on all windows	2020-02-05 02:41:47 -06:00
Ben Reaves	072249d5d4	- Corrected chromebook config file and updated the initialization of the keyswap service file to work when re-running the installer on a currently running version of kinto	2020-02-05 00:12:44 -06:00
Ben Reaves	a6b9b1ffbb	Merge pull request #21 from rbreaves/dev - Fixes login/logout and reboot startup issues	2020-02-05 01:48:19 +00:00
Ben Reaves	d8c516c13c	- Fixes login/logout and reboot startup issues, delays the start by 5 seconds	2020-02-04 19:45:39 -06:00
Ben Reaves	b763703d70	Merge pull request #19 from rbreaves/dev App breaking bug resolved and improved initialization on boot	2020-02-04 22:02:38 +00:00
Ben Reaves	ecaf413fa4	- Removed 5 second restart delay, I think the new changes makes it irrelevant	2020-02-04 15:58:09 -06:00
Ben Reaves	48e01750e5	- Fixed breaking bug exception on how gui apps are initially handled. Also improved the initialization of kintox11.	2020-02-04 15:36:26 -06:00
Ben Reaves	5ec8c076a3	- Added more verbosity to the dynamic app output	2020-02-04 14:48:40 -06:00
Ben Reaves	c620b299bd	- Added a more verbose initial startup to kintox11 for easier debugging purposes	2020-02-04 14:41:55 -06:00
Ben Reaves	496cb4d340	- Added O2 optimization to kintox11 binary	2020-02-03 22:52:19 -06:00