X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=114aeddc6328d0320593ab82dd198ece49f59ab7;hb=77044e876511f51c34bde379d89e2de754707ee6;hp=68d10a7333402f402fc317221f55120a4f4f9dd8;hpb=83aa110c6fabbf5f5a14b698a6ca22072cb80629;p=dwm.git

diff --git a/client.c b/client.c
index 68d10a7..114aedd 100644
--- a/client.c
+++ b/client.c
@@ -98,10 +98,12 @@ attach(Client *c) {
 
 void
 ban(Client *c) {
-	if (c->isbanned)
+	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	XUnmapWindow(dpy, c->win);
+	setclientstate(c, IconicState);
 	c->isbanned = True;
+	c->unmapped++;
 }
 
 void
@@ -135,7 +137,7 @@ detach(Client *c) {
 
 void
 focus(Client *c) {
-	if((!c && selscreen)|| (c && !isvisible(c)))
+	if((!c && selscreen) || (c && !isvisible(c)))
 		for(c = stack; c && !isvisible(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
@@ -224,26 +226,24 @@ manage(Window w, XWindowAttributes *wa) {
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
 	attachstack(c);
-	ban(c);
-	XMapWindow(dpy, w);
-	setclientstate(c, NormalState);
+	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+	setclientstate(c, IconicState);
+	c->isbanned = True;
 	focus(c);
-	lt->arrange();
+	arrange();
 }
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	float dx, dy, max, min, ratio;
-	XWindowChanges wc;
+	double dx, dy, max, min, ratio;
+	XWindowChanges wc; 
 
-	if(w <= 0 || h <= 0)
-		return;
 	if(sizehints) {
-		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) {
-			dx = (float)(w - c->basew);
-			dy = (float)(h - c->baseh);
-			min = (float)(c->minax) / (float)(c->minay);
-			max = (float)(c->maxax) / (float)(c->maxay);
+		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
+			dx = (double)(w - c->basew);
+			dy = (double)(h - c->baseh);
+			min = (double)(c->minax) / (double)(c->minay);
+			max = (double)(c->maxax) / (double)(c->maxay);
 			ratio = dx / dy;
 			if(max > 0 && min > 0 && ratio > 0) {
 				if(ratio < min) {
@@ -272,9 +272,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 			w -= (w - c->basew) % c->incw;
 		if(c->inch)
 			h -= (h - c->baseh) % c->inch;
+		if(w <= 0 || h <= 0)
+			return;
 	}
-	if(w <= 0 || h <= 0)
-		return;
 	/* offscreen appearance fixes */
 	if(x > sw)
 		x = sw - w - 2 * c->border;
@@ -298,19 +298,20 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
 void
 togglefloating(const char *arg) {
-	if(!sel || lt->arrange == floating)
+	if(!sel || isfloating())
 		return;
 	sel->isfloating = !sel->isfloating;
 	if(sel->isfloating)
 		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-	lt->arrange();
+	arrange();
 }
 
 void
 unban(Client *c) {
-	if (!c->isbanned)
+	if(!c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x, c->y);
+	XMapWindow(dpy, c->win);
+	setclientstate(c, NormalState);
 	c->isbanned = False;
 }
 
@@ -334,7 +335,7 @@ unmanage(Client *c) {
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	lt->arrange();
+	arrange();
 }
 
 void