X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=view.c;h=1ca10275f6d004b51ce9fe2970b87f9b9ecd100a;hb=0384faeee5308d992e60084dd6565c78e6e11af4;hp=b2ee32f06721a71c405d7f0914545738ba3a4073;hpb=8fa47ac679cfd91c022a35f2469bea7396e5f7c7;p=dwm.git

diff --git a/view.c b/view.c
index b2ee32f..1ca1027 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
@@ -104,35 +103,28 @@ dofloat(Arg *arg) {
  */
 void
 dotile(Arg *arg) {
-	int i, n, stackw, stackh, tw, th;
+	unsigned int i, n, md, stackw, stackh, tw, 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 - master;
+		stackh = sh - bh - md;
 	}
 	else {
-		stackw = sw - master;
+		md = (sw * master) / 1000;
+		stackw = sw - md;
 		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)) {
@@ -141,59 +133,53 @@ dotile(Arg *arg) {
 				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 */
-				c->x = sx;
 				if(stackpos == StackLeft)
-					c->x += master;
-				c->y = sy + bh;
-				if(isvertical) {
-					c->w = master - 2 * BORDERPX;
-					c->h = sh - 2 * BORDERPX - bh;
-				}
-				else {
-					c->w = sw;
-					c->h = master - 2 * BORDERPX;
+					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;
 				}
 			}
-			else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
-				/* tile window */
-				c->x = sx;
-				if(isvertical)
-					c->y = sy + (i - 1) * th + bh;
-				else
-					c->y = sy + bh;
+			else {  /* tile window */
 				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;
+					c->x += md;
+				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;
+				}
+				else { /* fallback if th < bh */
+					if(stackpos == StackBottom)
+						c->y += md;
+					c->w = stackw - 2 * BORDERPX;
+					c->h = stackh - 2 * BORDERPX;
 				}
-			}
-			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;
-				c->w = stackw - 2 * BORDERPX;
-				c->h = stackh - 2 * BORDERPX;
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -262,12 +248,12 @@ resizecol(Arg *arg) {
 		return;
 
 	if(sel == getnext(clients)) {
-		if(master + arg->i > sw - MINW || master + arg->i < MINW)
+		if(master + arg->i > 95 || master + arg->i < 5)
 			return;
 		master += arg->i;
 	}
 	else {
-		if(master - arg->i > sw - MINW || master - arg->i < MINW)
+		if(master - arg->i > 95 || master - arg->i < 5)
 			return;
 		master -= arg->i;
 	}
@@ -287,11 +273,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));
@@ -318,6 +311,17 @@ 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;
@@ -339,6 +343,8 @@ viewall(Arg *arg) {
 	arrange(NULL);
 }
 
+
+
 void
 zoom(Arg *arg) {
 	unsigned int n;