Merge pull request #81 from rbreaves/hotfix

- 3 Fixes, ibus install logic, kde-init, display env set

README.md

@@ -1,11 +1,11 @@
 # 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. \-
 
 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.
@@ -14,9 +14,9 @@ Seamless copy and paste with all apps and terminals. Also the only linux remappe
 
 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.
 
@@ -28,13 +28,11 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following
 - IBus*
 - Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+
 
-If you need kintox11 recompiled for your distro please let me know and I will add a binary for your distro if my binary fails.
-
-You can also attempt to compile kintox11.c on your system as well, but you will need to compile and install json-c first as its libraries will be required to compile and run the program.
+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.
 
-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.
 
@@ -63,6 +61,71 @@ 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.
@@ -354,40 +417,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 (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
-```
-
 ## 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.

defaults.json

@@ -9,8 +9,8 @@
 		"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_win)+mac_term(mac_global)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
@@ -22,8 +22,8 @@
 		"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_win)+mac_term(mac_global)",
 		"xkb_types_gui":"+mac_gui(addmac_levels)",
@@ -36,8 +36,8 @@
 		"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_apple)+mac_term(mac_global)",
 		"xkb_types_gui":"+mac_gui(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

@@ -8,6 +8,7 @@ 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
@@ -15,10 +16,11 @@ 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
+# 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

@@ -194,7 +194,7 @@ 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, int last_event, char const *current_app){
   Window w = start;
   Window parent = start;
   Window root = None;
@@ -202,22 +202,27 @@ Window get_top_window(Display* d, Window start){
   unsigned int nchildren;
   Status s;
 
-  while (parent != root && parent != 0) {
+  // 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 == 17 || etype == 18)) {
     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("fail to get top window: %ld, e.type: %d, last_event: %d, current_app: %s\n",w,etype,last_event, current_app);
+      break;
     }
 
     // printf("  get parent (window: %d)\n", (int)w);
   }
 
   // printf("success (window: %d)\n", (int)w);
+  // printf("hello\n");
 
   return w;
 }
@@ -431,7 +436,7 @@ int main(void){
 
   // get active window
   w = get_focus_window(d);
-  w = get_top_window(d, w);
+  w = get_top_window(d, w, 0, 0, current_app);
   w = get_named_window(d, w);
 
   // XFetchName(d, w, &name);
@@ -546,8 +551,35 @@ int main(void){
       }
     }
 
+    // if(strcicmp(current_app, "plasmashell") == 0){
+    //   XNextEvent(d, &e);
+    // }
+    // if(strcicmp(current_app, "plasmashell") == 0 && e.type == 18 && last_event == 22){
+    //   XNextEvent(d, &e);
+    // }
+    // if(strcicmp(prior_app, "plasmashell") == 0){
+    //   XNextEvent(d, &e);
+    // }
+    // if(strcicmp(current_app, "dolphin") == 0){
+    //   XNextEvent(d, &e);
+    // }
+    // if(strcicmp(prior_app, "dolphin") == 0){
+    //   XNextEvent(d, &e);
+    // }
+    // if(strcicmp(current_app, "dolphin") == 0  && e.type == 18 && last_event == 16){
+    //   XNextEvent(d, &e);
+    // }
+
+    // Reference http://www.rahul.net/kenton/xproto/xevents_errors.html
+    // event type 17 - DestroyNotify
+    // event type 18 - UnmapNotify
+    // Dismiss the following events by initiating another XNextEvent
+    while(e.type == 17 || e.type == 18){
+      XNextEvent(d, &e);
+    }
+
     w = get_focus_window(d);
-    w = get_top_window(d, w);
+    w = get_top_window(d, w, e.type, last_event, current_app);
     w = get_named_window(d, w);
   }
 }

setup.py

@@ -86,11 +86,9 @@ if len(check_ibus) == 0:
 if runpkg != 0:
 	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:
@@ -215,7 +213,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.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