small changes to dwm.1, rearranged order within main event loop

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 050e8a3..dff398a 100644 (file)
--- a/client.c
+++ b/client.c
@@ -203,8 +203,14 @@ manage(Window w, XWindowAttributes *wa)
        c->border = 0;
        setsize(c);
 
+       if(c->x + c->w + 2 > sw)
+               c->x = sw - c->w - 2;
+       if(c->x < 0)
+               c->x = 0;
+       if(c->y + c->h + 2 > sh)
+               c->y = sh - c->h - 2;
        if(c->h != sh && c->y < bh)
-               c->y = c->ty = bh;
+               c->y = bh;
 
        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
@@ -257,20 +263,6 @@ manage(Window w, XWindowAttributes *wa)
                        || (c->maxw && c->minw &&
                                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 {
-               c->x = (sw / 2) - (c->w / 2);
-               c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
-       }
-
        if(isvisible(c))
                sel = c;
        arrange(NULL);
@@ -285,7 +277,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,10 +293,6 @@ 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)
-               c->y = bottom - c->h;
        if(sticky == TopRight || sticky == BotRight)
                c->x = right - c->w;
        if(sticky == BotLeft || sticky == BotRight)