X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=0309eace9e46817935a13e8509e1d106b52acfb7;hb=67c2124fa9962743fd7406953506dabce282683c;hp=050e8a3bcacaa0e07d36b21248fb5e78ef44e034;hpb=ad2e77d6350b1f43513d052018735d2a8f949d78;p=dwm.git

diff --git a/client.c b/client.c
index 050e8a3..0309eac 100644
--- a/client.c
+++ b/client.c
@@ -261,9 +261,9 @@ manage(Window w, XWindowAttributes *wa)
 	if(trans && (tc = getclient(trans))) {
 		c->x = (tc->x + tc->w / 2) - (c->w / 2);
 		c->y = (tc->y + tc->h / 2) - (c->h / 2);
-		if(c->x < 0 || c->x >= sw)
+		if((c->x + c->w < 0) || (c->x >= sw))
 			c->x = (sw / 2) - (c->w / 2);
-		if(c->y < 0 || c->y >= sh)
+		if((c->y + c->h < 0) || (c->y >= sh))
 			c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
 	}
 	else {
@@ -285,7 +285,6 @@ resize(Client *c, Bool sizehints, Corner sticky)
 {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
-	/*XConfigureEvent e;*/
 	XWindowChanges wc;
 
 	if(sizehints) {
@@ -302,9 +301,9 @@ resize(Client *c, Bool sizehints, Corner sticky)
 		if(c->maxh && c->h > c->maxh)
 			c->h = c->maxh;
 	}
-	if(c->x > right) /* might happen on restart */
-		c->x = right - c->w;
-	if(c->y > bottom)
+	if(c->x > sw) /* might happen on restart */
+		c->x = sw - c->w;
+	if(c->y > sh)
 		c->y = bottom - c->h;
 	if(sticky == TopRight || sticky == BotRight)
 		c->x = right - c->w;