Merge pull request #29 from rbreaves/dev

- word-wise update

.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> {

.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";
     };
 };

README.md

@@ -165,19 +165,41 @@ 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 -xe
+```
+
+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.
 

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())

kintox11/src/kintox11.c

@@ -18,6 +18,7 @@
 #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`
@@ -58,9 +59,20 @@ 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;
@@ -100,16 +112,15 @@ Window get_top_window(Display* d, Window start){
   unsigned int nchildren;
   Status s;
 
-  // printf("getting top window ... \n");
-  while (parent != root) {
+  while (parent != root && parent != 0) {
     w = parent;
     s = XQueryTree(d, w, &root, &parent, &children, &nchildren); // see man
 
     if (s)
       XFree(children);
 
-    if(xerror || w == 0){
-      printf("fail\n");
+    if(xerror){
+      printf("fail to get top window: %ld\n",w);
       exit(1);
     }