X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wm-wmii.c;h=c9ea15bb96c7a9d62bba0312610b0703463329b0;hb=5c5c67d14ad1789cbcd090f04cddd37aab39d979;hp=c754226e400822a09ed2d8eb6ea4e2a88f4e89ba;hpb=5dd54ab27b27c888741e5700aad89226009eb449;p=wmpus

diff --git a/wm-wmii.c b/wm-wmii.c
index c754226..c9ea15b 100644
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -5,12 +5,13 @@
 #include "sys.h"
 #include "wm.h"
 
-#define MODKEY alt
+#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 {
@@ -24,6 +25,7 @@ typedef enum {
 typedef struct {
 	int     width;
 	group_t group;
+	win_t  *focus;
 	list_t *rows;
 } col_t;
 
@@ -33,10 +35,19 @@ static win_t *move_win;
 static ptr_t  move_prev;
 
 /* Window management data */
+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",
@@ -50,12 +61,21 @@ 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->group, 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);
 		}
 	}
 }
@@ -66,10 +86,9 @@ static void arrange(list_t *cols)
 	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)
@@ -82,13 +101,58 @@ static void arrange(list_t *cols)
 		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, 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 && (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);
 	}
 }
 
@@ -123,18 +187,8 @@ 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);
+			cut_window(win);
+			put_window(win, dst);
 			arrange(wm_cols);
 		}
 	}
@@ -151,25 +205,30 @@ 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)->rows;
+		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;
+	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);
 
@@ -203,7 +262,7 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 
 	/* Focus change */
 	if (key == key_enter)
-		sys_focus(win);
+		set_focus(win);
 
 	return 0;
 }
@@ -254,19 +313,14 @@ 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());
 
 	/* 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);
@@ -278,8 +332,11 @@ 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);
+	cut_window(win);
+	if (wm_focus)
+		sys_focus(wm_focus);
+	else
+		sys_focus(wm_root);
 	arrange(wm_cols);
 	print_txt(wm_cols);
 }
@@ -289,6 +346,7 @@ 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());
@@ -297,8 +355,4 @@ void wm_init(win_t *root)
 		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);
 }