X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=fa7b4ebe33a6218ceea168ab6c616b1f58e50ad1;hb=4135e34dfa61d32625ef20e8e38064b465402f4a;hp=bb477d64c9440b0c2343142265e76fa7f9e697c4;hpb=587100873a66e34251041678504a8c1e28410591;p=dwm.git

diff --git a/layout.c b/layout.c
index bb477d6..fa7b4eb 100644
--- a/layout.c
+++ b/layout.c
@@ -1,7 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
+#include <stdio.h>
 #include <stdlib.h>
 
 unsigned int blw = 0;
@@ -9,59 +8,103 @@ Layout *lt = NULL;
 
 /* static */
 
+static double hratio = HRATIO;
+static double vratio = VRATIO;
 static unsigned int nlayouts = 0;
-static unsigned int masterw = MASTERWIDTH;
 static unsigned int nmaster = NMASTER;
 
 static void
+incratio(const char *arg, double *ratio, double def) {
+	double delta;
+
+	if(lt->arrange != tile)
+		return;
+	if(!arg)
+		*ratio = def;
+	else {
+		if(1 == sscanf(arg, "%lf", &delta)) {
+			if(delta + (*ratio) < .1 || delta + (*ratio) > 1.9)
+				return;
+			*ratio += delta;
+		}
+	}
+	lt->arrange();
+}
+
+static double /* simple pow() */
+spow(double x, double y)
+{
+	if(y == 0)
+		return 1;
+	while(--y)
+		x *= x;
+	return x;
+}
+
+static void
 tile(void) {
-	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
+	double mscale = 0, tscale = 0, sum = 0;
+	unsigned int i, n, nx, ny, nw, nh, mw, tw;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
-	/* window geoms */
-	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-	mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
-	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+
+	mw = (n <= nmaster) ? waw :  waw / (1 + hratio);
 	tw = waw - mw;
 
+	if(n > 0) {
+		if(n < nmaster) {
+			for(i = 0; i < n; i++)
+				sum += spow(vratio, i);
+			mscale = wah / sum;
+		}
+		else {
+			for(i = 0; i < nmaster; i++)
+				sum += spow(vratio, i);
+			mscale = wah / sum;
+			for(sum = 0, i = 0; i < (n - nmaster); i++)
+				sum += spow(vratio, i);
+			tscale = wah / sum;
+		}
+	}
+	nx = wax;
+	ny = way;
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
-			if(c->isbanned)
-				XMoveWindow(dpy, c->win, c->x, c->y);
-			c->isbanned = False;
-			if(c->isuntiled)
+			unban(c);
+			if(c->isfloating)
 				continue;
 			c->ismax = False;
-			nx = wax;
-			ny = way;
-			if(i < nmaster) {
-				ny += i * mh;
-				nw = mw - 2 * BORDERPX;
-				nh = mh - 2 * BORDERPX;
+			if(i < nmaster) { /* master window */
+				nw = mw - 2 * c->border;
+				if(i + 1 == n || i + 1 == nmaster)
+					nh = (way + wah) - ny - (2 * c->border);
+				else
+					nh = (mscale * spow(vratio, i)) - (2 * c->border);
 			}
-			else {  /* tile window */
-				nx += mw;
-				nw = tw - 2 * BORDERPX;
-				if(th > 2 * BORDERPX) {
-					ny += (i - nmaster) * th;
-					nh = th - 2 * BORDERPX;
+			else { /* tile window */
+				if(i == nmaster) {
+					ny = way;
+					nx = wax + mw;
 				}
-				else /* fallback if th <= 2 * BORDERPX */
-					nh = wah - 2 * BORDERPX;
+				nw = tw - 2 * c->border;
+				if(i + 1 == n)
+					nh = (way + wah) - ny - (2 * c->border);
+				else
+					nh = (tscale * spow(vratio, i - nmaster)) - (2 * c->border);
+			}
+			if(nh < bh) {
+				nh = bh;
+				ny = way + wah - nh;
 			}
 			resize(c, nx, ny, nw, nh, False);
+			ny += nh;
 			i++;
 		}
-		else {
-			c->isbanned = True;
-			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-		}
-	if(!sel || !isvisible(sel)) {
-		for(c = stack; c && !isvisible(c); c = c->snext);
-		focus(c);
-	}
+		else
+			ban(c);
+	focus(NULL);
 	restack();
 }
 
@@ -70,26 +113,37 @@ LAYOUTS
 /* extern */
 
 void
+floating(void) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(isvisible(c)) {
+			unban(c);
+			resize(c, c->x, c->y, c->w, c->h, True);
+		}
+		else
+			ban(c);
+	focus(NULL);
+	restack();
+}
+
+void
 focusclient(const char *arg) {
 	Client *c;
    
 	if(!sel || !arg)
 		return;
-	switch(atoi(arg)) {
-	default:
-		return;
-	case 1:
-		for(c = sel->next; c && !isvisible(c); c = c->next);
-		if(!c)
-			for(c = clients; c && !isvisible(c); c = c->next);
-		break;
-	case -1:
+	if(atoi(arg) < 0) {
 		for(c = sel->prev; c && !isvisible(c); c = c->prev);
 		if(!c) {
 			for(c = clients; c && c->next; c = c->next);
 			for(; c && !isvisible(c); c = c->prev);
 		}
-		break;
+	}
+	else {
+		for(c = sel->next; c && !isvisible(c); c = c->next);
+		if(!c)
+			for(c = clients; c && !isvisible(c); c = c->next);
 	}
 	if(c) {
 		focus(c);
@@ -98,20 +152,13 @@ focusclient(const char *arg) {
 }
 
 void
-incmasterw(const char *arg) {
-	int i;
-	if(lt->arrange != tile)
-		return;
-	if(!arg)
-		masterw = MASTERWIDTH;
-	else {
-		i = atoi(arg);
-		if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX
-		|| waw * (masterw + i) / 1000 <= 2 * BORDERPX)
-			return;
-		masterw += i;
-	}
-	lt->arrange();
+inchratio(const char *arg) {
+	incratio(arg, &hratio, HRATIO);
+}
+
+void
+incvratio(const char *arg) {
+	incratio(arg, &vratio, VRATIO);
 }
 
 void
@@ -148,7 +195,7 @@ initlayouts(void) {
 
 Client *
 nexttiled(Client *c) {
-	for(; c && (c->isuntiled || !isvisible(c)); c = c->next);
+	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
 	return c;
 }
 
@@ -156,19 +203,25 @@ void
 restack(void) {
 	Client *c;
 	XEvent ev;
+	XWindowChanges wc;
 
 	drawstatus();
 	if(!sel)
 		return;
-	if(sel->isuntiled || lt->arrange == untile)
+	if(sel->isfloating || lt->arrange == floating)
 		XRaiseWindow(dpy, sel->win);
-	if(lt->arrange != untile) {
-		if(!sel->isuntiled)
-			XLowerWindow(dpy, sel->win);
+	if(lt->arrange != floating) {
+		wc.stack_mode = Below;
+		wc.sibling = barwin;
+		if(!sel->isfloating) {
+			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+			wc.sibling = sel->win;
+		}
 		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
 			if(c == sel)
 				continue;
-			XLowerWindow(dpy, c->win);
+			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+			wc.sibling = c->win;
 		}
 	}
 	XSync(dpy, False);
@@ -180,11 +233,9 @@ setlayout(const char *arg) {
 	int i;
 
 	if(!arg) {
-		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-		if(i == nlayouts - 1)
-			lt = &layout[0];
-		else
-			lt = &layout[++i];
+		lt++;
+		if(lt == layout + nlayouts)
+			lt = layout;
 	}
 	else {
 		i = atoi(arg);
@@ -199,17 +250,27 @@ setlayout(const char *arg) {
 }
 
 void
+togglebar(const char *arg) {
+	if(bpos == BarOff)
+		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+	else
+		bpos = BarOff;
+	updatebarpos();
+	lt->arrange();
+}
+
+void
 togglemax(const char *arg) {
 	XEvent ev;
 
-	if(!sel || (lt->arrange != untile && !sel->isuntiled) || sel->isfixed)
+	if(!sel || (lt->arrange != floating && !sel->isfloating) || sel->isfixed)
 		return;
 	if((sel->ismax = !sel->ismax)) {
 		sel->rx = sel->x;
 		sel->ry = sel->y;
 		sel->rw = sel->w;
 		sel->rh = sel->h;
-		resize(sel, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
+		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
 	}
 	else
 		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
@@ -218,37 +279,11 @@ togglemax(const char *arg) {
 }
 
 void
-untile(void) {
-	Client *c;
-
-	for(c = clients; c; c = c->next) {
-		if(isvisible(c)) {
-			if(c->isbanned)
-				XMoveWindow(dpy, c->win, c->x, c->y);
-			c->isbanned = False;
-			resize(c, c->x, c->y, c->w, c->h, True);
-		}
-		else {
-			c->isbanned = True;
-			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-		}
-	}
-	if(!sel || !isvisible(sel)) {
-		for(c = stack; c && !isvisible(c); c = c->snext);
-		focus(c);
-	}
-	restack();
-}
-
-void
 zoom(const char *arg) {
-	unsigned int n;
 	Client *c;
 
-	if(!sel || lt->arrange != tile || sel->isuntiled)
+	if(!sel || lt->arrange == floating || sel->isfloating)
 		return;
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-		n++;
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))
 			return;