X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/fee8df6ccf3ab1494421d422af252f7b3da3a811..1c1d09f3e9eb18175f48bcc212d07684577ba4a6:/view.c?ds=sidebyside

diff --git a/view.c b/view.c
index 6697c90..70b0253 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,99 +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;
-					c->w = master - 2 * BORDERPX;
+				case StackRight:
+					c->w = md - 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;
+					c->h = md - 2 * BORDERPX;
 					break;
 				}
 			}
-			else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
-				/* tile window */
-				c->w = tw - 2 * BORDERPX;
-				c->h = th - 2 * BORDERPX;
-				switch(stackpos) {
-				case StackLeft:
-					if(isvertical) {
-						c->x = sx;
+			else {  /* tile window */
+				if(stackpos == StackRight)
+					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;
-					}
-					else {
-						c->x = sx + (i - 1) * tw;
-						c->y = sy + bh;
-						if(i + 1 == n)
-							c->w = sx + stackw - c->x - 2 * BORDERPX;
-					}
-					break;
-				case StackBottom:
-					if(isvertical) {
-						c->x = sx;
-						c->y = sy + master + (i - 1) * th + bh;
-						if(i + 1 == n)
-							c->h = sh - c->y - 2 * BORDERPX;
-					}
-					else {
-						c->x = sx + (i - 1) * tw;
-						c->y = sy + bh + master;
-						if(i + 1 == n)
-							c->w = sw - c->x - 2 * BORDERPX;
-					}
-					break;
-				case StackRight:
-					if(isvertical) {
-						c->x = sx + master;
-						c->y = sy + (i - 1) * th + bh;
+						break;
+					case StackBottom:
+						c->y = sy + md + (i - 1) * th + bh;
 						if(i + 1 == n)
 							c->h = sh - c->y - 2 * BORDERPX;
+						break;
 					}
-					else {
-						c->x = sx + master + (i - 1) * tw;
-						c->y = sy + bh;
-						if(i + 1 == n)
-							c->w = sx + stackw - c->x - 2 * BORDERPX;
-					}
-					break;
+					c->w = tw - 2 * BORDERPX;
+					c->h = th - 2 * BORDERPX;
 				}
-			}
-			else { /* fallback if th < bh resp. tw < MINW */
-				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 += md;
+					c->w = stackw - 2 * BORDERPX;
+					c->h = stackh - 2 * BORDERPX;
 				}
 			}
 			resize(c, False, TopLeft);
@@ -303,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 > 950 || master + arg->i < 50)
 			return;
 		master += arg->i;
 	}
 	else {
-		if(master - arg->i > sw - MINW || master - arg->i < MINW)
+		if(master - arg->i > 950 || master - arg->i < 50)
 			return;
 		master -= arg->i;
 	}
@@ -328,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));
@@ -359,14 +311,6 @@ toggleview(Arg *arg) {
 	arrange(NULL);
 }
 
-void
-togglestackdir(Arg *arg) {
-	if(arrange == dofloat)
-		return;
-	isvertical = !isvertical;
-	arrange(NULL);
-}
-
 void
 togglestackpos(Arg *arg) {
 	if(arrange == dofloat)
@@ -375,15 +319,9 @@ togglestackpos(Arg *arg) {
 		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;