calculating the remainder for master and stack area correctly

[dwm.git] / event.c

diff --git a/event.c b/event.c
index c89850a..2773c6f 100644 (file)
--- a/event.c
+++ b/event.c
@@ -185,6 +185,10 @@ configurerequest(XEvent *e) {
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;
+                       if((c->x + c->w) > sw && c->isfloating)
+                               c->x = sw / 2 - c->w / 2; /* center in x direction */
+                       if((c->y + c->h) > sh && c->isfloating)
+                               c->y = sh / 2 - c->h / 2; /* center in y direction */
                        if((ev->value_mask & (CWX | CWY))
                        && !(ev->value_mask & (CWWidth | CWHeight)))
                                configure(c);
@@ -209,18 +213,15 @@ configurerequest(XEvent *e) {
 
 static void
 configurenotify(XEvent *e) {
-       Client *c;
        XConfigureEvent *ev = &e->xconfigure;
-       XWindowChanges wc;
 
        if (ev->window == root && (ev->width != sw || ev->height != sh)) {
                sw = ev->width;
                sh = ev->height;
-               wah = sh - bh;
-               waw = sw;
                XFreePixmap(dpy, dc.drawable);
                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                XResizeWindow(dpy, barwin, sw, bh);
+               updatebarpos();
                lt->arrange();
        }
 }
@@ -245,8 +246,7 @@ enternotify(XEvent *e) {
                focus(c);
        else if(ev->window == root) {
                selscreen = True;
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
+               focustopvisible();
        }
 }