Implement keyboard focus/window movement

diff --git a/sys-x11.c b/sys-x11.c
index ed2a9e4d77bd04004ad0a5591319a726f0118c49..82f140dc1af2485f5804f2d04e0556bc2151d313 100644 (file)
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -21,6 +21,12 @@ typedef struct {
        int   sym;
 } keymap_t;
 
+typedef enum {
+       wm_proto, wm_focus, natoms
+} atom_t;
+
+Atom atoms[natoms];
+
 /* Global data */
 void *win_cache = NULL;
 
@@ -62,10 +68,10 @@ mod_t x2mod(unsigned int state, int up)
 
 unsigned int mod2x(mod_t mod)
 {
-       return mod.alt   ? Mod1Mask    : 0
-            | mod.ctrl  ? ControlMask : 0
-            | mod.shift ? ShiftMask   : 0
-            | mod.win   ? Mod4Mask    : 0;
+       return (mod.alt   ? Mod1Mask    : 0)
+            | (mod.ctrl  ? ControlMask : 0)
+            | (mod.shift ? ShiftMask   : 0)
+            | (mod.win   ? Mod4Mask    : 0);
 }
 
 /* - Keycodes */
@@ -97,6 +103,18 @@ ptr_t x2ptr(XEvent *_ev)
        XKeyEvent *ev = &_ev->xkey;
        return (ptr_t){ev->x, ev->y, ev->x_root, ev->y_root};
 }
+Window getfocus(win_t *root, XEvent *event)
+{
+       int revert;
+       Window focus = PointerRoot;
+       if (event->type == KeyPress || event->type == KeyRelease)
+               XGetInputFocus(root->sys->dpy, &focus, &revert);
+       if (focus == PointerRoot)
+               focus = event->xkey.subwindow;
+       if (focus == None)
+               focus = event->xkey.window;
+       return focus;
+}
 
 /* Helper functions */
 win_t *win_new(Display *dpy, Window xid)
