X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=0f9cb68138735b3d6f5c4e953f8b0c040ac4ad78;hb=10885d349a8426f0a55f34e78a2592267e8e55be;hp=72e32c78b991f30a3bdb6805a36cdbb52b2e18ce;hpb=f833d109d1a7190344899aee1696bcbcd7b7ee71;p=dwm.git

diff --git a/view.c b/view.c
index 72e32c7..0f9cb68 100644
--- a/view.c
+++ b/view.c
@@ -65,7 +65,6 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
-StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -103,26 +102,19 @@ dofloat(Arg *arg) {
  */
 void
 dotile(Arg *arg) {
-	int i, n, stackw, stackh, tw, th;
+	unsigned int i, n, md, stackw, stackh, th;
 	Client *c;
 
 	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;
-	}
+	md = (sw * master) / 1000;
+	stackw = sw - md;
+	stackh = sh - bh;
 
-	tw = stackw;
+	th = stackh;
 	if(n > 1)
-		th = stackh / (n - 1);
-	else
-		th = stackh;
+		th /= (n - 1);
 
 	for(i = 0, c = clients; c; c = c->next) {
 		if(isvisible(c)) {
@@ -131,75 +123,28 @@ 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 */
-				switch(stackpos) {
-				case StackLeft:
-					c->x = sx + stackw;
-					c->y = sy + bh;
-					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;
-				}
+				c->w = md - 2 * BORDERPX;
+				c->h = sh - bh - 2 * BORDERPX;
 			}
-			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;
+			else {  /* tile window */
+				c->x += md;
+				if(th > bh) {
 					c->y = sy + (i - 1) * th + bh;
 					if(i + 1 == n)
 						c->h = sh - c->y - 2 * BORDERPX;
-					break;
+					c->w = stackw - 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 + bh;
-					break;
-				case StackRight:
-					c->x = sx + master;
-					c->y = sy + bh;
-					break;
+				else { /* fallback if th < bh */
+					c->w = stackw - 2 * BORDERPX;
+					c->h = stackh - 2 * BORDERPX;
 				}
 			}
 			resize(c, False, TopLeft);
@@ -269,12 +214,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;
 	}
@@ -333,23 +278,6 @@ toggleview(Arg *arg) {
 }
 
 void
-togglestackpos(Arg *arg) {
-	if(arrange == dofloat)
-		return;
-	if(stackpos == StackBottom)
-		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;