fixed issue Sander reported

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 14edf7c..0309eac 100644 (file)
--- a/client.c
+++ b/client.c
@@ -187,7 +187,7 @@ killclient(Arg *arg)
 void
 manage(Window w, XWindowAttributes *wa)
 {
-       Client *c;
+       Client *c, *tc;
        Window trans;
        XSetWindowAttributes twa;
 
@@ -228,27 +228,27 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
 
        XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
 
        XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+       XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
                        GrabModeAsync, GrabModeSync, None, None);
 
        settags(c);
@@ -258,6 +258,19 @@ manage(Window w, XWindowAttributes *wa)
                                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 + c->w < 0) || (c->x >= sw))
+                       c->x = (sw / 2) - (c->w / 2);
+               if((c->y + c->h < 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);
@@ -272,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) {
@@ -289,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;