X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=b2f26148f9752658bdc7163f918e692df70f8199;hb=acdea319162a5a51703a88ca7a8a1b17534be616;hp=a3b20297deec18e510962292982a90624b1d2640;hpb=7225c99903c1a7ada44d575251e3aca64625a172;p=dwm.git

diff --git a/view.c b/view.c
index a3b2029..b2f2614 100644
--- a/view.c
+++ b/view.c
@@ -65,7 +65,6 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
-StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -96,118 +95,56 @@ dofloat(Arg *arg) {
 	restack();
 }
 
-/* This algorithm is based on a (M)aster area and a (S)tacking area.
- * It supports following arrangements:
- * 	SSMMM	MMMMM	MMMSS
- * 	SSMMM	SSSSS	MMMSS
- */
 void
 dotile(Arg *arg) {
-	int i, n, stackw, stackh, tw, th;
+	unsigned int i, n, mpx, stackw, stackh, th;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 
-	if(stackpos == StackBottom) {
-		stackw = sw;
-		stackh = sh - bh - master;
-	}
-	else {
-		stackw = sw - master;
-		stackh = sh - bh;
-	}
+	mpx = (sw * master) / 1000;
+	stackw = sw - mpx;
+	stackh = sh - bh;
 
-	tw = stackw;
+	th = stackh;
 	if(n > 1)
-		th = stackh / (n - 1);
-	else
-		th = stackh;
+		th /= (n - 1);
 
-	for(i = 0, c = clients; c; c = c->next) {
+	for(i = 0, c = clients; c; c = c->next, i++)
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
 				continue;
 			}
 			c->ismax = False;
+			c->x = sx;
+			c->y = sy + bh;
 			if(n == 1) { /* only 1 window */
-				c->x = sx;
-				c->y = sy + bh;
 				c->w = sw - 2 * BORDERPX;
 				c->h = sh - 2 * BORDERPX - bh;
 			}
 			else if(i == 0) { /* master window */
-				switch(stackpos) {
-				case StackLeft:
-					c->x = sx + stackw;
-					c->y = sy + bh;
-					c->w = master - 2 * BORDERPX;
-					c->h = sh - bh - 2 * BORDERPX;
-					break;
-				case StackBottom:
-					c->x = sx;
-					c->y = sy + bh;
-					c->w = sw - 2 * BORDERPX;
-					c->h = master - 2 * BORDERPX;
-					break;
-				case StackRight:
-					c->x = sx;
-					c->y = sy + bh;
-					c->w = master - 2 * BORDERPX;
-					c->h = sh - bh - 2 * BORDERPX;
-					break;
-				}
+				c->w = mpx - 2 * BORDERPX;
+				c->h = sh - bh - 2 * BORDERPX;
 			}
-			else if(th > bh) {
-				/* tile window */
-				c->w = tw - 2 * BORDERPX;
-				c->h = th - 2 * BORDERPX;
-				switch(stackpos) {
-				case StackLeft:
-					c->x = sx;
-					c->y = sy + (i - 1) * th + bh;
-					if(i + 1 == n)
-						c->h = sh - c->y - 2 * BORDERPX;
-					break;
-				case StackBottom:
-					c->x = sx;
-					c->y = sy + master + (i - 1) * th + bh;
-					if(i + 1 == n)
-						c->h = sh - c->y - 2 * BORDERPX;
-					break;
-				case StackRight:
-					c->x = sx + master;
+			else {  /* tile window */
+				c->x += mpx;
+				c->w = stackw - 2 * BORDERPX;
+				if(th > bh) {
 					c->y = sy + (i - 1) * th + bh;
 					if(i + 1 == n)
 						c->h = sh - c->y - 2 * BORDERPX;
-					break;
-				}
-			}
-			else { /* fallback if th < bh */
-				c->w = stackw - 2 * BORDERPX;
-				c->h = stackh - 2 * BORDERPX;
-				switch(stackpos) {
-				case StackLeft:
-					c->x = sx;
-					c->y = sy + bh;
-					break;
-				case StackBottom:
-					c->x = sx;
-					c->y = sy + master;
-					break;
-				case StackRight:
-					c->x = sx + master;
-					c->y = sy + bh;
-					break;
+					else
+						c->h = th - 2 * BORDERPX;
 				}
+				else /* fallback if th < bh */
+					c->h = stackh - 2 * BORDERPX;
 			}
 			resize(c, False, TopLeft);
-			i++;
 		}
 		else
 			ban(c);
-	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
 		focus(c);
@@ -269,12 +206,12 @@ resizecol(Arg *arg) {
 		return;
 
 	if(sel == getnext(clients)) {
-		if(master + arg->i > sw - MINW || master + arg->i < MINW)
+		if(master + arg->i > 950 || master + arg->i < 50)
 			return;
 		master += arg->i;
 	}
 	else {
-		if(master - arg->i > sw - MINW || master - arg->i < MINW)
+		if(master - arg->i > 950 || master - arg->i < 50)
 			return;
 		master -= arg->i;
 	}
@@ -333,23 +270,6 @@ toggleview(Arg *arg) {
 }
 
 void
-togglestackpos(Arg *arg) {
-	if(arrange == dofloat)
-		return;
-	if(stackpos == StackBottom)
-		stackpos = STACKPOS;
-	else
-		stackpos = StackBottom;
-	updatemaster();
-	arrange(NULL);
-}
-
-void
-updatemaster(void) {
-	master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
-}
-
-void
 view(Arg *arg) {
 	unsigned int i;