changed border handling

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4d9a1e6..72e9ccd 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>
  * 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((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;
                if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;


@@ -188,12 +191,8 @@ configurerequest(XEvent *e) {
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                        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);
                        configure(c);

-                       c->border = BORDERPX;
-               }

        }
        else {
                wc.x = ev->x;
        }
        else {
                wc.x = ev->x;