changed order of colordefs in config.h's, changed config.arg.h to fit to new dmenu

[dwm.git] / event.c

diff --git a/event.c b/event.c
index fe25dee..afd13c8 100644 (file)
--- a/event.c
+++ b/event.c
@@ -37,6 +37,10 @@ movemouse(Client *c) {
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch (ev.type) {
+               case ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
@@ -46,9 +50,6 @@ movemouse(Client *c) {
                        c->y = ocy + (ev.xmotion.y - y1);
                        resize(c, False, TopLeft);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
@@ -70,6 +71,10 @@ resizemouse(Client *c) {
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch(ev.type) {
+               case ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
@@ -87,9 +92,6 @@ resizemouse(Client *c) {
                                sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
                        resize(c, True, sticky);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
@@ -172,19 +174,8 @@ configurerequest(XEvent *e) {
                newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
                if(newmask)
                        XConfigureWindow(dpy, c->win, newmask, &wc);
-               else {
-                       synev.type = ConfigureNotify;
-                       synev.xconfigure.display = dpy;
-                       synev.xconfigure.event = c->win;
-                       synev.xconfigure.window = c->win;
-                       synev.xconfigure.x = c->x;
-                       synev.xconfigure.y = c->y;
-                       synev.xconfigure.width = c->w;
-                       synev.xconfigure.height = c->h;
-                       synev.xconfigure.border_width = c->border;
-                       synev.xconfigure.above = None;
-                       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-               }
+               else
+                       configure(c);
                XSync(dpy, False);
                if(c->isfloat)
                        resize(c, False, TopLeft);