X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=view.c;h=5c06027815f41eebe15df22524a62ae842d1b9f3;hb=3ce8c9f33844a995e79329978db9d2cd3981e032;hp=de3328e29cb372f2c441eafa9c59ec4f7f27a09c;hpb=2c1db7ed354f303c2a2aa7eb6b7de3a0dac5d022;p=dwm.git

diff --git a/view.c b/view.c
index de3328e..5c06027 100644
--- a/view.c
+++ b/view.c
@@ -56,10 +56,11 @@ dofloat(void) {
 
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
+			c->isbanned = False;
 			resize(c, True);
 		}
 		else
-			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+			ban(c);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -83,6 +84,7 @@ dotile(void) {
 
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
+			c->isbanned = False;
 			if(c->isfloat) {
 				resize(c, True);
 				continue;
@@ -98,18 +100,18 @@ dotile(void) {
 			else {  /* tile window */
 				c->x += mw;
 				c->w = tw - 2 * BORDERPX;
-				if(th - 2 * BORDERPX > bh) {
+				if(th > 2 * BORDERPX) {
 					c->y += (i - nmaster) * th;
 					c->h = th - 2 * BORDERPX;
 				}
-				else /* fallback if th - 2 * BORDERPX < bh */
+				else /* fallback if th <= 2 * BORDERPX */
 					c->h = wah - 2 * BORDERPX;
 			}
 			resize(c, False);
 			i++;
 		}
 		else
-			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+			ban(c);
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
 		focus(c);
@@ -150,7 +152,7 @@ focusprev(Arg *arg) {
 void
 incnmaster(Arg *arg) {
 	if((arrange == dofloat) || (nmaster + arg->i < 1)
-		|| (wah / (nmaster + arg->i) - 2 * BORDERPX < bh))
+	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
 		return;
 	nmaster += arg->i;
 	if(sel)
@@ -174,8 +176,8 @@ resizemaster(Arg *arg) {
 	if(arg->i == 0)
 		master = MASTER;
 	else {
-		if(waw * (master + arg->i) / 1000 > waw - bh - 2 * BORDERPX
-			|| waw * (master + arg->i) / 1000 < bh + 2 * BORDERPX)
+		if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
+		|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
 			return;
 		master += arg->i;
 	}
@@ -207,7 +209,7 @@ restack(void) {
 
 void
 togglefloat(Arg *arg) {
-	if (!sel || arrange == dofloat)
+	if(!sel || arrange == dofloat)
 		return;
 	sel->isfloat = !sel->isfloat;
 	arrange();