fixed a bug reported by sander

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 050e8a3..b158f01 100644 (file)
--- a/client.c
+++ b/client.c
@@ -258,15 +258,7 @@ manage(Window w, XWindowAttributes *wa)
                                c->maxw == c->minw && c->maxh == c->minh);
        settitle(c);
 
                                c->maxw == c->minw && c->maxh == c->minh);
        settitle(c);
 

-       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)
-                       c->x = (sw / 2) - (c->w / 2);
-               if(c->y < 0 || c->y >= sh)
-                       c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
-       }
-       else {
+       if(!trans) {

                c->x = (sw / 2) - (c->w / 2);
                c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
        }
                c->x = (sw / 2) - (c->w / 2);
                c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
        }


@@ -285,7 +277,6 @@ resize(Client *c, Bool sizehints, Corner sticky)
 {
        int bottom = c->y + c->h;
        int right = c->x + c->w;
 {
        int bottom = c->y + c->h;
        int right = c->x + c->w;

-       /*XConfigureEvent e;*/

        XWindowChanges wc;
 
        if(sizehints) {
        XWindowChanges wc;
 
        if(sizehints) {


@@ -302,10 +293,10 @@ resize(Client *c, Bool sizehints, Corner sticky)
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }
                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)
-               c->y = bottom - c->h;
+       if(c->x > sw) /* might happen on restart */
+               c->x = sw - c->w;
+       if(c->y > sh)
+               c->y = sh - c->h;

        if(sticky == TopRight || sticky == BotRight)
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)
        if(sticky == TopRight || sticky == BotRight)
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)