X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=view.c;h=935525fb7f927ec14b1c9178d24e63bed1ab1ce1;hb=0045ad87dfb32f35fc17b5b8942049cfe84d623c;hp=4e2ffb35e526701517cf2b109e8286b91699220f;hpb=f679125206ae28b38f77e9620a67365d310ddff3;p=dwm.git

diff --git a/view.c b/view.c
index 4e2ffb3..935525f 100644
--- a/view.c
+++ b/view.c
@@ -59,7 +59,7 @@ dofloat(void) {
 			resize(c, True, TopLeft);
 		}
 		else
-			ban(c);
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -109,8 +109,7 @@ dotile(void) {
 			i++;
 		}
 		else
-			ban(c);
-
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
 		focus(c);
@@ -153,7 +152,6 @@ incnmaster(Arg *arg) {
 	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
 		return;
 	nmaster += arg->i;
-	updatemodetext();
 	if(sel)
 		arrange();
 	else
@@ -191,19 +189,14 @@ restack(void) {
 		drawstatus();
 		return;
 	}
-	if(sel->isfloat || arrange == dofloat) {
+	if(sel->isfloat || arrange == dofloat)
 		XRaiseWindow(dpy, sel->win);
-		XRaiseWindow(dpy, sel->twin);
-	}
 	if(arrange != dofloat) {
-		if(!sel->isfloat) {
-			XLowerWindow(dpy, sel->twin);
+		if(!sel->isfloat)
 			XLowerWindow(dpy, sel->win);
-		}
 		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
 			if(c == sel)
 				continue;
-			XLowerWindow(dpy, c->twin);
 			XLowerWindow(dpy, c->win);
 		}
 	}
@@ -223,7 +216,6 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
-	updatemodetext();
 	if(sel)
 		arrange();
 	else
@@ -241,12 +233,6 @@ toggleview(Arg *arg) {
 	arrange();
 }
 
-void
-updatemodetext() {
-	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
-	bmw = textw(mtext);
-}
-
 void
 view(Arg *arg) {
 	unsigned int i;