X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wm-wmii.c;h=3ad2d8c2d58e4fe0930d8a4eea9b402139dbf604;hb=72a400120ca5df2a559ff2a525515861e2012cdc;hp=88789e69a4f8a64a708148e8deaf3a2158312eb6;hpb=799b23dab51822bd9a4156497c0fe4236bd53c76;p=wmpus

diff --git a/wm-wmii.c b/wm-wmii.c
index 88789e6..3ad2d8c 100644
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -5,12 +5,14 @@
 #include "sys.h"
 #include "wm.h"
 
-#define MODKEY ctrl
+#define MODKEY alt
+#define MARGIN 10
+#define STACK  20
 
 /* 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 {
@@ -18,28 +20,54 @@ typedef enum {
 } 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;
 
 /* 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_mode(drag_t drag, win_t *win, ptr_t ptr)
+static void set_mode(win_t *win, mode_t mode)
 {
-	printf("set_mode: %d - %p@%d,%d\n",
+	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;
+	wm_focus = win;
+	sys_focus(win);
+}
+
+static void set_move(drag_t drag, win_t *win, ptr_t ptr)
+{
+	printf("set_move: %d - %p@%d,%d\n",
 			drag, win, ptr.rx, ptr.ry);
 	move_mode = drag;
 	if (drag == move || drag == resize) {
@@ -50,45 +78,65 @@ static void set_mode(drag_t drag, win_t *win, ptr_t ptr)
 
 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->rows; wnode; wnode = wnode->next) {
-			win_t *win = wnode->data;
-			printf("  win:\t%p - %dpx\n", win, win->h);
+	for (list_t *lcol = cols; lcol; lcol = lcol->next) {
+		col_t *col = lcol->data;
+		printf("col:\t           <%-9p [%-19p] >%-9p  -  %dpx @ %d !!%p\n",
+				( lcol->prev ? lcol->prev->data : NULL ),
+				col,
+				( lcol->next ? lcol->next->data : NULL ),
+				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",
+					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);
 		}
 	}
 }
 
-static void arrange(list_t *cols)
+static void cut_window(win_t *win)
 {
-	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)
+	list_t *lrow = win->wm->row;
+	list_t *lcol = win->wm->col;
+	col_t  *col  = lcol->data;
 
-	mx = wm_root->w;
-	my = wm_root->h;
+	col->focus = lrow->prev ? lrow->prev->data  :
+	             lrow->next ? lrow->next->data  : NULL;
 
-	/* 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;
+	wm_focus   = col->focus ? col->focus        :
+	             lcol->prev ? ((col_t*)lcol->prev->data)->focus :
+	             lcol->next ? ((col_t*)lcol->next->data)->focus : NULL;
 
-	/* 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;
-		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));
-			y += win->h;
-		}
-		x += col->width;
+	col->rows  = list_remove(col->rows, lrow);
+	if (col->rows == NULL && (lcol->next || lcol->prev))
+		wm_cols = list_remove(wm_cols, lcol);
+}
+
+static void put_window(win_t *win, list_t *lcol)
+{
+	if (lcol == NULL)
+		lcol = wm_cols = list_insert(wm_cols, new0(col_t));
+
+	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);
 	}
 }
 
@@ -107,7 +155,7 @@ static void shift_window(win_t *win, int col, int 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;
@@ -123,19 +171,9 @@ static void shift_window(win_t *win, int col, int row)
 			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);
+			cut_window(win);
+			put_window(win, dst);
+			wm_update();
 		}
 	}
 	print_txt(wm_cols);
@@ -145,35 +183,97 @@ 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;
+	int update = 0;
 	if (row != 0) {
 		if (row < 0) node = win->wm->row->prev;
 		if (row > 0) node = win->wm->row->next;
+		if (((col_t*)win->wm->col->data)->mode != split)
+			update = 1;
 	} else {
 		if (col < 0) node = win->wm->col->prev;
 		if (col > 0) node = win->wm->col->next;
-		if (node) node = ((col_t*)node->data)->rows;
+		if (node) {
+			col_t *col = node->data;
+			node = col->focus->wm->row;
+		}
 	}
 	if (node)
-		sys_focus(node->data);
+		set_focus(node->data);
+	if (update)
+		wm_update();
 }
 
 /* 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) return 0;
+	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 */
+	/* Movement commands */
 	if (mod.MODKEY && mod.shift) {
 		switch (key) {
 		case 'h': return shift_window(win,-1, 0), 1;
@@ -193,17 +293,34 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 		}
 	}
 
+	/* 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;
+		}
+	}
+
 	/* Mouse movement */
 	if (key_mouse0 <= key && key <= key_mouse7 && mod.up)
-		return set_mode(none,win,ptr), 1;
+		return set_move(none,win,ptr), 1;
 	else if (key == key_mouse1 && mod.MODKEY)
-		return set_mode(move,win,ptr), 1;
+		return set_move(move,win,ptr), 1;
 	else if (key == key_mouse3 && mod.MODKEY)
-		return set_mode(resize,win,ptr), 1;
+		return set_move(resize,win,ptr), 1;
 
 	/* Focus change */
-	if (key == key_enter)
-		sys_focus(win);
+	if (key == key_enter || (key_mouse0 <= key && key <= key_mouse7))
+		set_focus(win);
+
+	/* 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;
 }
@@ -233,7 +350,7 @@ int wm_handle_ptr(win_t *cwin, ptr_t ptr)
 			((col_t*)col->data)->width   += dx;
 			((col_t*)right->data)->width -= dx;
 		}
-		arrange(wm_cols);
+		wm_update();
 	}
 
 	/* Floating */
@@ -254,22 +371,19 @@ void wm_insert(win_t *win)
 	printf("wm_insert: %p\n", win);
 	print_txt(wm_cols);
 
-	/* Watch enter/leave */
+	/* Initialize window */
+	win->wm = new0(win_wm_t);
 	sys_watch(win, key_enter, MOD());
+	sys_watch(win, key_focus, MOD());
 
 	/* Add to screen */
-	col_t *col = 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->rows;
-	if (nrows) win->h = wm_root->h / nrows;
+	list_t *lcol = wm_focus && wm_focus->wm ?
+		wm_focus->wm->col : wm_cols;
+	put_window(win, lcol);
 
 	/* Arrange */
-	arrange(wm_cols);
+	wm_update();
+	sys_focus(wm_focus);
 	print_txt(wm_cols);
 }
 
@@ -278,9 +392,12 @@ 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->rows = list_remove(col->rows, win->wm->row);
-	arrange(wm_cols);
+	cut_window(win);
+	if (wm_focus)
+		sys_focus(wm_focus);
+	else
+		sys_focus(wm_root);
+	wm_update();
 	print_txt(wm_cols);
 }
 
@@ -289,16 +406,17 @@ 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_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));
-	}
-	col_t *col = new0(col_t);
-	col->group = stack;
-	col->width = root->w;
-	wm_cols = list_insert(wm_cols, col);
+	sys_watch(root, key_focus,  MOD());
+	Key_t keys_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't'};
+	Key_t keys_s[] = {'h', 'j', 'k', 'l'};
+	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));
+	for (int i = key_mouse1; i < key_mouse7; i++)
+		sys_watch(root, i, MOD());
 }