X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=view.c;h=b2f26148f9752658bdc7163f918e692df70f8199;hb=acdea319162a5a51703a88ca7a8a1b17534be616;hp=70b0253ce00608bc5a42ff86d8b0bd50150d15c2;hpb=1c1d09f3e9eb18175f48bcc212d07684577ba4a6;p=dwm.git

diff --git a/view.c b/view.c
index 70b0253..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,37 +95,23 @@ 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) {
-	unsigned int i, n, md, 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) {
-		md = ((sh - bh) * master) / 1000;
-		stackw = sw;
-		stackh = sh - bh - md;
-	}
-	else {
-		md = (sw * master) / 1000;
-		stackw = sw - md;
-		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);
@@ -140,53 +125,26 @@ dotile(Arg *arg) {
 				c->h = sh - 2 * BORDERPX - bh;
 			}
 			else if(i == 0) { /* master window */
-				if(stackpos == StackLeft)
-					c->x += stackw;
-				switch(stackpos) {
-				case StackLeft:
-				case StackRight:
-					c->w = md - 2 * BORDERPX;
-					c->h = sh - bh - 2 * BORDERPX;
-					break;
-				case StackBottom:
-					c->w = sw - 2 * BORDERPX;
-					c->h = md - 2 * BORDERPX;
-					break;
-				}
+				c->w = mpx - 2 * BORDERPX;
+				c->h = sh - bh - 2 * BORDERPX;
 			}
 			else {  /* tile window */
-				if(stackpos == StackRight)
-					c->x += md;
+				c->x += mpx;
+				c->w = stackw - 2 * BORDERPX;
 				if(th > bh) {
-					switch(stackpos) {
-					case StackLeft:
-					case StackRight:
-						c->y = sy + (i - 1) * th + bh;
-						if(i + 1 == n)
-							c->h = sh - c->y - 2 * BORDERPX;
-						break;
-					case StackBottom:
-						c->y = sy + md + (i - 1) * th + bh;
-						if(i + 1 == n)
-							c->h = sh - c->y - 2 * BORDERPX;
-						break;
-					}
-					c->w = tw - 2 * BORDERPX;
-					c->h = th - 2 * BORDERPX;
+					c->y = sy + (i - 1) * th + bh;
+					if(i + 1 == n)
+						c->h = sh - c->y - 2 * BORDERPX;
+					else
+						c->h = th - 2 * BORDERPX;
 				}
-				else { /* fallback if th < bh */
-					if(stackpos == StackBottom)
-						c->y += md;
-					c->w = stackw - 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);
@@ -311,17 +269,6 @@ toggleview(Arg *arg) {
 	arrange(NULL);
 }
 
-void
-togglestackpos(Arg *arg) {
-	if(arrange == dofloat)
-		return;
-	if(stackpos == StackBottom)
-		stackpos = STACKPOS;
-	else
-		stackpos = StackBottom;
-	arrange(NULL);
-}
-
 void
 view(Arg *arg) {
 	unsigned int i;