X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=1e8f113484d834edd55d7c3d5c59c507f9ca7419;hb=27b0595af72060d7cc406639b6c53a854f0a3590;hp=d754afbed24c95ba207f8273605ea11d6fd3d56b;hpb=8012fcf3334148d2b39646fd372a7514cc74c250;p=dwm.git

diff --git a/layout.c b/layout.c
index d754afb..1e8f113 100644
--- a/layout.c
+++ b/layout.c
@@ -2,15 +2,16 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdlib.h>
 
-unsigned int master = MASTER;
-unsigned int nmaster = NMASTER;
 unsigned int blw = 0;
 Layout *lt = NULL;
 
 /* static */
 
 static unsigned int nlayouts = 0;
+static unsigned int masterw = MASTERWIDTH;
+static unsigned int nmaster = NMASTER;
 
 static void
 tile(void) {
@@ -21,7 +22,7 @@ tile(void) {
 		n++;
 	/* window geoms */
 	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+	mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
 	th = (n > nmaster) ? wah / (n - nmaster) : 0;
 	tw = waw - mw;
 
@@ -69,11 +70,63 @@ LAYOUTS
 /* extern */
 
 void
-incnmaster(Arg *arg) {
-	if((lt->arrange != tile) || (nmaster + arg->i < 1)
-	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
+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:
+		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;
+	}
+	if(c) {
+		focus(c);
+		restack();
+	}
+}
+
+void
+incmasterw(const char *arg) {
+	int i;
+	if(lt->arrange != tile)
 		return;
-	nmaster += arg->i;
+	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();
+}
+
+void
+incnmaster(const char *arg) {
+	int i;
+
+	if(!arg)
+		nmaster = NMASTER;
+	else {
+		i = atoi(arg);
+		if((lt->arrange != tile) || (nmaster + i < 1)
+		|| (wah / (nmaster + i) <= 2 * BORDERPX))
+			return;
+		nmaster += i;
+	}
 	if(sel)
 		lt->arrange();
 	else
@@ -93,19 +146,10 @@ initlayouts(void) {
 	}
 }
 
-void
-resizemaster(Arg *arg) {
-	if(lt->arrange != tile)
-		return;
-	if(arg->i == 0)
-		master = MASTER;
-	else {
-		if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
-		|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
-			return;
-		master += arg->i;
-	}
-	lt->arrange();
+Client *
+nexttiled(Client *c) {
+	for(; c && (c->isversatile || !isvisible(c)); c = c->next);
+	return c;
 }
 
 void
@@ -132,10 +176,10 @@ restack(void) {
 }
 
 void
-setlayout(Arg *arg) {
-	unsigned int i;
+setlayout(const char *arg) {
+	int i;
 
-	if(arg->i == -1) {
+	if(!arg) {
 		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
 		if(i == nlayouts - 1)
 			lt = &layout[0];
@@ -143,9 +187,10 @@ setlayout(Arg *arg) {
 			lt = &layout[++i];
 	}
 	else {
-		if(arg->i < 0 || arg->i >= nlayouts)
+		i = atoi(arg);
+		if(i < 0 || i >= nlayouts)
 			return;
-		lt = &layout[arg->i];
+		lt = &layout[i];
 	}
 	if(sel)
 		lt->arrange();
@@ -154,11 +199,22 @@ setlayout(Arg *arg) {
 }
 
 void
-toggleversatile(Arg *arg) {
-	if(!sel || lt->arrange == versatile)
+togglemax(const char *arg) {
+	XEvent ev;
+
+	if(!sel || (lt->arrange != versatile && !sel->isversatile) || sel->isfixed)
 		return;
-	sel->isversatile = !sel->isversatile;
-	lt->arrange();
+	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);
+	}
+	else
+		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
+	drawstatus();
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
@@ -183,3 +239,21 @@ versatile(void) {
 	}
 	restack();
 }
+
+void
+zoom(const char *arg) {
+	unsigned int n;
+	Client *c;
+
+	if(!sel || lt->arrange != tile || sel->isversatile)
+		return;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
+			return;
+	detach(c);
+	attach(c);
+	focus(c);
+	lt->arrange();
+}