@@ -147,14 +165,13 @@ void win_remove(win_t *win)
 void process_event(int type, XEvent *ev, win_t *root)
 {
        Display  *dpy = root->sys->dpy;
-       Window    rid = root->sys->xid;
 
        /* Common data for all these events ... */
        win_t *win = NULL; ptr_t ptr; mod_t mod;
        if (type == KeyPress    || type == KeyRelease    ||
            type == ButtonPress || type == ButtonRelease ||
            type == MotionNotify) {
-               Window xid = ev->xkey.subwindow ?: rid;
+               Window xid = getfocus(root, ev);
                win = win_find(dpy,xid);
                ptr = x2ptr(ev);
                mod = x2mod(ev->xkey.state, type==KeyRelease||type==ButtonRelease);
@@ -238,12 +255,24 @@ void sys_raise(win_t *win)
 void sys_focus(win_t *win)
 {
        //printf("sys_raise: %p\n", win);
+       XEvent ev = {
+               .type                 = ClientMessage,
+               .xclient.window       = win->sys->xid,
+               .xclient.message_type = atoms[wm_proto],
+               .xclient.format       = 32,
+               .xclient.data.l[0]    = atoms[wm_focus],
+               .xclient.data.l[1]    = CurrentTime,
+       };
        XSetInputFocus(win->sys->dpy, win->sys->xid,
-                       RevertToNone, CurrentTime);
+                       RevertToPointerRoot, CurrentTime);
+       //XSetInputFocus(win->sys->dpy, PointerRoot,
+       //              RevertToPointerRoot, CurrentTime);
+       XSendEvent(win->sys->dpy, win->sys->xid, False, NoEventMask, &ev);
 }
 
 void sys_watch(win_t *win, Key_t key, mod_t mod)
 {
+       //printf("sys_watch: %p - %x %hhx\n", win, key, mod);
        if (key_mouse0 <= key && key <= key_mouse7)
                XGrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->xid, True,
                                mod.up ? ButtonReleaseMask : ButtonPressMask,
@@ -257,6 +286,8 @@ win_t *sys_init(void)
 {
        Display *dpy = XOpenDisplay(NULL);
        Window   xid = DefaultRootWindow(dpy);
+       atoms[wm_proto] = XInternAtom(dpy, "WM_PROTOCOLS",  False);
+       atoms[wm_focus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
        XSelectInput(dpy, xid, SubstructureNotifyMask|SubstructureRedirectMask);
        return win_find(dpy, xid);
 }

diff --git a/util.c b/util.c
index 98c40c68a13e89d317992678da38c8361a617ea9..2099953ddce60d2832e9fe7f6c814e82e4ebfed9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -14,6 +14,18 @@ list_t *list_insert(list_t *next, void *data)
        return node;
 }
 
+list_t *list_append(list_t *head, void *data)
+{
+       list_t *last = head;
+       while (last->next)
+               last = last->next;
+       list_t *node = new0(list_t);
+       node->data = data;
+       node->prev = last;
+       if (last) last->next = node;
+       return last ? head : node;
+}
+
 list_t *list_remove(list_t *head, list_t *node)
 {
        list_t *next = node->next;

diff --git a/util.h b/util.h
index a9047836e094a6864d830f8c91279e9b77a15f37..3c9cb0ab42f3f5fda69a812dafc8a7934e10ed1f 100644 (file)
--- a/util.h
+++ b/util.h
@@ -26,6 +26,8 @@ typedef struct list {
 
 list_t *list_insert(list_t *after, void *data);
 
+list_t *list_append(list_t *before, void *data);
+
 list_t *list_remove(list_t *head, list_t *item);
 
 int list_length(list_t *item);

diff --git a/wm-wmii.c b/wm-wmii.c
index b2deb59745bb5a0c19815f9cecc5023356dce79b..cb5111da7272a73918631dfb4d8ef8adfd782336 100644 (file)
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -24,7 +24,7 @@ typedef enum {
 typedef struct {
        int     width;
        group_t group;
-       list_t *wins;
+       list_t *rows;
 } col_t;
 
 /* Mouse drag data */
@@ -53,7 +53,7 @@ static void print_txt(list_t *cols)
        for (list_t *cnode = cols; cnode; cnode = cnode->next) {
                col_t *col = cnode->data;
                printf("col:\t%p - %dpx @ %d\n", col, col->width, col->group);
-               for (list_t *wnode = col->wins; wnode; wnode = wnode->next) {
+               for (list_t *wnode = col->rows; wnode; wnode = wnode->next) {
                        win_t *win = wnode->data;
                        printf("  win:\t%p - %dpx\n", win, win->h);
                }
@@ -78,10 +78,11 @@ static void arrange(list_t *cols)
        /* Scale each column vertically */
        for (list_t *lx = cols; lx; lx = lx->next) {
                col_t *col = lx->data;
-               for (list_t *ly = col->wins; ly; ly = ly->next)
+               ty = 0;
+               for (list_t *ly = col->rows; ly; ly = ly->next)
                        ty += ((win_t*)ly->data)->h;
                y = 0;
-               for (list_t *ly = col->wins; ly; ly = ly->next) {
+               for (list_t *ly = col->rows; ly; ly = ly->next) {
                        win_t *win = ly->data;
                        sys_move(win, x, y, col->width,
                                win->h * ((float)my / ty));
@@ -94,6 +95,50 @@ static void arrange(list_t *cols)
 static void shift_window(win_t *win, int col, int row)
 {
        printf("shift_window: %p - %+d,%+d\n", win, col, row);
+       print_txt(wm_cols);
+       printf("shift_window: >>>\n");
+       if (row != 0) {
+               list_t *src = win->wm->row, *dst = NULL;
+               if (row < 0) dst = src->prev;
+               if (row > 0) dst = src->next;
+               if (src && dst) {
+                       printf("swap: %p <-> %p\n", src->data, dst->data);
+                       src->data = dst->data;
+                       dst->data = win;
+                       ((win_t*)src->data)->wm->row = src;
+                       ((win_t*)dst->data)->wm->row = dst;
+                       arrange(wm_cols);
+               }
+       } else {
+               int onlyrow = !win->wm->row->prev && !win->wm->row->next;
+               list_t *src = win->wm->col, *dst = NULL;
+               if (col < 0) {
+                       if (!src->prev && !onlyrow)
+                               wm_cols = list_insert(wm_cols, new0(col_t));
+                       dst = src->prev;
+               }
+               if (col > 0) {
+                       if (!src->next && !onlyrow)
+                               wm_cols = list_append(wm_cols, new0(col_t));
+                       dst = src->next;
+               }
+               if (src && dst) {
+                       col_t *scol = src->data;
+                       col_t *dcol = dst->data;
+                       scol->rows = list_remove(scol->rows, win->wm->row);
+                       dcol->rows = list_insert(dcol->rows, win);
+                       win->wm->row = dcol->rows;
+                       win->wm->col = dst;
+                       if (onlyrow) // delete column
+                               wm_cols = list_remove(wm_cols, src);
+                       if (dcol->width == 0) // new column
+                               dcol->width = wm_root->w / (list_length(wm_cols)-1);
+                       else
+                               win->h      = wm_root->h / (list_length(dcol->rows)-1);
+                       arrange(wm_cols);
+               }
+       }
+       print_txt(wm_cols);
 }
 
 static void shift_focus(win_t *win, int col, int row)
@@ -106,7 +151,7 @@ static void shift_focus(win_t *win, int col, int row)
        } else {
                if (col < 0) node = win->wm->col->prev;
                if (col > 0) node = win->wm->col->next;
-               if (node) node = ((col_t*)node->data)->wins;
+               if (node) node = ((col_t*)node->data)->rows;
        }
        if (node)
                sys_focus(node->data);
@@ -116,7 +161,7 @@ static void shift_focus(win_t *win, int col, int row)
 int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 {
        if (!win) return 0;
-       //printf("wm_handle_key: %p - %x\n", win, key);
+       //printf("wm_handle_key: %p - %x %x\n", win, key, mod);
 
        /* Raise */
        if (key == key_f2)
@@ -131,19 +176,19 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
        /* Key commands */
        if (mod.MODKEY && mod.shift) {
                switch (key) {
-               case 'h': case 'H': return shift_window(win,-1, 0), 1;
-               case 'k': case 'K': return shift_window(win, 0,-1), 1;
-               case 'j': case 'J': return shift_window(win,+1, 0), 1;
-               case 'l': case 'L': return shift_window(win, 0,+1), 1;
+               case 'h': return shift_window(win,-1, 0), 1;
+               case 'j': return shift_window(win, 0,+1), 1;
+               case 'k': return shift_window(win, 0,-1), 1;
+               case 'l': return shift_window(win,+1, 0), 1;
                default: break;
                }
        }
        else if (mod.MODKEY) {
                switch (key) {
-               case 'h': case 'H': return shift_focus(win,-1, 0), 1;
-               case 'k': case 'K': return shift_focus(win, 0,-1), 1;
-               case 'j': case 'J': return shift_focus(win,+1, 0), 1;
-               case 'l': case 'L': return shift_focus(win, 0,+1), 1;
+               case 'h': return shift_focus(win,-1, 0), 1;
+               case 'j': return shift_focus(win, 0,+1), 1;
+               case 'k': return shift_focus(win, 0,-1), 1;
+               case 'l': return shift_focus(win,+1, 0), 1;
                default: break;
                }
        }
@@ -183,14 +228,14 @@ void wm_insert(win_t *win)
 
        /* Add to screen */
        col_t *col = wm_cols->data;
-       int nwins = list_length(col->wins);
-       col->wins = list_insert(col->wins, win);
+       int nrows = list_length(col->rows);
+       col->rows = list_insert(col->rows, win);
 
        /* Setup window */
        win->wm = new0(win_wm_t);
        win->wm->col = wm_cols;
-       win->wm->row = col->wins;
-       if (nwins) win->h = wm_root->h / nwins;
+       win->wm->row = col->rows;
+       if (nrows) win->h = wm_root->h / nrows;
 
        /* Arrange */
        arrange(wm_cols);
@@ -203,7 +248,7 @@ void wm_remove(win_t *win)
                        win->wm->col, win->wm->row);
        print_txt(wm_cols);
        col_t *col = win->wm->col->data;
-       col->wins = list_remove(col->wins, win->wm->row);
+       col->rows = list_remove(col->rows, win->wm->row);
        arrange(wm_cols);
        print_txt(wm_cols);
 }
@@ -215,9 +260,11 @@ void wm_init(win_t *root)
        sys_watch(root, key_f1,     MOD(.MODKEY=1));
        sys_watch(root, key_mouse1, MOD(.MODKEY=1));
        sys_watch(root, key_mouse3, MOD(.MODKEY=1));
-       key_t keys[] = {'h', 'j', 'k', 'l', 'H', 'J', 'K', 'L'};
-       for (int i = 0; i < countof(keys); i++)
+       key_t keys[] = {'h', 'j', 'k', 'l'};
+       for (int i = 0; i < countof(keys); i++) {
                sys_watch(root, keys[i], MOD(.MODKEY=1));
+               sys_watch(root, keys[i], MOD(.MODKEY=1,.shift=1));
+       }
        col_t *col = new0(col_t);
        col->group = stack;
        col->width = root->w;