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

diff --git a/view.c b/view.c
index d3378ff..b2ee32f 100644
--- a/view.c
+++ b/view.c
@@ -65,6 +65,8 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
+Bool isvertical = VERTICALSTACK;
+StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -97,35 +99,40 @@ dofloat(Arg *arg) {
 
 /* This algorithm is based on a (M)aster area and a (S)tacking area.
  * It supports following arrangements:
- *
- * 	MMMS		MMMM
- * 	MMMS		MMMM
- * 	MMMS		SSSS
- *
- * The stacking area can be set to arrange clients vertically or horizontally.
- * Through inverting the algorithm it can be used to achieve following setup in
- * a dual head environment (due to running two dwm instances concurrently on
- * the specific screen):
- *
- * 	SMM MMS		MMM MMM
- * 	SMM MMS		MMM MMM
- * 	SMM MMS		SSS SSS
- *
- * This uses the center of the two screens for master areas.
+ * 	SSMMM	MMMMM	MMMSS
+ * 	SSMMM	SSSSS	MMMSS
  */
 void
 dotile(Arg *arg) {
-	int h, i, n, w;
+	int i, n, stackw, stackh, tw, th;
 	Client *c;
 
-	w = sw - mw;
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 
-	if(n > 1)
-		h = (sh - bh) / (n - 1);
-	else
-		h = sh - bh;
+	if(stackpos == StackBottom) {
+		stackw = sw;
+		stackh = sh - bh - master;
+	}
+	else {
+		stackw = sw - master;
+		stackh = sh - bh;
+	}
+
+	if(isvertical) {
+		tw = stackw;
+		if(n > 1)
+			th = stackh / (n - 1);
+		else
+			th = stackh;
+	}
+	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)) {
@@ -134,32 +141,59 @@ dotile(Arg *arg) {
 				continue;
 			}
 			c->ismax = False;
-			if(n == 1) {
+			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) {
+			else if(i == 0) { /* master window */
 				c->x = sx;
+				if(stackpos == StackLeft)
+					c->x += master;
 				c->y = sy + bh;
-				c->w = mw - 2 * BORDERPX;
-				c->h = sh - 2 * BORDERPX - bh;
+				if(isvertical) {
+					c->w = master - 2 * BORDERPX;
+					c->h = sh - 2 * BORDERPX - bh;
+				}
+				else {
+					c->w = sw;
+					c->h = master - 2 * BORDERPX;
+				}
 			}
-			else if(h > bh) {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2 * BORDERPX;
-				if(i + 1 == n)
-					c->h = sh - c->y - 2 * BORDERPX;
+			else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
+				/* tile window */
+				c->x = sx;
+				if(isvertical)
+					c->y = sy + (i - 1) * th + bh;
 				else
-					c->h = h - 2 * BORDERPX;
+					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)
+						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;
+					}
+				}
 			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
+			else { /* fallback if th < bh resp. tw < MINW */
+				c->x = sx;
 				c->y = sy + bh;
-				c->w = w - 2 * BORDERPX;
-				c->h = sh - 2 * BORDERPX - bh;
+				if(stackpos == StackRight)
+					c->x += master;
+				else if(stackpos == StackBottom)
+					c->y += master;
+				c->w = stackw - 2 * BORDERPX;
+				c->h = stackh - 2 * BORDERPX;
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -228,14 +262,14 @@ resizecol(Arg *arg) {
 		return;
 
 	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+		if(master + arg->i > sw - MINW || master + arg->i < MINW)
 			return;
-		mw += arg->i;
+		master += arg->i;
 	}
 	else {
-		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+		if(master - arg->i > sw - MINW || master - arg->i < MINW)
 			return;
-		mw -= arg->i;
+		master -= arg->i;
 	}
 	arrange(NULL);
 }