barwindow raising

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4d9a1e6..4c0e4e7 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,4 +1,5 @@
-/* © 2004-2007 Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdio.h>
@@ -173,6 +174,8 @@ configurerequest(XEvent *e) {
 
        if((c = getclient(ev->window))) {
                c->ismax = False;
+               if(ev->value_mask & CWBorderWidth)
+                       c->border = ev->border_width;
                if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
@@ -182,18 +185,18 @@ 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);
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
-               else {
-                       if(ev->value_mask & CWBorderWidth)
-                               c->border = ev->border_width;
+               else
                        configure(c);
-                       c->border = BORDERPX;
-               }
        }
        else {
                wc.x = ev->x;
@@ -208,6 +211,22 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
+static void
+configurenotify(XEvent *e) {
+       XConfigureEvent *ev = &e->xconfigure;
+
+       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);
+               lt->arrange();
+       }
+}
+
 static void
 destroynotify(XEvent *e) {
        Client *c;
@@ -228,8 +247,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();
        }
 }
 
@@ -334,6 +352,7 @@ unmapnotify(XEvent *e) {
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
+       [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [LeaveNotify] = leavenotify,