X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=view.c;h=24b034945440ec1cd3068d4833dd439c91c79ee6;hb=6651dd7fd9e8e95cfc6c472f1adfeff41735d798;hp=b2ee32f06721a71c405d7f0914545738ba3a4073;hpb=8fa47ac679cfd91c022a35f2469bea7396e5f7c7;p=dwm.git

diff --git a/view.c b/view.c
index b2ee32f..24b0349 100644
--- a/view.c
+++ b/view.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -43,9 +42,9 @@ reorder(void) {
 }
 
 static void
-togglemax(Client *c)
-{
+togglemax(Client *c) {
 	XEvent ev;
+
 	if((c->ismax = !c->ismax)) {
 		c->rx = c->x; c->x = sx;
 		c->ry = c->y; c->y = bh;
@@ -65,8 +64,6 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
-Bool isvertical = VERTICALSTACK;
-StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -97,110 +94,55 @@ 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 i, n, stackw, stackh, tw, th;
+	unsigned int i, n, mpx, 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;
-	}
-
-	if(isvertical) {
-		tw = stackw;
-		if(n > 1)
-			th = stackh / (n - 1);
-		else
-			th = stackh;
-	}
-	else {
-		th = stackh;
-		if(n > 1)
-			tw = stackw / (n - 1);
-		else
-			tw = stackw;
-	}
-
-	for(i = 0, c = clients; c; c = c->next) {
+	mpx = (sw * master) / 1000;
+	stackw = sw - mpx;
+	stackh = sh - bh;
+	th = stackh;
+	if(n > 1)
+		th /= (n - 1);
+
+	for(i = 0, c = clients; c; c = c->next, i++)
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
 				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->w = mpx - 2 * BORDERPX;
+				c->h = sh - bh - 2 * BORDERPX;
 			}
-			else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
-				/* tile window */
-				c->x = sx;
-				if(isvertical)
+			else {  /* tile window */
+				c->x += mpx;
+				c->w = stackw - 2 * BORDERPX;
+				if(th > bh) {
 					c->y = sy + (i - 1) * th + bh;
-				else
-					c->y = sy + bh;
-				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)
+					if(i + 1 == n)
 						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;
-					}
+					else
+						c->h = th - 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;
+				else /* fallback if th < bh */
+					c->h = stackh - 2 * BORDERPX;
 			}
 			resize(c, False, TopLeft);
-			i++;
 		}
 		else
 			ban(c);
-	}
+
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
 		focus(c);
@@ -214,7 +156,6 @@ focusnext(Arg *arg) {
    
 	if(!sel)
 		return;
-
 	if(!(c = getnext(sel->next)))
 		c = getnext(clients);
 	if(c) {
@@ -229,7 +170,6 @@ focusprev(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	if(!(c = getprev(sel->prev))) {
 		for(c = clients; c && c->next; c = c->next);
 		c = getprev(c);
@@ -260,14 +200,13 @@ resizecol(Arg *arg) {
 			n++;
 	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		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;
 	}
@@ -287,11 +226,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));
@@ -346,18 +292,15 @@ zoom(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	if(sel->isfloat || (arrange == dofloat)) {
 		togglemax(sel);
 		return;
 	}
-
 	for(n = 0, c = clients; c; c = c->next)
 		if(isvisible(c) && !c->isfloat)
 			n++;
 	if(n < 2 || (arrange == dofloat))
 		return;
-
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))
 			return;