I didn't knew of c->isfixed, that should fix Jukkas issue with gkrellm ;)

[dwm.git] / event.c

diff --git a/event.c b/event.c
index cfe2d2a..a2df33f 100644 (file)
--- a/event.c
+++ b/event.c
@@ -85,6 +85,7 @@ resizemouse(Client *c) {
                        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
                                        c->w + c->border - 1, c->h + c->border - 1);
                        XUngrabPointer(dpy, CurrentTime);
+                       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
                        return;
                case ConfigureRequest:
                case Expose:
@@ -155,8 +156,9 @@ buttonpress(XEvent *e) {
                }
                else if(ev->button == Button2)
                        zoom(NULL);
-               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
-                               !c->isfixed) {
+               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)
+                               && !c->isfixed)
+               {
                        restack();
                        resizemouse(c);
                }
@@ -165,40 +167,26 @@ buttonpress(XEvent *e) {
 
 static void
 configurerequest(XEvent *e) {
-       unsigned long newmask;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
                c->ismax = False;
-               if(ev->value_mask & CWX)
-                       c->x = ev->x;
-               if(ev->value_mask & CWY)
-                       c->y = ev->y;
-               if(ev->value_mask & CWWidth)
-                       c->w = ev->width;
-               if(ev->value_mask & CWHeight)
-                       c->h = ev->height;
-               if(ev->value_mask & CWBorderWidth)
-                       c->border = ev->border_width;
-               wc.x = c->x;
-               wc.y = c->y;
-               wc.width = c->w;
-               wc.height = c->h;
-               newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
-               if(newmask)
-                       XConfigureWindow(dpy, c->win, newmask, &wc);
-               else
-                       configure(c);
-               XSync(dpy, False);
-               if(c->isfloat) {
+               c->border = (ev->value_mask & CWBorderWidth) ? ev->border_width : c->border;
+               if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+                       c->x = (ev->value_mask & CWX) ? ev->x : c->x;
+                       c->y = (ev->value_mask & CWY) ? ev->y : c->y;
+                       c->w = (ev->value_mask & CWWidth) ? ev->width : c->w;
+                       c->h = (ev->value_mask & CWHeight) ? ev->height : c->h;
+                       if((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight)))
+                               configure(c);
                        resize(c, False);
                        if(!isvisible(c))
                                XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
                else
-                       arrange();
+                       configure(c);
        }
        else {
                wc.x = ev->x;
@@ -209,8 +197,8 @@ configurerequest(XEvent *e) {
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-               XSync(dpy, False);
        }
+       XSync(dpy, False);
 }
 
 static void
@@ -292,11 +280,8 @@ maprequest(XEvent *e) {
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-       if(wa.override_redirect) {
-               XSelectInput(dpy, ev->window,
-                               (StructureNotifyMask | PropertyChangeMask));
+       if(wa.override_redirect)
                return;
-       }
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }