#include "sys.h"
#include "wm.h"
-#define MODKEY ctrl
-#define MARGIN 10
+#define MODKEY alt
+#define MARGIN 0
+#define STACK 25
/* Loca types */
struct win_wm {
} drag_t;
typedef enum {
- stack, split, max, tab
-} group_t;
+ split, stack, max, tab
+} mode_t;
typedef struct {
int width;
- group_t group;
+ mode_t mode;
win_t *focus;
list_t *rows;
} col_t;
static drag_t move_mode;
static win_t *move_win;
static ptr_t move_prev;
+static struct { int v, h; } move_dir;
/* Window management data */
static win_t *wm_focus;
static win_t *wm_root;
/* Helper functions */
+static void set_mode(win_t *win, mode_t mode)
+{
+ if (!win->wm || !win->wm->col)
+ return;
+ col_t *col = win->wm->col->data;
+ printf("set_mode: %p (%p), %d -> %d\n",
+ win, col, col->mode, mode);
+ col->mode = mode;
+ if (col->mode == split)
+ for (list_t *cur = col->rows; cur; cur = cur->next) {
+ win_t *row = cur->data;
+ row->h = wm_root->h;
+ }
+ wm_update();
+}
+
static void set_focus(win_t *win)
{
if (win->wm && win->wm->col)
((col_t*)win->wm->col->data)->focus = win;
+
+ /* - Only grab mouse button on unfocused window,
+ * this prevents stealing all mouse clicks from client windows,
+ * - A better way may be to re-send mouse clicks to client windows
+ * using the return value from wm_handle_key */
+ for (int i = key_mouse1; i < key_mouse7; i++) {
+ if (wm_focus)
+ sys_watch(wm_focus, i, MOD());
+ sys_unwatch(win, i, MOD());
+ }
+
wm_focus = win;
sys_focus(win);
}
-static void set_mode(drag_t drag, win_t *win, ptr_t ptr)
+static void set_move(win_t *win, ptr_t ptr, drag_t drag)
{
- printf("set_mode: %d - %p@%d,%d\n",
+ printf("set_move: %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;
+ int my = win->y + (win->h/2);
+ int mx = win->x + (win->w/2);
+ move_dir.v = ptr.ry < my ? -1 : +1;
+ move_dir.h = ptr.rx < mx ? -1 : +1;
}
}
( lcol->prev ? lcol->prev->data : NULL ),
col,
( lcol->next ? lcol->next->data : NULL ),
- col->width, col->group, col->focus);
+ col->width, col->mode, col->focus);
for (list_t *lrow = col->rows; lrow; lrow = lrow->next) {
win_t *win = lrow->data;
printf(" win:\t^%-9p <%-9p [%p=%p] >%-9p - %4dpx focus=%d%d\n",
}
}
-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)
-
-
- /* 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)
- ((col_t*)lx->data)->width *= (float)mx / tx;
-
- /* Scale each column vertically */
- for (list_t *lx = cols; lx; lx = lx->next) {
- col_t *col = lx->data;
- ty = 0;
- for (list_t *ly = col->rows; ly; ly = ly->next)
- ty += ((win_t*)ly->data)->h;
- y = 0;
- 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+MARGIN, y+MARGIN,
- col->width,
- win->h * ((float)my / ty));
- y += win->h + MARGIN;
- }
- x += col->width + MARGIN;
- }
-}
-
static void cut_window(win_t *win)
{
list_t *lrow = win->wm->row;
dst->data = win;
((win_t*)src->data)->wm->row = src;
((win_t*)dst->data)->wm->row = dst;
- arrange(wm_cols);
+ wm_update();
}
} else {
int onlyrow = !win->wm->row->prev && !win->wm->row->next;
if (src && dst) {
cut_window(win);
put_window(win, dst);
- arrange(wm_cols);
+ wm_update();
}
}
print_txt(wm_cols);
}
+static list_t *get_next(list_t *list, int forward)
+{
+ list_t *next = forward ? list->next : list->prev;
+ if (next == NULL)
+ while ((list = forward ? list->prev : list->next))
+ next = list;
+ return next;
+}
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) {
- col_t *col = node->data;
- node = col->focus->wm->row;
- }
+ set_focus(get_next(win->wm->row, row > 0)->data);
+ if (((col_t*)win->wm->col->data)->mode != split)
+ wm_update();
+ }
+ if (col != 0) {
+ col_t *next = get_next(win->wm->col, col > 0)->data;
+ set_focus(next->focus->wm->row->data);
}
- if (node)
- set_focus(node->data);
}
/* Window management functions */
+void wm_update(void)
+{
+ 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)
+ int sy=0; // Size of focused stack window
+
+ /* Scale horizontally */
+ x = wm_root->x;
+ mx = wm_root->w - (list_length(wm_cols)+1)*MARGIN;
+ for (list_t *lx = wm_cols; lx; lx = lx->next)
+ tx += ((col_t*)lx->data)->width;
+ for (list_t *lx = wm_cols; lx; lx = lx->next)
+ ((col_t*)lx->data)->width *= (float)mx / tx;
+
+ /* Scale each column vertically */
+ for (list_t *lx = wm_cols; lx; lx = lx->next) {
+ col_t *col = lx->data;
+ ty = 0;
+ for (list_t *ly = col->rows; ly; ly = ly->next)
+ ty += ((win_t*)ly->data)->h;
+ y = wm_root->y;
+ my = wm_root->h - (list_length(col->rows)+1)*MARGIN;
+ sy = my - (list_length(col->rows)-1)*STACK;
+ for (list_t *ly = col->rows; ly; ly = ly->next) {
+ win_t *win = ly->data;
+ int height = 0;
+ switch (col->mode) {
+ case split:
+ sys_move(win, x+MARGIN, y+MARGIN,
+ col->width, win->h * ((float)my / ty));
+ height = win->h;
+ break;
+ case stack:
+ height = col->focus == win ? sy : STACK;
+ sys_move(win, x+MARGIN, y+MARGIN,
+ col->width, height);
+ break;
+ case max:
+ case tab:
+ sys_move(win, x+MARGIN, 0+MARGIN,
+ col->width, wm_root->h-2*MARGIN);
+ if (col->focus == win)
+ sys_raise(win);
+ break;
+ }
+ y += height + MARGIN;
+ }
+ x += col->width + MARGIN;
+ }
+}
+
int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
{
if (!win || win == wm_root) return 0;
- //printf("wm_handle_key: %p - %x %x\n", win, key, mod);
+ //printf("wm_handle_key: %p - %x %c%c%c%c%c\n", win, key,
+ // mod.up ? '^' : 'v',
+ // mod.alt ? 'a' : '-',
+ // mod.ctrl ? 'c' : '-',
+ // mod.shift ? 's' : '-',
+ // mod.win ? 'w' : '-');
- /* Raise */
- if (key == key_f2)
- 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);
+ /* Mouse movement */
+ if (key_mouse0 <= key && key <= key_mouse7 && mod.up)
+ return set_move(win,ptr,none), 1;
+ else if (key == key_mouse1 && mod.MODKEY)
+ return set_move(win,ptr,move), 1;
+ else if (key == key_mouse3 && mod.MODKEY)
+ return set_move(win,ptr,resize), 1;
+
+ /* Only handle key-down */
+ if (mod.up)
+ return 0;
+
+ /* Misc */
+ if (mod.MODKEY) {
+ if (key == key_f1) return sys_raise(win), 1;
+ if (key == key_f2) return set_focus(win), 1;
+ if (key == key_f5) return wm_update(), 1;
+ if (key == key_f6) return print_txt(wm_cols), 1;
+ }
if (key_mouse0 <= key && key <= key_mouse7)
sys_raise(win);
- /* Key commands */
+ /* Movement commands */
if (mod.MODKEY && mod.shift) {
switch (key) {
case 'h': return shift_window(win,-1, 0), 1;
}
}
- /* 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 set_mode(move,win,ptr), 1;
- else if (key == key_mouse3 && mod.MODKEY)
- return set_mode(resize,win,ptr), 1;
+ /* Column mode commands */
+ if (mod.MODKEY) {
+ switch (key) {
+ case 'd': return set_mode(win, split), 1;
+ case 's': return set_mode(win, stack), 1;
+ case 'm': return set_mode(win, max), 1;
+ case 't': return set_mode(win, tab), 1;
+ default: break;
+ }
+ }
/* Focus change */
if (key == key_enter)
- set_focus(win);
+ return set_focus(win), 1;
+
+ if (key_mouse0 <= key && key <= key_mouse7)
+ return set_focus(win), 0;
+
+ /* Reset focus after after focus change,
+ * not sure what is causing the focus change in the first place
+ * but preventing that would be a better solution */
+ if (key == key_focus)
+ set_focus(wm_focus);
return 0;
}
int dy = ptr.ry - move_prev.ry;
move_prev = ptr;
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;
+ list_t *row = move_win->wm->row;
+ list_t *col = move_win->wm->col;
+ list_t *vert = move_dir.v < 0 ? row->prev : row->next;
+ list_t *horz = move_dir.h < 0 ? col->prev : col->next;
+ if (vert) {
+ ((win_t*)row->data)->h += move_dir.v * dy;
+ ((win_t*)vert->data)->h -= move_dir.v * dy;
}
- if (right) {
- ((col_t*)col->data)->width += dx;
- ((col_t*)right->data)->width -= dx;
+ if (horz) {
+ ((col_t*)col->data)->width += move_dir.h * dx;
+ ((col_t*)horz->data)->width -= move_dir.h * dx;
}
- arrange(wm_cols);
+ wm_update();
}
/* Floating */
/* Initialize window */
win->wm = new0(win_wm_t);
sys_watch(win, key_enter, MOD());
+ sys_watch(win, key_focus, MOD());
/* Add to screen */
list_t *lcol = wm_focus && wm_focus->wm ?
put_window(win, lcol);
/* Arrange */
- arrange(wm_cols);
+ wm_update();
+ sys_focus(wm_focus);
print_txt(wm_cols);
}
sys_focus(wm_focus);
else
sys_focus(wm_root);
- arrange(wm_cols);
+ wm_update();
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));
- 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));
- }
+ Key_t keys_e[] = {key_enter, key_focus};
+ Key_t keys_s[] = {'h', 'j', 'k', 'l'};
+ Key_t keys_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't',
+ key_f1, key_f2, key_f5, key_f6, key_mouse1, key_mouse3};
+ for (int i = 0; i < countof(keys_e); i++)
+ sys_watch(root, keys_e[i], MOD());
+ for (int i = 0; i < countof(keys_m); i++)
+ sys_watch(root, keys_m[i], MOD(.MODKEY=1));
+ for (int i = 0; i < countof(keys_s); i++)
+ sys_watch(root, keys_s[i], MOD(.MODKEY=1,.shift=1));
}
projects / wmpus / blobdiff