X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=4f42abe4bf06894ab436f6dd5c6ff4e38b8c63c2;hb=2cce4b95cdce5617318fc4fb5d21abe41110c27a;hp=dab812854caa3f0a132eaa98b71f18b901e6c75d;hpb=1c2d673ded697f4b131f8700ce98392fbb383b2e;p=dwm.git

diff --git a/view.c b/view.c
index dab8128..4f42abe 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,12 @@ reorder(void) {
 }
 
 static void
-togglemax(Client *c)
-{
+togglemax(Client *c) {
 	XEvent ev;
+		
+	if(c->isfixed)
+		return;
+
 	if((c->ismax = !c->ismax)) {
 		c->rx = c->x; c->x = sx;
 		c->ry = c->y; c->y = bh;
@@ -64,7 +66,7 @@ togglemax(Client *c)
 
 /* extern */
 
-void (*arrange)(Arg *) = DEFMODE;
+void (*arrange)(void) = DEFMODE;
 
 void
 detach(Client *c) {
@@ -78,7 +80,7 @@ detach(Client *c) {
 }
 
 void
-dofloat(Arg *arg) {
+dofloat(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next) {
@@ -96,59 +98,55 @@ dofloat(Arg *arg) {
 }
 
 void
-dotile(Arg *arg) {
-	int h, i, n, w;
+dotile(void) {
+	unsigned int i, n, mpx, stackw, stackh, th;
 	Client *c;
 
-	w = sw - mw;
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		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)
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
 				continue;
 			}
 			c->ismax = False;
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
+			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 * BORDERPX;
-				c->h = sh - 2 * BORDERPX - bh;
-			}
-			else if(h > bh) {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2 * BORDERPX;
-				if(i + 1 == n)
-					c->h = sh - c->y - 2 * BORDERPX;
-				else
-					c->h = h - 2 * BORDERPX;
+			else if(i == 0) { /* master window */
+				c->w = mpx - 2 * BORDERPX;
+				c->h = sh - bh - 2 * BORDERPX;
 			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2 * BORDERPX;
-				c->h = sh - 2 * BORDERPX - 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);
@@ -162,7 +160,6 @@ focusnext(Arg *arg) {
    
 	if(!sel)
 		return;
-
 	if(!(c = getnext(sel->next)))
 		c = getnext(clients);
 	if(c) {
@@ -177,7 +174,6 @@ focusprev(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	if(!(c = getprev(sel->prev))) {
 		for(c = clients; c && c->next; c = c->next);
 		c = getprev(c);
@@ -200,26 +196,10 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
-	unsigned int n;
-	Client *c;
-
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
-	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
+	if(master + arg->i > 950 || master + arg->i < 50)
 		return;
-
-	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
-			return;
-		mw += arg->i;
-	}
-	else {
-		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
-			return;
-		mw -= arg->i;
-	}
-	arrange(NULL);
+	master += arg->i;
+	arrange();
 }
 
 void
@@ -235,11 +215,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));
@@ -249,7 +236,7 @@ void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
 	if(sel)
-		arrange(NULL);
+		arrange();
 	else
 		drawstatus();
 }
@@ -263,7 +250,7 @@ toggleview(Arg *arg) {
 	if(i == ntags)
 		seltag[arg->i] = True; /* cannot toggle last view */
 	reorder();
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -274,7 +261,7 @@ view(Arg *arg) {
 		seltag[i] = False;
 	seltag[arg->i] = True;
 	reorder();
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -284,7 +271,7 @@ viewall(Arg *arg) {
 	for(i = 0; i < ntags; i++)
 		seltag[i] = True;
 	reorder();
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -294,18 +281,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;
@@ -315,5 +299,5 @@ zoom(Arg *arg) {
 	c->next = clients;
 	clients = c;
 	focus(c);
-	arrange(NULL);
+	arrange();
 }