X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=2f2d42a2cde19d27946491e210d8b12b49f11157;hb=1d4a24dae02cfb3a3241c3d293e96dba910317bd;hp=2143d70bde04da6ab4078268b047de7999ee0add;hpb=06bae9dfb7902c97877f3493cf4b489ccf531089;p=dwm.git

diff --git a/view.c b/view.c
index 2143d70..2f2d42a 100644
--- a/view.c
+++ b/view.c
@@ -2,6 +2,7 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
 
 /* static */
 
@@ -11,40 +12,6 @@ nexttiled(Client *c) {
 	return c;
 }
 
-static Bool
-ismaster(Client *c) {
-	Client *cl;
-	unsigned int i;
-
-	for(cl = nexttiled(clients), i = 0; cl && cl != c; cl = nexttiled(cl->next), i++);
-	return i < nmaster;
-}
-
-static void
-pop(Client *c) {
-	detach(c);
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	clients = c;
-}
-
-static void
-swap(Client *c1, Client *c2) {
-	Client tmp = *c1;
-	Client *cp = c1->prev;
-	Client *cn = c1->next;
-
-	*c1 = *c2;
-	c1->prev = cp;
-	c1->next = cn;
-	cp = c2->prev;
-	cn = c2->next;
-	*c2 = tmp;
-	c2->prev = cp;
-	c2->next = cn;
-}
-
 static void
 togglemax(Client *c) {
 	XEvent ev;
@@ -68,15 +35,6 @@ togglemax(Client *c) {
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-static Client *
-topofstack() {
-	Client *c;
-	unsigned int i;
-
-	for(c = nexttiled(clients), i = 0; c && i < nmaster; c = nexttiled(c->next), i++);
-	return (i < nmaster) ? NULL : c;
-}
-
 /* extern */
 
 void (*arrange)(void) = DEFMODE;
@@ -192,10 +150,15 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-	if(nmaster + arg->i < 1)
+	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
 		return;
 	nmaster += arg->i;
-	arrange();
+	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+	bmw = textw(mtext);
+	if(sel)
+		arrange();
+	else
+		drawstatus();
 }
 
 Bool
@@ -261,6 +224,8 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
+	snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+	bmw = textw(mtext);
 	if(sel)
 		arrange();
 	else
@@ -302,18 +267,15 @@ zoom(Arg *arg) {
 	}
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
-	if(n <= nmaster || (arrange == dofloat))
-		return;
 
-	if(ismaster((c = sel))) {
-		if(!(c = topofstack()))
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
 			return;
-		swap(c, sel);
-		c = sel;
-	}
-	else
-		pop(c);
-
+	detach(c);
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
 	focus(c);
 	arrange();
 }