X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tile.c;h=d03e4faa7df63a9a2be26900c1f13bf2a732f1c9;hb=77044e876511f51c34bde379d89e2de754707ee6;hp=40e40e28435c6282139f47711f514a9ba0e2b279;hpb=2d81b78b853565a3e34a8a9190e2362a6fdde739;p=dwm.git

diff --git a/tile.c b/tile.c
index 40e40e2..d03e4fa 100644
--- a/tile.c
+++ b/tile.c
@@ -4,24 +4,23 @@
 
 /* static */
 
-static double master = MASTER;
+static double mwfact = MWFACT;
 
 /* extern */
 
 void
-incmaster(const char *arg) {
+addtomwfact(const char *arg) {
 	double delta;
 
-	if(lt->arrange != tile)
+	if(isarrange(tile))
 		return;
 
-	/* arg handling, manipulate master */
+	/* arg handling, manipulate mwfact */
 	if(arg && (1 == sscanf(arg, "%lf", &delta))) {
-		if(delta + master > 0.1 && delta + master < 0.9)
-			master += delta;
+		if(delta + mwfact > 0.1 && delta + mwfact < 0.9)
+			mwfact += delta;
 	}
-
-	lt->arrange();
+	arrange();
 }
 
 void
@@ -33,7 +32,7 @@ tile(void) {
 		n++;
 
 	/* window geoms */
-	mw = (n == 1) ? waw : master * waw;
+	mw = (n == 1) ? waw : mwfact * waw;
 	th = (n > 1) ? wah / (n - 1) : 0;
 	if(n > 1 && th < bh)
 		th = wah;
@@ -42,7 +41,6 @@ tile(void) {
 	ny = way;
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
-			unban(c);
 			if(c->isfloating)
 				continue;
 			c->ismax = False;
@@ -66,17 +64,13 @@ tile(void) {
 				ny += nh + 2 * c->border;
 			i++;
 		}
-		else
-			ban(c);
-	focus(NULL);
-	restack();
 }
 
 void
 zoom(const char *arg) {
 	Client *c;
 
-	if(!sel || lt->arrange == floating || sel->isfloating)
+	if(!sel || !isarrange(tile) || sel->isfloating)
 		return;
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))
@@ -84,5 +78,5 @@ zoom(const char *arg) {
 	detach(c);
 	attach(c);
 	focus(c);
-	lt->arrange();
+	arrange();
 }