X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=view.c;h=1bce54a0633155aea7f52e7f79a046704efd4720;hb=2583a7c0d18749c391a7149f2f1ffb3efd91ba8d;hp=dab812854caa3f0a132eaa98b71f18b901e6c75d;hpb=1c2d673ded697f4b131f8700ce98392fbb383b2e;p=dwm.git

diff --git a/view.c b/view.c
index dab8128..1bce54a 100644
--- a/view.c
+++ b/view.c
@@ -4,6 +4,8 @@
  */
 #include "dwm.h"
 
+#define MINDIM			100
+
 /* static */
 
 static Client *
@@ -65,6 +67,7 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
+StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -95,19 +98,33 @@ 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 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(stackpos == StackBottom) {
+		stackw = sw;
+		stackh = sh - bh - master;
+	}
+	else {
+		stackw = sw - master;
+		stackh = sh - bh;
+	}
+
+	tw = stackw;
 	if(n > 1)
-		h = (sh - bh) / (n - 1);
+		th = stackh / (n - 1);
 	else
-		h = sh - bh;
+		th = stackh;
 
 	for(i = 0, c = clients; c; c = c->next) {
 		if(isvisible(c)) {
@@ -116,32 +133,53 @@ dotile(Arg *arg) {
 				continue;
 			}
 			c->ismax = False;
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
+			c->x = sx;
+			c->y = sy + bh;
+			if(n == 1) { /* only 1 window */
 				c->w = sw - 2 * BORDERPX;
 				c->h = sh - 2 * BORDERPX - bh;
 			}
-			else if(i == 0) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = mw - 2 * BORDERPX;
-				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 = master - 2 * BORDERPX;
+					c->h = sh - bh - 2 * BORDERPX;
+					break;
+				case StackBottom:
+					c->w = sw - 2 * BORDERPX;
+					c->h = master - 2 * BORDERPX;
+					break;
+				}
 			}
-			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
-					c->h = h - 2 * BORDERPX;
-			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2 * BORDERPX;
-				c->h = sh - 2 * BORDERPX - bh;
+			else {  /* tile window */
+				if(stackpos == StackRight)
+					c->x += master;
+				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 + master + (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;
+				}
+				else { /* fallback if th < bh */
+					if(stackpos == StackBottom)
+						c->y += master;
+					c->w = stackw - 2 * BORDERPX;
+					c->h = stackh - 2 * BORDERPX;
+				}
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -200,6 +238,7 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
+	int s;
 	unsigned int n;
 	Client *c;
 
@@ -209,15 +248,16 @@ resizecol(Arg *arg) {
 	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		return;
 
+	s = stackpos == StackBottom ? sh - bh : sw;
 	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+		if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
 			return;
-		mw += arg->i;
+		master += arg->i;
 	}
 	else {
-		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+		if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
 			return;
-		mw -= arg->i;
+		master -= arg->i;
 	}
 	arrange(NULL);
 }
@@ -235,11 +275,18 @@ restack(void) {
 		XRaiseWindow(dpy, sel->win);
 		XRaiseWindow(dpy, sel->twin);
 	}
-	if(arrange != dofloat)
+	if(arrange != dofloat) {
+		if(!sel->isfloat) {
+			XLowerWindow(dpy, sel->twin);
+			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));
@@ -266,6 +313,18 @@ toggleview(Arg *arg) {
 	arrange(NULL);
 }
 
+void
+togglestackpos(Arg *arg) {
+	if(arrange == dofloat)
+		return;
+	if(stackpos == StackBottom)
+		stackpos = STACKPOS;
+	else
+		stackpos = StackBottom;
+	master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
+	arrange(NULL);
+}
+
 void
 view(Arg *arg) {
 	unsigned int i;
@@ -287,6 +346,8 @@ viewall(Arg *arg) {
 	arrange(NULL);
 }
 
+
+
 void
 zoom(Arg *arg) {
 	unsigned int n;