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

diff --git a/view.c b/view.c
index ac8e7a3..1bce54a 100644
--- a/view.c
+++ b/view.c
@@ -4,6 +4,8 @@
  */
 #include "dwm.h"
 
+#define MINDIM			100
+
 /* static */
 
 static Client *
@@ -131,75 +133,52 @@ 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 */
+				if(stackpos == StackLeft)
+					c->x += stackw;
 				switch(stackpos) {
 				case StackLeft:
-					c->x = sx + stackw;
-					c->y = sy + bh;
+				case StackRight:
 					c->w = master - 2 * BORDERPX;
 					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(th > bh) {
-				/* tile window */
-				c->w = tw - 2 * BORDERPX;
-				c->h = th - 2 * BORDERPX;
-				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;
-					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 {  /* 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 */
-				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;
+				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);
@@ -259,6 +238,7 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
+	int s;
 	unsigned int n;
 	Client *c;
 
@@ -268,13 +248,14 @@ resizecol(Arg *arg) {
 	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		return;
 
+	s = stackpos == StackBottom ? sh - bh : sw;
 	if(sel == getnext(clients)) {
-		if(master + arg->i > sw - MINW || master + arg->i < MINW)
+		if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
 			return;
 		master += arg->i;
 	}
 	else {
-		if(master - arg->i > sw - MINW || master - arg->i < MINW)
+		if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
 			return;
 		master -= arg->i;
 	}
@@ -294,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));
@@ -333,13 +321,8 @@ togglestackpos(Arg *arg) {
 		stackpos = STACKPOS;
 	else
 		stackpos = StackBottom;
-	updatemaster();
-	arrange(NULL);
-}
-
-void
-updatemaster(void) {
 	master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
+	arrange(NULL);
 }
 
 void