X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=e11abfda43d767aca153b5466e19bf43a61a2565;hb=bced9077f963be2bce4f0c60023c3b48af54b8e9;hp=b89264c2f43ec7e23e7bb91c80a1db5ce220917f;hpb=87836d79ef90e6c764d94c229183179a36eb699a;p=dwm.git

diff --git a/client.c b/client.c
index b89264c..e11abfd 100644
--- a/client.c
+++ b/client.c
@@ -142,14 +142,14 @@ manage(Window w, XWindowAttributes *wa) {
 	}
 	else {
 		c->border = BORDERPX;
-		if(c->x < wax)
-			c->x = wax;
-		if(c->y < way)
-			c->y = way;
 		if(c->x + c->w + 2 * c->border > wax + waw)
 			c->x = wax + waw - c->w - 2 * c->border;
 		if(c->y + c->h + 2 * c->border > way + wah)
 			c->y = way + wah - c->h - 2 * c->border;
+		if(c->x < wax)
+			c->x = wax;
+		if(c->y < way)
+			c->y = way;
 	}
 	updatesizehints(c);
 	c->proto = getproto(c->win);
@@ -178,6 +178,8 @@ void
 resize(Client *c, Bool sizehints) {
 	XWindowChanges wc;
 
+	if(c->w <= 0 || c->h <= 0)
+		return;
 	if(sizehints) {
 		if(c->incw)
 			c->w -= (c->w - c->basew) % c->incw;
@@ -197,14 +199,14 @@ resize(Client *c, Bool sizehints) {
 	else
 		c->border = BORDERPX;
 	/* offscreen appearance fixes */
-	if(c->x + c->w + 2 * c->border < sx)
-		c->x = sx;
-	if(c->y + c->h + 2 * c->border < sy)
-		c->y = sy;
 	if(c->x > sw)
 		c->x = sw - c->w - 2 * c->border;
 	if(c->y > sh)
 		c->y = sh - c->h - 2 * c->border;
+	if(c->x + c->w + 2 * c->border < sx)
+		c->x = sx;
+	if(c->y + c->h + 2 * c->border < sy)
+		c->y = sy;
 	wc.x = c->x;
 	wc.y = c->y;
 	wc.width = c->w;