#include "wm.h"
#define MODKEY ctrl
+#define MARGIN 10
/* Loca types */
struct win_wm {
- list_t *col;
- list_t *row;
+ list_t *col; // node in wm_cols
+ list_t *row; // node in col->rows
};
typedef enum {
typedef struct {
int width;
group_t group;
- list_t *wins;
+ win_t *focus;
+ list_t *rows;
} col_t;
/* Mouse drag data */
-drag_t move_mode;
-win_t *move_win;
-ptr_t move_prev;
+static drag_t move_mode;
+static win_t *move_win;
+static ptr_t move_prev;
/* Window management data */
-list_t *wm_cols;
-win_t *wm_root;
+static win_t *wm_focus;
+static list_t *wm_cols;
+static win_t *wm_root;
/* Helper functions */
+static void set_focus(win_t *win)
+{
+ if (win->wm && win->wm->col)
+ ((col_t*)win->wm->col->data)->focus = win;
+ wm_focus = win;
+ sys_focus(win);
+}
+
static void set_mode(drag_t drag, win_t *win, ptr_t ptr)
{
printf("set_mode: %d - %p@%d,%d\n",
{
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) {
+ printf("col:\t%p - %dpx @ %d !!%p\n", col, col->width, col->group, col->focus);
+ for (list_t *wnode = col->rows; wnode; wnode = wnode->next) {
win_t *win = wnode->data;
- printf(" win:\t%p - %dpx\n", win, win->h);
+ printf(" win:\t^%-9p <%-9p [%p=%p] >%-9p %4dpx focus=%d%d\n",
+ win->wm->col->data,
+ (win->wm->row->prev ? win->wm->row->prev->data : NULL),
+ win->wm->row->data, win,
+ (win->wm->row->next ? win->wm->row->next->data : NULL),
+ win->h, col->focus == win, wm_focus == win);
}
}
}
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 */
+ mx = wm_root->w - (list_length(wm_cols)+1)*MARGIN;
for (list_t *lx = cols; lx; lx = lx->next)
tx += ((col_t*)lx->data)->width;
for (list_t *lx = cols; lx; lx = lx->next)
/* 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) {
+ my = wm_root->h - (list_length(col->rows)+1)*MARGIN;
+ for (list_t *ly = col->rows; ly; ly = ly->next) {
win_t *win = ly->data;
- sys_move(win, x, y, col->width,
+ sys_move(win, x+MARGIN, y+MARGIN,
+ col->width,
win->h * ((float)my / ty));
- y += win->h;
+ y += win->h + MARGIN;
}
- x += col->width;
+ x += col->width + MARGIN;
+ }
+}
+
+static void cut_window(win_t *win)
+{
+ list_t *lrow = win->wm->row;
+ list_t *lcol = win->wm->col;
+ col_t *col = lcol->data;
+
+ col->focus = lrow->prev ? lrow->prev->data :
+ lrow->next ? lrow->next->data : NULL;
+
+ wm_focus = col->focus ? col->focus :
+ lcol->prev ? ((col_t*)lcol->prev->data)->focus :
+ lcol->next ? ((col_t*)lcol->next->data)->focus : NULL;
+
+ col->rows = list_remove(col->rows, lrow);
+ if (col->rows == NULL)
+ wm_cols = list_remove(wm_cols, lcol);
+}
+
+static void put_window(win_t *win, list_t *lcol)
+{
+ col_t *col = lcol->data;
+ int nrows = list_length(col->rows);
+ if (col->focus) {
+ list_insert_after(col->focus->wm->row, win);
+ win->wm->row = col->focus->wm->row->next;
+ } else {
+ col->rows = list_insert(col->rows, win);
+ win->wm->row = col->rows;
+ }
+ win->wm->col = lcol;
+ col->focus = win;
+ wm_focus = win;
+
+ win->h = wm_root->h / MAX(nrows,1);
+ if (nrows == 0) {
+ int ncols = list_length(wm_cols);
+ col->width = wm_root->w / MAX(ncols-1,1);
}
}
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) {
+ cut_window(win);
+ put_window(win, dst);
+ arrange(wm_cols);
+ }
+ }
+ print_txt(wm_cols);
}
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) {
+ col_t *col = node->data;
+ node = col->focus->wm->row;
+ }
}
if (node)
- sys_focus(node->data);
+ set_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);
+ if (!win || win == wm_root) return 0;
+ //printf("wm_handle_key: %p - %x %x\n", win, key, mod);
/* Raise */
if (key == key_f2)
- return sys_focus(win), 1;
+ return set_focus(win), 1;
if (key == key_f4)
return sys_raise(win), 1;
if (key == key_f1 && mod.MODKEY)
sys_raise(win);
+ if (key == key_f12 && mod.MODKEY)
+ print_txt(wm_cols);
if (key_mouse0 <= key && key <= key_mouse7)
sys_raise(win);
/* 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;
}
}
else if (key == key_mouse3 && mod.MODKEY)
return set_mode(resize,win,ptr), 1;
+ /* Focus change */
+ if (key == key_enter)
+ set_focus(win);
+
return 0;
}
{
//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;
+
+ /* Tiling */
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);
+ if (move_mode == resize) {
+ list_t *row = move_win->wm->row;
+ list_t *col = move_win->wm->col;
+ list_t *lower = row->next;
+ list_t *right = col->next;
+ if (lower) {
+ ((win_t*)row->data)->h += dy;
+ ((win_t*)lower->data)->h -= dy;
+ }
+ if (right) {
+ ((col_t*)col->data)->width += dx;
+ ((col_t*)right->data)->width -= dx;
+ }
+ arrange(wm_cols);
+ }
+
+ /* Floating */
+ //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;
}
printf("wm_insert: %p\n", win);
print_txt(wm_cols);
+ /* Watch enter/leave */
+ sys_watch(win, key_enter, MOD());
+
/* Add to screen */
col_t *col = wm_cols->data;
- int nwins = list_length(col->wins);
- col->wins = list_insert(col->wins, win);
+ //col_t *col = wm_focus && wm_focus->wm ?
+ // wm_focus->wm->col->data : wm_cols->data;
+ 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);
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);
+ cut_window(win);
+ if (wm_focus)
+ sys_focus(wm_focus);
arrange(wm_cols);
print_txt(wm_cols);
}
printf("wm_init: %p\n", root);
wm_root = root;
sys_watch(root, key_f1, MOD(.MODKEY=1));
+ sys_watch(root, key_f12, 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, key_enter, MOD());
+ 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;
projects / wmpus / blobdiff