X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=66f550cd3800962da56970f2b66d6cba11d4e5ba;hb=b61f91361c81b3c619ef6dac6e80e19a64d5fcf3;hp=2f2d42a2cde19d27946491e210d8b12b49f11157;hpb=1d4a24dae02cfb3a3241c3d293e96dba910317bd;p=dwm.git

diff --git a/view.c b/view.c
index 2f2d42a..66f550c 100644
--- a/view.c
+++ b/view.c
@@ -8,7 +8,7 @@
 
 static Client *
 nexttiled(Client *c) {
-	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+	for(; c && (c->isfloat || !isvisible(c)); c = c->next);
 	return c;
 }
 
@@ -20,18 +20,14 @@ togglemax(Client *c) {
 		return;
 
 	if((c->ismax = !c->ismax)) {
-		c->rx = c->x; c->x = wax;
-		c->ry = c->y; c->y = way;
-		c->rw = c->w; c->w = waw - 2 * BORDERPX;
-		c->rh = c->h; c->h = wah - 2 * BORDERPX;
+		c->rx = c->x;
+		c->ry = c->y;
+		c->rw = c->w;
+		c->rh = c->h;
+		resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
 	}
-	else {
-		c->x = c->rx;
-		c->y = c->ry;
-		c->w = c->rw;
-		c->h = c->rh;
-	}
-	resize(c, True, TopLeft);
+	else
+		resize(c, c->rx, c->ry, c->rw, c->rh, True);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
@@ -56,10 +52,15 @@ dofloat(void) {
 
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
-			resize(c, True, TopLeft);
+			if(c->isbanned)
+				XMoveWindow(dpy, c->win, c->x, c->y);
+			c->isbanned = False;
+			resize(c, c->x, c->y, c->w, c->h, True);
+		}
+		else {
+			c->isbanned = True;
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 		}
-		else
-			ban(c);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -70,47 +71,49 @@ dofloat(void) {
 
 void
 dotile(void) {
-	unsigned int i, n, mw, mh, tw, th;
+	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 	/* window geoms */
-	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
 	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-	tw = waw - mw;
+	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
 	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+	tw = waw - mw;
 
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
-			if(c->isfloat) {
-				resize(c, True, TopLeft);
+			if(c->isbanned)
+				XMoveWindow(dpy, c->win, c->x, c->y);
+			c->isbanned = False;
+			if(c->isfloat)
 				continue;
-			}
 			c->ismax = False;
-			c->x = wax;
-			c->y = way;
+			nx = wax;
+			ny = way;
 			if(i < nmaster) {
-				c->y += i * mh;
-				c->w = mw - 2 * BORDERPX;
-				c->h = mh - 2 * BORDERPX;
+				ny += i * mh;
+				nw = mw - 2 * BORDERPX;
+				nh = mh - 2 * BORDERPX;
 			}
 			else {  /* tile window */
-				c->x += mw;
-				c->w = tw - 2 * BORDERPX;
-				if(th > bh) {
-					c->y += (i - nmaster) * th;
-					c->h = th - 2 * BORDERPX;
+				nx += mw;
+				nw = tw - 2 * BORDERPX;
+				if(th > 2 * BORDERPX) {
+					ny += (i - nmaster) * th;
+					nh = th - 2 * BORDERPX;
 				}
-				else /* fallback if th < bh */
-					c->h = wah - 2 * BORDERPX;
+				else /* fallback if th <= 2 * BORDERPX */
+					nh = wah - 2 * BORDERPX;
 			}
-			resize(c, False, TopLeft);
+			resize(c, nx, ny, nw, nh, False);
 			i++;
 		}
-		else
-			ban(c);
-
+		else {
+			c->isbanned = True;
+			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);
@@ -124,8 +127,9 @@ focusnext(Arg *arg) {
    
 	if(!sel)
 		return;
-	if(!(c = getnext(sel->next)))
-		c = getnext(clients);
+	for(c = sel->next; c && !isvisible(c); c = c->next);
+	if(!c)
+		for(c = clients; c && !isvisible(c); c = c->next);
 	if(c) {
 		focus(c);
 		restack();
@@ -138,9 +142,10 @@ focusprev(Arg *arg) {
 
 	if(!sel)
 		return;
-	if(!(c = getprev(sel->prev))) {
+	for(c = sel->prev; c && !isvisible(c); c = c->prev);
+	if(!c) {
 		for(c = clients; c && c->next; c = c->next);
-		c = getprev(c);
+		for(; c && !isvisible(c); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -150,11 +155,10 @@ 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;
-	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
-	bmw = textw(mtext);
 	if(sel)
 		arrange();
 	else
@@ -173,10 +177,13 @@ isvisible(Client *c) {
 
 void
 resizemaster(Arg *arg) {
+	if(arrange != dotile)
+		return;
 	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;
 	}
@@ -188,34 +195,27 @@ restack(void) {
 	Client *c;
 	XEvent ev;
 
-	if(!sel) {
-		drawstatus();
+	drawstatus();
+	if(!sel)
 		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);
 		}
 	}
-	drawall();
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 togglefloat(Arg *arg) {
-	if (!sel || arrange == dofloat)
+	if(!sel || arrange == dofloat)
 		return;
 	sel->isfloat = !sel->isfloat;
 	arrange();
@@ -224,8 +224,6 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
-	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
-	bmw = textw(mtext);
 	if(sel)
 		arrange();
 	else