X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=5c06027815f41eebe15df22524a62ae842d1b9f3;hb=3ce8c9f33844a995e79329978db9d2cd3981e032;hp=bc1f4e25cb3da31289fc04dfe220823125a37bf0;hpb=f8181f64e2ba4fca4e85036c48cf90a2151794fc;p=dwm.git

diff --git a/view.c b/view.c
index bc1f4e2..5c06027 100644
--- a/view.c
+++ b/view.c
@@ -31,7 +31,7 @@ togglemax(Client *c) {
 		c->w = c->rw;
 		c->h = c->rh;
 	}
-	resize(c, True, TopLeft);
+	resize(c, True);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
@@ -56,10 +56,11 @@ dofloat(void) {
 
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
-			resize(c, True, TopLeft);
+			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,8 +84,9 @@ dotile(void) {
 
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
+			c->isbanned = False;
 			if(c->isfloat) {
-				resize(c, True, TopLeft);
+				resize(c, True);
 				continue;
 			}
 			c->ismax = False;
@@ -98,18 +100,18 @@ dotile(void) {
 			else {  /* tile window */
 				c->x += mw;
 				c->w = tw - 2 * BORDERPX;
-				if(th > bh) {
+				if(th > 2 * BORDERPX) {
 					c->y += (i - nmaster) * th;
 					c->h = th - 2 * BORDERPX;
 				}
-				else /* fallback if th < bh */
+				else /* fallback if th <= 2 * BORDERPX */
 					c->h = wah - 2 * BORDERPX;
 			}
-			resize(c, False, TopLeft);
+			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);
@@ -149,7 +151,8 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+	if((arrange == dofloat) || (nmaster + arg->i < 1)
+	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
 		return;
 	nmaster += arg->i;
 	if(sel)
@@ -173,7 +176,8 @@ resizemaster(Arg *arg) {
 	if(arg->i == 0)
 		master = MASTER;
 	else {
-		if(master + arg->i > 950 || master + arg->i < 50)
+		if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
+		|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
 			return;
 		master += arg->i;
 	}
@@ -185,10 +189,9 @@ restack(void) {
 	Client *c;
 	XEvent ev;
 
-	if(!sel) {
-		drawstatus();
+	drawstatus();
+	if(!sel)
 		return;
-	}
 	if(sel->isfloat || arrange == dofloat)
 		XRaiseWindow(dpy, sel->win);
 	if(arrange != dofloat) {
@@ -206,7 +209,7 @@ restack(void) {
 
 void
 togglefloat(Arg *arg) {
-	if (!sel || arrange == dofloat)
+	if(!sel || arrange == dofloat)
 		return;
 	sel->isfloat = !sel->isfloat;
 	arrange();