- Updated readme to include debug mode

- Added debug parameter

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.
 
@@ -481,6 +481,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.
 

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 2>&1 | grep -v XF86FullScreen",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"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 2>&1 | grep -v XF86FullScreen",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"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 2>&1 | grep -v XF86FullScreen",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"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 2>&1 | grep -v XF86FullScreen",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"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 2>&1 | grep -v XF86FullScreen; setxkbmap -device $usbid -option altwin:ctrl_alt_win",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
-		"fallbackgui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"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 2>&1 | grep -v XF86FullScreen",
-		"term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY 2>&1 | grep -v XF86FullScreen",
+		"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

@@ -16,10 +16,10 @@ 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
 sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
 systemctl --user enable keyswap.timer

kintox11/src/kintox11.c

@@ -15,6 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <locale.h>
 #include <string.h>
 #include <ctype.h>
@@ -175,15 +176,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 == 17 || etype == 18)) {
+    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,7 +206,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, char const *eventName, char const *current_app, bool debug){
   Window w = start;
   Window parent = start;
   Window root = None;
@@ -202,32 +214,52 @@ Window get_top_window(Display* d, Window start){
   unsigned int nchildren;
   Status s;
 
-  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 == 17 || etype == 18)) {
     w = parent;
+
     s = XQueryTree(d, w, &root, &parent, &children, &nchildren); // see man
 
+    if(debug == true){
+      printf("  -%s: event: %d, window_id: %ld\n",current_app,etype,w);
+    }
+
     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);
+  // printf("hello\n");
 
   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 +290,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 +508,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 +561,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 +574,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 +603,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;
         }
@@ -535,8 +623,10 @@ int main(void){
         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(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 +636,16 @@ 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
+    // Dismiss the following events by initiating another XNextEvent
+    while(e.type == 17 || e.type == 18){
+      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

@@ -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")