X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wm-wmii.c;h=06b71f67694830210204c2a374b23dd23c8d6f03;hb=776ac6910ee9db701c1cfe2ab234ae5fb96ce9db;hp=f82e8f5b58666b713c1aee47d0d0786d1beae5bd;hpb=a6f2be4a52a3dd478c0640714c5be9c5cf87c64e;p=wmpus

diff --git a/wm-wmii.c b/wm-wmii.c
index f82e8f5..06b71f6 100644
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -283,8 +283,9 @@ static void print_txt(void)
 	} }
 	for (list_t *lflt = dpy->flts; lflt; lflt = lflt->next) {
 		flt_t *flt = lflt->data;
-		printf("    flt:   <%-9p [%p->%p] >%-9p focus=%d%d    - %d,%d %dx%d \n",
-				lflt->prev, lflt, lflt->data, lflt->next,
+		win_t *win = flt->win;
+		printf("    flt:   <%-9p [%p>>%p] >%-9p focus=%d%d    - %d,%d %dx%d \n",
+				lflt->prev, lflt, win, lflt->next,
 				dpy->flt == flt, wm_focus == flt->win,
 				flt->x, flt->y, flt->h, flt->w);
 	}  } }
@@ -298,21 +299,22 @@ static layer_t cut_win(win_t *win, tag_t *tag)
 	list_t *ldpy, *lcol, *lrow, *lflt;
 	layer_t layer = searchl(tag, win, &ldpy, &lcol, &lrow, &lflt);
 
-	dpy_t  *dpy   = DPY(ldpy);
 	if (layer == tiling) {
-		col_t  *col  = COL(lcol);
+		dpy_t *dpy = DPY(ldpy);
+		col_t *col = COL(lcol);
 		col->row  = lrow->prev ? lrow->prev->data :
 			    lrow->next ? lrow->next->data : NULL;
-		col->rows = list_remove(col->rows, lrow);
+		col->rows = list_remove(col->rows, lrow, 1);
 		if (col->rows == NULL && (lcol->next || lcol->prev)) {
 			dpy->col  = lcol->prev ? lcol->prev->data :
 				    lcol->next ? lcol->next->data : NULL;
-			dpy->cols = list_remove(dpy->cols, lcol);
+			dpy->cols = list_remove(dpy->cols, lcol, 1);
 		}
 	}
 
 	if (layer == floating) {
-		dpy->flts = list_remove(dpy->flts, lflt);
+		dpy_t *dpy = DPY(ldpy);
+		dpy->flts = list_remove(dpy->flts, lflt, 1);
 		dpy->flt  = dpy->flts ? list_last(dpy->flts)->data : NULL;
 		if (!dpy->flt && dpy->col && dpy->col->row)
 			dpy->layer = tiling;
@@ -512,10 +514,10 @@ static void raise_float(win_t *win)
 			break;
 	if (cur) {
 		flt_t *flt = cur->data;
-		wm_dpy->flts = list_remove(wm_dpy->flts, cur);
+		wm_dpy->flts = list_remove(wm_dpy->flts, cur, 0);
 		wm_dpy->flts = list_append(wm_dpy->flts, flt);
+		sys_raise(win);
 	}
-	sys_raise(win);
 }
 
 /* Toggle between floating and tiling layers */
@@ -586,9 +588,18 @@ static void tag_set(win_t *win, int name)
 static void tag_switch(int name)
 {
 	printf("tag_switch: %d\n", name);
-	if ((wm_col == NULL || wm_row == NULL) && wm_flt == NULL)
-		wm->tags = list_remove(wm->tags,
-				list_find(wm->tags, wm_tag));
+	tag_t *old = wm_tag;
+	if ((wm_col == NULL || wm_row == NULL) && wm_flt == NULL) {
+		list_t *ltag = list_find(wm->tags, old);
+		wm->tags = list_remove(wm->tags, ltag, 1);
+		while (old->dpys) {
+			dpy_t *dpy = old->dpys->data;
+			while (dpy->cols)
+				dpy->cols = list_remove(dpy->cols, dpy->cols, 1);
+			old->dpys = list_remove(old->dpys, old->dpys, 1);
+		}
+		free(old);
+	}
 	wm_tag = tag_find(name);
 }
 
@@ -611,6 +622,7 @@ static void wm_update_cols(dpy_t *dpy)
 		COL(lcol)->width *= (float)mx / tx;
 
 	/* Scale each column vertically */
+	win_t *focus = get_focus();
 	for (list_t *lcol = dpy->cols; lcol; lcol = lcol->next) {
 		col_t *col = lcol->data;
 		int nrows = list_length(col->rows);
@@ -648,7 +660,7 @@ static void wm_update_cols(dpy_t *dpy)
 			case tab:
 				sys_move(win, x+MARGIN, 0+MARGIN,
 					col->width, dpy->geom->h-2*MARGIN);
-				if (col->row->win == win)
+				if (focus == win)
 					sys_raise(win);
 				break;
 			}
@@ -847,7 +859,6 @@ void wm_insert(win_t *win)
 	win->wm = new0(win_wm_t);
 	sys_watch(win, key_enter,  MOD());
 	sys_watch(win, key_focus,  MOD());
-	sys_watch(win, key_mouse1, MOD());
 
 	/* Add to screen */
 	put_win(win, wm_tag, wm_dpy->layer);
@@ -864,10 +875,12 @@ void wm_remove(win_t *win)
 	print_txt();
 	for (list_t *tag = wm->tags; tag; tag = tag->next)
 		cut_win(win, tag->data);
+	free(win->wm);
 	set_focus(wm_focus);
 	wm_update();
 	print_txt();
 }
+
 void wm_init(win_t *root)
 {
 	printf("wm_init: %p\n", root);