X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=81dd4b399823bfdf30eb452cddcf7fb452827083;hb=b233089815367983e07939b2aabb999fdc359f91;hp=b72e4d5fa69e410062e23c679710ea0a771825e6;hpb=0b7c0f10eeee1c473b1adcee3a8b90db61b854e9;p=dwm.git

diff --git a/view.c b/view.c
index b72e4d5..81dd4b3 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,44 +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 *c1p = c1->prev;
-	Client *c1n = c1->next;
-	Client *c1s = c1->snext;
-	Client *c2p = c2->prev;
-	Client *c2n = c2->next;
-	Client *c2s = c2->snext;
-
-	*c1 = *c2;
-	*c2 = tmp;
-	c1->prev = c1p;
-	c1->next = c1n;
-	c1->snext = c1s;
-	c2->prev = c2p;
-	c2->next = c2n;
-	c2->snext = c2s;
-}
-
 static void
 togglemax(Client *c) {
 	XEvent ev;
@@ -68,19 +31,10 @@ togglemax(Client *c) {
 		c->w = c->rw;
 		c->h = c->rh;
 	}
-	resize(c, True, TopLeft);
+	resize(c, True);
 	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;
@@ -102,10 +56,10 @@ dofloat(void) {
 
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
-			resize(c, True, TopLeft);
+			resize(c, True);
 		}
 		else
-			ban(c);
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -122,15 +76,15 @@ dotile(void) {
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 	/* window geoms */
-	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
 	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-	tw = waw - mw;
+	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
 	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+	tw = waw - mw;
 
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
 			if(c->isfloat) {
-				resize(c, True, TopLeft);
+				resize(c, True);
 				continue;
 			}
 			c->ismax = False;
@@ -151,12 +105,11 @@ dotile(void) {
 				else /* fallback if th < bh */
 					c->h = wah - 2 * BORDERPX;
 			}
-			resize(c, False, TopLeft);
+			resize(c, False);
 			i++;
 		}
 		else
-			ban(c);
-
+			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);
@@ -196,10 +149,13 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-	if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
 		return;
 	nmaster += arg->i;
-	arrange();
+	if(sel)
+		arrange();
+	else
+		drawstatus();
 }
 
 Bool
@@ -229,27 +185,20 @@ restack(void) {
 	Client *c;
 	XEvent ev;
 
-	if(!sel) {
-		drawstatus();
+	drawstatus();
+	if(!sel)
 		return;
-	}
-	if(sel->isfloat || arrange == dofloat) {
+	if(sel->isfloat || arrange == dofloat)
 		XRaiseWindow(dpy, sel->win);
-		XRaiseWindow(dpy, sel->twin);
-	}
 	if(arrange != dofloat) {
-		if(!sel->isfloat) {
-			XLowerWindow(dpy, sel->twin);
+		if(!sel->isfloat)
 			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));
 }
@@ -307,20 +256,14 @@ zoom(Arg *arg) {
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 
-	c = sel;
-	if(arrange == dofloat)
-		return;
-	else if(n <= nmaster)
-		pop(c);
-	else if(ismaster(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();
 }