From: Andy Spencer Date: Sun, 22 May 2011 11:24:53 +0000 (+0000) Subject: Improve window management X-Git-Url: http://pileus.org/git/?p=wmpus;a=commitdiff_plain;h=ee556f1413d9da165fd6ea74f0bf4039ab28da0d Improve window management Updates to sys-x11: - Add win_t caching - Add existing windows at startup - Watch for added/removed windows Updates to wm-wmii: - Add rows/columns - Update arrangement for added/removed windows - Key based window/focus movement (broken) Misc: - Add linked list util for wm-wmii --- diff --git a/main.c b/main.c index a30fd1c..2d81508 100644 --- a/main.c +++ b/main.c @@ -7,6 +7,7 @@ int main(int argc, char **argv) { + setbuf(stdout, NULL); // debug win_t *root = sys_init(); wm_init(root); sys_run(root); diff --git a/makefile b/makefile index ff5ded7..772d999 100644 --- a/makefile +++ b/makefile @@ -1,17 +1,19 @@ WM=wmii -#SYS=x11 -#CC=gcc -#PROG=awm -#CFLAGS=-g -Wall -Os -#LIBS=-Wl,--as-needed -lX11 -#TEST=DISPLAY=:2.0 +SYS=x11 +CC=gcc +PROG=awm +CFLAGS=-g -Wall -Os +LIBS=-Wl,--as-needed -lX11 +TEST=DISPLAY=:2.0 +ifdef WIN32 SYS=win32 CC=i686-pc-mingw32-gcc CFLAGS=-g -Wall PROG=awm.exe TEST=wine +endif test: $(PROG) $(TEST) ./$< diff --git a/sys-x11.c b/sys-x11.c index 0e55854..ed2a9e4 100644 --- a/sys-x11.c +++ b/sys-x11.c @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -11,7 +12,7 @@ /* Internal structures */ struct win_sys { - Window win; + Window xid; Display *dpy; }; @@ -20,6 +21,9 @@ typedef struct { int sym; } keymap_t; +/* Global data */ +void *win_cache = NULL; + /* Conversion functions */ keymap_t key2sym[] = { {key_left , XK_Left }, @@ -88,100 +92,190 @@ int btn2x(Key_t key) } /* - Pointers */ -ptr_t x2ptr(XEvent _ev) +ptr_t x2ptr(XEvent *_ev) { - XKeyEvent ev = _ev.xkey; - return (ptr_t){ev.x, ev.y, ev.x_root, ev.y_root}; + XKeyEvent *ev = &_ev->xkey; + return (ptr_t){ev->x, ev->y, ev->x_root, ev->y_root}; } /* Helper functions */ -win_t *win_new(Display *xdpy, Window xwin) +win_t *win_new(Display *dpy, Window xid) { - if (!xdpy || !xwin) - return NULL; XWindowAttributes attr; - XGetWindowAttributes(xdpy, xwin, &attr); + XGetWindowAttributes(dpy, xid, &attr); win_t *win = new0(win_t); win->x = attr.x; win->y = attr.y; win->w = attr.width; win->h = attr.height; win->sys = new0(win_sys_t); - win->sys->dpy = xdpy; - win->sys->win = xwin; + win->sys->dpy = dpy; + win->sys->xid = xid; + printf("win_new: %p = %p, %d\n", win, dpy, (int)xid); return win; } -void win_free(win_t *win) +int win_cmp(const void *_a, const void *_b) +{ + const win_t *a = _a, *b = _b; + if (a->sys->dpy < b->sys->dpy) return -1; + if (a->sys->dpy > b->sys->dpy) return 1; + if (a->sys->xid < b->sys->xid) return -1; + if (a->sys->xid > b->sys->xid) return 1; + return 0; +} + +win_t *win_find(Display *dpy, Window xid) +{ + if (!dpy || !xid) + return NULL; + //printf("win_find: %p, %d\n", dpy, (int)xid); + win_sys_t sys = {.dpy=dpy, .xid=xid}; + win_t tmp = {.sys=&sys}; + return *(win_t**)(tfind(&tmp, &win_cache, win_cmp) ?: + tsearch(win_new(dpy,xid), &win_cache, win_cmp)); +} + +void win_remove(win_t *win) { + tdelete(win, &win_cache, win_cmp); free(win->sys); free(win); } +/* Callbacks */ +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; + win = win_find(dpy,xid); + ptr = x2ptr(ev); + mod = x2mod(ev->xkey.state, type==KeyRelease||type==ButtonRelease); + } + + /* Split based on event */ + //printf("event: %d\n", type); + if (type == KeyPress) { + while (XCheckTypedEvent(dpy, KeyPress, ev)); + KeySym sym = XKeycodeToKeysym(dpy, ev->xkey.keycode, 0); + wm_handle_key(win, x2key(sym), mod, ptr); + } + else if (type == KeyRelease) { + //printf("release: %d\n", type); + } + else if (type == ButtonPress) { + wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr); + XGrabPointer(dpy, win->sys->xid, True, PointerMotionMask|ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime); + } + else if (type == ButtonRelease) { + XUngrabPointer(dpy, CurrentTime); + wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr); + } + else if (type == MotionNotify) { + while (XCheckTypedEvent(dpy, MotionNotify, ev)); + wm_handle_ptr(win, ptr); + } + else if (type == ConfigureNotify) { + //printf("configure: %d\n", type); + } + else if (type == MapNotify) { + //printf("map: %d\n", type); + } + else if (type == DestroyNotify) { + //printf("destory: %d\n", type); + win_remove(win_find(dpy,ev->xdestroywindow.window)); + } + else if (type == UnmapNotify) { + //printf("unmap: %d\n", type); + wm_remove(win_find(dpy,ev->xmap.window)); + } + else if (type == ConfigureRequest) { + XConfigureRequestEvent *cre = &ev->xconfigurerequest; + XWindowChanges wc = { + .x = cre->x, .y = cre->y, + .width = cre->width, .height = cre->height, + }; + printf("configure_req: %d - %x, (0x%lx) %dx%d @ %d,%d\n", + type, (int)cre->window, cre->value_mask, + cre->height, cre->width, cre->x, cre->y); + XConfigureWindow(dpy, cre->window, cre->value_mask, &wc); + } + else if (type == MapRequest) { + printf("map_req: %d\n", type); + wm_insert(win_find(dpy,ev->xmaprequest.window)); + XMapWindow(dpy,ev->xmaprequest.window); + } + else { + printf("unknown event: %d\n", type); + } +} + /***************** * Sys functions * *****************/ void sys_move(win_t *win, int x, int y, int w, int h) { - printf("sys_move: %p - %d,%d %dx%d\n", win, x, y, w, h); - XMoveResizeWindow(win->sys->dpy, win->sys->win, x, y, w, h); + //printf("sys_move: %p - %d,%d %dx%d\n", win, x, y, w, h); + win->x = x; win->y = y; + win->w = w; win->h = h; + XMoveResizeWindow(win->sys->dpy, win->sys->xid, x, y, w, h); } void sys_raise(win_t *win) { - printf("sys_raise: %p\n", win); - XRaiseWindow(win->sys->dpy, win->sys->win); + //printf("sys_raise: %p\n", win); + XRaiseWindow(win->sys->dpy, win->sys->xid); +} + +void sys_focus(win_t *win) +{ + //printf("sys_raise: %p\n", win); + XSetInputFocus(win->sys->dpy, win->sys->xid, + RevertToNone, CurrentTime); } void sys_watch(win_t *win, Key_t key, mod_t mod) { if (key_mouse0 <= key && key <= key_mouse7) - XGrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->win, True, + XGrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->xid, True, mod.up ? ButtonReleaseMask : ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None); else XGrabKey(win->sys->dpy, XKeysymToKeycode(win->sys->dpy, key2x(key)), - mod2x(mod), win->sys->win, True, GrabModeAsync, GrabModeAsync); + mod2x(mod), win->sys->xid, True, GrabModeAsync, GrabModeAsync); } win_t *sys_init(void) { - Display *xdpy = XOpenDisplay(NULL); - Window xwin = DefaultRootWindow(xdpy); - return win_new(xdpy, xwin); + Display *dpy = XOpenDisplay(NULL); + Window xid = DefaultRootWindow(dpy); + XSelectInput(dpy, xid, SubstructureNotifyMask|SubstructureRedirectMask); + return win_find(dpy, xid); } void sys_run(win_t *root) { - Display *dpy = root->sys->dpy; + /* Add each initial window */ + unsigned int nkids; + Window par, win, *kids = NULL; + if (XQueryTree(root->sys->dpy, root->sys->xid, + &par, &win, &kids, &nkids)) + for(int i = 0; i < nkids; i++) + wm_insert(win_find(root->sys->dpy, kids[i])); + + /* Main loop */ for(;;) { XEvent ev; - XNextEvent(dpy, &ev); - //printf("event: %d\n", ev.type); - if (ev.type == KeyPress) { - while (XCheckTypedEvent(dpy, KeyPress, &ev)); - KeySym sym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0); - wm_handle_key(win_new(dpy, ev.xkey.subwindow), - x2key(sym), x2mod(ev.xkey.state,0), x2ptr(ev)); - } - else if (ev.type == ButtonPress) { - wm_handle_key(win_new(dpy, ev.xkey.subwindow), - x2btn(ev.xbutton.button), - x2mod(ev.xbutton.state,0), x2ptr(ev)); - XGrabPointer(dpy, ev.xkey.subwindow, True, - PointerMotionMask|ButtonReleaseMask, GrabModeAsync, - GrabModeAsync, None, None, CurrentTime); - } - else if(ev.type == ButtonRelease) { - XUngrabPointer(dpy, CurrentTime); - wm_handle_key(win_new(dpy, ev.xkey.subwindow), - x2btn(ev.xbutton.button), - x2mod(ev.xbutton.state,1), x2ptr(ev)); - } - else if(ev.type == MotionNotify) { - while (XCheckTypedEvent(dpy, MotionNotify, &ev)); - wm_handle_ptr(win_new(dpy, ev.xkey.subwindow), x2ptr(ev)); - } + XNextEvent(root->sys->dpy, &ev); + process_event(ev.type, &ev, root); } } diff --git a/sys.h b/sys.h index e35c9d7..8caaf1d 100644 --- a/sys.h +++ b/sys.h @@ -55,6 +55,8 @@ void sys_raise(win_t *win); void sys_focus(win_t *win); +void sys_foreach(win_t *win); + win_t *sys_init(void); void sys_run(win_t *root); diff --git a/util.c b/util.c index e69de29..98c40c6 100644 --- a/util.c +++ b/util.c @@ -0,0 +1,37 @@ +#include +#include + +#include "util.h" + +list_t *list_insert(list_t *next, void *data) +{ + list_t *node = new0(list_t); + node->data = data; + node->next = next; + node->prev = next ? next->prev : NULL; + if (node->next) node->next->prev = node; + if (node->prev) node->next->next = node; + return node; +} + +list_t *list_remove(list_t *head, list_t *node) +{ + list_t *next = node->next; + list_t *prev = node->prev; + if (next) next->prev = prev; + if (prev) prev->next = next; + free(node); + return head == node ? next : head; +} + +int list_length(list_t *node) +{ + int len = 0; + for (; node; node = node->next) + len++; + return len; +} + +void list_move(list_t *node, int offset) +{ +} diff --git a/util.h b/util.h index 965ca4e..a904783 100644 --- a/util.h +++ b/util.h @@ -1,3 +1,4 @@ +/* Misc macros */ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b)) @@ -5,6 +6,7 @@ #define countof(x) (sizeof(x)/sizeof((x)[0])) +/* Constant lenght map functitons */ #define map_getg(map, test) ({ \ int i; \ for (i = 0; i < countof(map) && !(test); i++); \ @@ -15,3 +17,17 @@ #define map_getr(m,k) map_getg(m,k==*(((typeof(k)*)&m[i+1])-1)) #define map_getk(m,k,a) map_getg(m,k==m[i].a) +/* Linked lists */ +typedef struct list { + struct list *prev; + struct list *next; + void *data; +} list_t; + +list_t *list_insert(list_t *after, void *data); + +list_t *list_remove(list_t *head, list_t *item); + +int list_length(list_t *item); + +void list_move(list_t *item, int offset); diff --git a/wm-wmii.c b/wm-wmii.c index 7a5c5b0..b2deb59 100644 --- a/wm-wmii.c +++ b/wm-wmii.c @@ -1,64 +1,225 @@ #include +#include +#include "util.h" #include "sys.h" #include "wm.h" #define MODKEY ctrl +/* Loca types */ +struct win_wm { + list_t *col; + list_t *row; +}; + typedef enum { none, move, resize -} Mode_t; +} drag_t; -win_t *kwin; -ptr_t kptr; -Mode_t mode; +typedef enum { + stack, split, max, tab +} group_t; -int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr) +typedef struct { + int width; + group_t group; + list_t *wins; +} col_t; + +/* Mouse drag data */ +drag_t move_mode; +win_t *move_win; +ptr_t move_prev; + +/* Window management data */ +list_t *wm_cols; +win_t *wm_root; + +/* Helper functions */ +static void set_mode(drag_t drag, win_t *win, ptr_t ptr) +{ + printf("set_mode: %d - %p@%d,%d\n", + drag, win, ptr.rx, ptr.ry); + move_mode = drag; + if (drag == move || drag == resize) { + move_win = win; + move_prev = ptr; + } +} + +static void print_txt(list_t *cols) { - if (!win) return; - printf("wm_handle_key: %p - %x\n", win, key); + 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) { + win_t *win = wnode->data; + printf(" win:\t%p - %dpx\n", win, win->h); + } + } +} + +static void arrange(list_t *cols) +{ + int x=0, y=0; // Current window top-left position + int tx=0, ty=0; // Total x/y size + int mx=0, my=0; // Maximum x/y size (screen size) + + mx = wm_root->w; + my = wm_root->h; + + /* Scale horizontally */ + for (list_t *lx = cols; lx; lx = lx->next) + tx += ((col_t*)lx->data)->width; + for (list_t *lx = cols; lx; lx = lx->next) + ((col_t*)lx->data)->width *= (float)mx / tx; - kptr = ptr; - kwin = win; + /* 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 += ((win_t*)ly->data)->h; + y = 0; + for (list_t *ly = col->wins; ly; ly = ly->next) { + win_t *win = ly->data; + sys_move(win, x, y, col->width, + win->h * ((float)my / ty)); + y += win->h; + } + x += col->width; + } +} + +static void shift_window(win_t *win, int col, int row) +{ + printf("shift_window: %p - %+d,%+d\n", win, col, row); +} + +static void shift_focus(win_t *win, int col, int row) +{ + printf("shift_focus: %p - %+d,%+d\n", win, col, row); + list_t *node = NULL; + if (row != 0) { + if (row < 0) node = win->wm->row->prev; + if (row > 0) node = win->wm->row->next; + } 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) + sys_focus(node->data); +} + +/* Window management functions */ +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); /* Raise */ if (key == key_f2) return sys_focus(win), 1; if (key == key_f4) return sys_raise(win), 1; - if ((key == key_f1 && mod.MODKEY) || - (key_mouse0 <= key && key <= key_mouse7)) + if (key == key_f1 && mod.MODKEY) + sys_raise(win); + if (key_mouse0 <= key && key <= key_mouse7) sys_raise(win); - /* Movement */ - if (key_mouse0 <= key && key <= key_mouse7 && - mod.up && mode != none) - return mode = none, 1; + /* 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; + 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; + default: break; + } + } + + /* Mouse movement */ + if (key_mouse0 <= key && key <= key_mouse7 && mod.up) + return set_mode(none,win,ptr), 1; else if (key == key_mouse1 && mod.MODKEY) - return mode = move, 1; + return set_mode(move,win,ptr), 1; else if (key == key_mouse3 && mod.MODKEY) - return mode = resize, 1; + return set_mode(resize,win,ptr), 1; return 0; } -int wm_handle_ptr(win_t *win, ptr_t ptr) +int wm_handle_ptr(win_t *cwin, ptr_t ptr) { - printf("wm_handle_ptr: %p - %d,%d %d,%d (%d) -- \n", - win, ptr.x, ptr.y, ptr.rx, ptr.ry, mode); - int dx = ptr.rx - kptr.rx; - int dy = ptr.ry - kptr.ry; - //if (win) sys_focus(win); - if (mode == move) - sys_move(kwin, kwin->x+dx, kwin->y+dy, kwin->w, kwin->h); - else if (mode == resize) - sys_move(kwin, kwin->x, kwin->y, kwin->w+dx, kwin->h+dy); + //printf("wm_handle_ptr: %p - %d,%d %d,%d (%d) -- \n", + // cwin, ptr.x, ptr.y, ptr.rx, ptr.ry, move_mode); + if (move_mode == none) + return 0; + win_t *mwin = move_win; + int dx = ptr.rx - move_prev.rx; + int dy = ptr.ry - move_prev.ry; + move_prev = ptr; + if (move_mode == move) + sys_move(mwin, mwin->x+dx, mwin->y+dy, mwin->w, mwin->h); + else if (move_mode == resize) + sys_move(mwin, mwin->x, mwin->y, mwin->w+dx, mwin->h+dy); return 0; } +void wm_insert(win_t *win) +{ + printf("wm_insert: %p\n", win); + print_txt(wm_cols); + + /* Add to screen */ + col_t *col = wm_cols->data; + int nwins = list_length(col->wins); + col->wins = list_insert(col->wins, 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; + + /* Arrange */ + arrange(wm_cols); + print_txt(wm_cols); +} + +void wm_remove(win_t *win) +{ + printf("wm_remove: %p - (%p,%p)\n", 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); + arrange(wm_cols); + print_txt(wm_cols); +} + void wm_init(win_t *root) { + printf("wm_init: %p\n", root); + wm_root = 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++) + sys_watch(root, keys[i], MOD(.MODKEY=1)); + col_t *col = new0(col_t); + col->group = stack; + col->width = root->w; + wm_cols = list_insert(wm_cols, col); } diff --git a/wm.h b/wm.h index e5e8d76..024faa7 100644 --- a/wm.h +++ b/wm.h @@ -3,3 +3,7 @@ void wm_init(win_t *root); int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr); int wm_handle_ptr(win_t *win, ptr_t ptr); + +void wm_insert(win_t *win); + +void wm_remove(win_t *win);