X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wm-wmii.c;h=38a37250fea5441fa7518956b9036c13f1a32f25;hb=230e1caa3e7adc71ae88ce9d5be0c5f49577d20f;hp=ad114ebe49ccd5f218dcee3d30e9c2ff6d519cfd;hpb=c5d281c2e042c1153109dd46b74ef3d41fcacd93;p=wmpus

diff --git a/wm-wmii.c b/wm-wmii.c
index ad114eb..38a3725 100644
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -47,6 +47,7 @@ struct win_wm { };
 typedef struct {
 	win_t  *win;     // the window
 	int     height;  // win height in _this_ tag
+	state_t state;   // state of window
 } row_t;
 
 typedef struct {
@@ -59,6 +60,7 @@ typedef struct {
 typedef struct {
 	win_t *win;      // the window
 	int x, y, w, h;  // position of window (in this tag)
+	state_t state;   // state of window
 } flt_t;
 
 typedef struct {
@@ -124,6 +126,12 @@ static struct { int v, h; } move_dir;
 /********************
  * Helper functions *
  ********************/
+static int sort_win(void *a, void *b)
+{
+	return ((win_t*)a)->x > ((win_t*)b)->x ?  1 :
+	       ((win_t*)a)->x < ((win_t*)b)->x ? -1 : 0;
+}
+
 static win_t *get_focus(void)
 {
 	if (!wm_tag || !wm_dpy)
@@ -633,6 +641,7 @@ static void wm_update_cols(dpy_t *dpy)
 		for (list_t *lrow = col->rows; lrow; lrow = lrow->next) {
 			win_t *win = ROW(lrow)->win;
 			win->h = ROW(lrow)->height;
+			state_t state = st_show;
 			int height = 0;
 			switch (col->mode) {
 			case split:
@@ -647,20 +656,24 @@ static void wm_update_cols(dpy_t *dpy)
 					win_t *next = ROW(lrow->next)->win;
 					sys_move(next, x+MARGIN, y+MARGIN+STACK+MARGIN/2,
 						col->width, sy);
+					sys_show(next, st_show);
 				}
-				height = win == col->row->win ? sy : STACK;
-				sys_move(win, x+MARGIN, y+MARGIN,
-					col->width, height);
-				y += height + (MARGIN/2);
+				int isfocus = win == col->row->win;
+				state  = isfocus ? st_show : st_shade;
+				sys_show(win, state);
+				sys_move(win, x+MARGIN, y+MARGIN, col->width, sy);
+				y += (isfocus ? sy : STACK) + (MARGIN/2);
 				break;
 			case max:
 			case tab:
 				sys_move(win, x+MARGIN, 0+MARGIN,
 					col->width, dpy->geom->h-2*MARGIN);
-				if (focus == win)
-					sys_raise(win);
 				break;
 			}
+			ROW(lrow)->state = state;
+			sys_show(win, state);
+			if (focus == win)
+				sys_raise(win);
 			ROW(lrow)->height = win->h;
 		}
 		x += col->width + MARGIN;
@@ -674,9 +687,9 @@ void wm_update(void)
 {
 	/* Show/hide tags */
 	tag_foreach_col(wm_tag, dpy, col, row, win)
-		sys_show(win, st_show);
+		sys_show(win, ROW(row)->state);
 	tag_foreach_flt(wm_tag, dpy, flt, win)
-		sys_show(win, st_show);
+		sys_show(win, FLT(flt)->state);
 	for (list_t *tag = wm ->tags; tag; tag = tag->next)
 		if (tag->data != wm_tag) {
 			tag_foreach_col(TAG(tag), dpy, col, row, win)
@@ -717,7 +730,7 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 			return set_move(win,ptr,resize), 1;
 		if (move_mode != none && mod.up)
 			return set_move(win,ptr,none),   1;
-		if (key == key_mouse1 && !mod.up && win->h == STACK)
+		if (key == key_mouse1 && !mod.up && win->state == st_shade)
 			return set_focus(win), wm_update(), 0;
 		return 0;
 	}
@@ -731,8 +744,9 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 #ifdef DEBUG
 		if (key == key_f1) return raise_float(win), 1;
 		if (key == key_f2) return set_focus(win), 1;
-		if (key == key_f3) return sys_show(win, st_show), 1;
-		if (key == key_f4) return sys_show(win, st_hide), 1;
+		if (key == key_f3) return sys_show(win, st_show),  1;
+		if (key == key_f4) return sys_show(win, st_hide),  1;
+		if (key == key_f7) return sys_show(win, st_shade), 1;
 #endif
 		if (key == key_f5) return wm_update(),    1;
 		if (key == key_f6) return print_txt(),    1;
@@ -789,7 +803,7 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 	}
 
 	/* Focus change */
-	if (key == key_enter && win->h != STACK)
+	if (key == key_enter && win->state != st_shade)
 		return set_focus(win), 1;
 
 	if (key_mouse0 <= key && key <= key_mouse7)
@@ -887,19 +901,9 @@ void wm_init(win_t *root)
 	MARGIN = conf_get_int("main.margin", MARGIN);
 	STACK  = conf_get_int("main.stack",  STACK);
 
-	/* Hack, fix screen order */
-	list_t *screens = sys_info(root);
-	list_t *left  = screens;
-	list_t *right = screens->next;
-	if (left && right && WIN(left)->x > WIN(right)->x) {
-	    	void *tmp   = left->data;
-	    	left->data  = right->data;
-	    	right->data = tmp;
-	}
-
 	wm          = new0(wm_t);
 	wm->root    = root;
-	wm->screens = screens;
+	wm->screens = list_sort(sys_info(root), 0, sort_win);
 	wm->tag     = tag_new(wm->screens, 1);
 	wm->tags    = list_insert(NULL, wm->tag);
 
@@ -908,7 +912,8 @@ void wm_init(win_t *root)
 		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 	Key_t keys_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't', ' ',
 		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		key_f1, key_f2, key_f3, key_f4, key_f5, key_f6,
+		key_f1, key_f2, key_f3, key_f4,  key_f5,  key_f6,
+		key_f7, key_f8, key_f9, key_f10, key_f11, key_f12,
 		key_mouse1, key_mouse3};
 	for (int i = 0; i < countof(keys_e); i++)
 		sys_watch(root, keys_e[i],  MOD());