X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=b2f26148f9752658bdc7163f918e692df70f8199;hb=acdea319162a5a51703a88ca7a8a1b17534be616;hp=80d483ae4392e8c921f826e2c7a724ff55fab02f;hpb=ca68975ff8fc1c7166c8d1f811e3dd52c735d19f;p=dwm.git

diff --git a/view.c b/view.c
index 80d483a..b2f2614 100644
--- a/view.c
+++ b/view.c
@@ -7,7 +7,7 @@
 /* static */
 
 static Client *
-minclient() {
+minclient(void) {
 	Client *c, *min;
 
 	if((clients && clients->isfloat) || arrange == dofloat)
@@ -18,8 +18,14 @@ minclient() {
 	return min;
 }
 
+static Client *
+nexttiled(Client *c) {
+	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+	return c;
+}
+
 static void
-reorder() {
+reorder(void) {
 	Client *c, *newclients, *tail;
 
 	newclients = tail = NULL;
@@ -36,10 +42,24 @@ reorder() {
 	clients = newclients;
 }
 
-static Client *
-nexttiled(Client *c) {
-	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
-	return c;
+static void
+togglemax(Client *c)
+{
+	XEvent ev;
+	if((c->ismax = !c->ismax)) {
+		c->rx = c->x; c->x = sx;
+		c->ry = c->y; c->y = bh;
+		c->rw = c->w; c->w = sw - 2 * BORDERPX;
+		c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
+	}
+	else {
+		c->x = c->rx;
+		c->y = c->ry;
+		c->w = c->rw;
+		c->h = c->rh;
+	}
+	resize(c, True, TopLeft);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* extern */
@@ -61,8 +81,6 @@ void
 dofloat(Arg *arg) {
 	Client *c;
 
-	maximized = False;
-
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
 			resize(c, True, TopLeft);
@@ -79,60 +97,54 @@ dofloat(Arg *arg) {
 
 void
 dotile(Arg *arg) {
-	int h, i, n, w;
+	unsigned int i, n, mpx, stackw, stackh, th;
 	Client *c;
 
-	maximized = False;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
 
-	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
+	mpx = (sw * master) / 1000;
+	stackw = sw - mpx;
+	stackh = sh - bh;
 
+	th = stackh;
 	if(n > 1)
-		h = (sh - bh) / (n - 1);
-	else
-		h = sh - bh;
+		th /= (n - 1);
 
-	for(i = 0, c = clients; c; c = c->next) {
+	for(i = 0, c = clients; c; c = c->next, i++)
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
 				continue;
 			}
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = sw - 2;
-				c->h = sh - 2 - bh;
+			c->ismax = False;
+			c->x = sx;
+			c->y = sy + bh;
+			if(n == 1) { /* only 1 window */
+				c->w = sw - 2 * BORDERPX;
+				c->h = sh - 2 * BORDERPX - bh;
 			}
-			else if(i == 0) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = mw - 2;
-				c->h = sh - 2 - bh;
+			else if(i == 0) { /* master window */
+				c->w = mpx - 2 * BORDERPX;
+				c->h = sh - bh - 2 * BORDERPX;
 			}
-			else if(h > bh) {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2;
-				if(i + 1 == n)
-					c->h = sh - c->y - 2;
-				else
-					c->h = h - 2;
-			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2;
-				c->h = sh - 2 - bh;
+			else {  /* tile window */
+				c->x += mpx;
+				c->w = stackw - 2 * BORDERPX;
+				if(th > bh) {
+					c->y = sy + (i - 1) * th + bh;
+					if(i + 1 == n)
+						c->h = sh - c->y - 2 * BORDERPX;
+					else
+						c->h = th - 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);
@@ -190,27 +202,27 @@ resizecol(Arg *arg) {
 	for(n = 0, c = clients; c; c = c->next)
 		if(isvisible(c) && !c->isfloat)
 			n++;
-	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		return;
 
 	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+		if(master + arg->i > 950 || master + arg->i < 50)
 			return;
-		mw += arg->i;
+		master += arg->i;
 	}
 	else {
-		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+		if(master - arg->i > 950 || master - arg->i < 50)
 			return;
-		mw -= arg->i;
+		master -= arg->i;
 	}
 	arrange(NULL);
 }
 
 void
-restack() {
+restack(void) {
 	Client *c;
 	XEvent ev;
-	
+
 	if(!sel) {
 		drawstatus();
 		return;
@@ -219,11 +231,18 @@ restack() {
 		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));
@@ -271,15 +290,25 @@ viewall(Arg *arg) {
 	arrange(NULL);
 }
 
+
+
 void
 zoom(Arg *arg) {
 	unsigned int n;
 	Client *c;
 
+	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(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+	if(n < 2 || (arrange == dofloat))
 		return;
 
 	if((c = sel) == nexttiled(clients))