simplifying regexps in config samples

[dwm.git] / event.c

diff --git a/event.c b/event.c
index c913320..bf69d9e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -82,7 +82,10 @@ resizemouse(Client *c) {
                switch(ev.type) {
                case ButtonRelease:
                        resize(c, True);
+                       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:
@@ -153,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);
                }
@@ -163,40 +167,32 @@ 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) {
+               if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+                       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 & (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;
@@ -207,8 +203,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
@@ -230,7 +226,7 @@ enternotify(XEvent *e) {
        if((c = getclient(ev->window)) && isvisible(c))
                focus(c);
        else if(ev->window == root) {
-               issel = True;
+               selscreen = True;
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
        }
@@ -254,14 +250,13 @@ keypress(XEvent *e) {
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-       for(i = 0; i < len; i++) {
+       for(i = 0; i < len; i++)
                if(keysym == key[i].keysym
-                       && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                }
-       }
 }
 
 static void
@@ -269,7 +264,7 @@ leavenotify(XEvent *e) {
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen) {
-               issel = False;
+               selscreen = False;
                focus(NULL);
        }
 }
@@ -290,11 +285,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);
 }
@@ -308,10 +300,6 @@ propertynotify(XEvent *e) {
        if(ev->state == PropertyDelete)
                return; /* ignore */
        if((c = getclient(ev->window))) {
-               if(ev->atom == wmatom[WMProtocols]) {
-                       c->proto = getproto(c->win);
-                       return;
-               }
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR: