X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=ac8e7a320410746aadfd560ccd9a4b444e6567de;hb=36178933ed53857d59046278afb25b7525cafb39;hp=b2ee32f06721a71c405d7f0914545738ba3a4073;hpb=8fa47ac679cfd91c022a35f2469bea7396e5f7c7;p=dwm.git

diff --git a/view.c b/view.c
index b2ee32f..ac8e7a3 100644
--- a/view.c
+++ b/view.c
@@ -65,7 +65,6 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
-Bool isvertical = VERTICALSTACK;
 StackPos stackpos = STACKPOS;
 
 void
@@ -119,20 +118,11 @@ dotile(Arg *arg) {
 		stackh = sh - bh;
 	}
 
-	if(isvertical) {
-		tw = stackw;
-		if(n > 1)
-			th = stackh / (n - 1);
-		else
-			th = stackh;
-	}
-	else {
+	tw = stackw;
+	if(n > 1)
+		th = stackh / (n - 1);
+	else
 		th = stackh;
-		if(n > 1)
-			tw = stackw / (n - 1);
-		else
-			tw = stackw;
-	}
 
 	for(i = 0, c = clients; c; c = c->next) {
 		if(isvisible(c)) {
@@ -148,52 +138,69 @@ dotile(Arg *arg) {
 				c->h = sh - 2 * BORDERPX - bh;
 			}
 			else if(i == 0) { /* master window */
-				c->x = sx;
-				if(stackpos == StackLeft)
-					c->x += master;
-				c->y = sy + bh;
-				if(isvertical) {
+				switch(stackpos) {
+				case StackLeft:
+					c->x = sx + stackw;
+					c->y = sy + bh;
 					c->w = master - 2 * BORDERPX;
-					c->h = sh - 2 * BORDERPX - bh;
-				}
-				else {
-					c->w = sw;
+					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;
 				}
 			}
-			else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
+			else if(th > bh) {
 				/* tile window */
-				c->x = sx;
-				if(isvertical)
-					c->y = sy + (i - 1) * th + bh;
-				else
-					c->y = sy + bh;
-				if(stackpos == StackRight)
-					c->x += master;
-				else if(stackpos == StackBottom)
-					c->y += master;
 				c->w = tw - 2 * BORDERPX;
 				c->h = th - 2 * BORDERPX;
-				if(i + 1 == n) { /* fixes for last tile to take up rest space */
-					if(isvertical)
+				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;
-					else {
-						if(stackpos == StackLeft)
-							c->w = master - c->x - 2 * BORDERPX;
-						else
-							c->w = sw - c->x - 2 * BORDERPX;
-					}
+					break;
+				case StackRight:
+					c->x = sx + master;
+					c->y = sy + (i - 1) * th + bh;
+					if(i + 1 == n)
+						c->h = sh - c->y - 2 * BORDERPX;
+					break;
 				}
 			}
-			else { /* fallback if th < bh resp. tw < MINW */
-				c->x = sx;
-				c->y = sy + bh;
-				if(stackpos == StackRight)
-					c->x += master;
-				else if(stackpos == StackBottom)
-					c->y += master;
+			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;
+				}
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -319,6 +326,23 @@ 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;
 
@@ -339,6 +363,8 @@ viewall(Arg *arg) {
 	arrange(NULL);
 }
 
+
+
 void
 zoom(Arg *arg) {
 	unsigned int n;