corrections

[dwm.git] / event.c

diff --git a/event.c b/event.c
index fe25dee..0043ed2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -19,6 +18,7 @@ typedef struct {
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static void
 movemouse(Client *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;
@@ -44,11 +48,16 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        c->x = ocx + (ev.xmotion.x - x1);
                        c->y = ocy + (ev.xmotion.y - y1);
+                       if(abs(wax + c->x) < SNAP)
+                               c->x = wax;
+                       else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
+                               c->x = wax + waw - c->w - 2 * BORDERPX;
+                       if(abs(way - c->y) < SNAP)
+                               c->y = way;
+                       else if(abs((way + wah) - (c->y + c->h)) < SNAP)
+                               c->y = way + wah - c->h - 2 * BORDERPX;
                        resize(c, False, TopLeft);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
@@ -63,13 +72,17 @@ resizemouse(Client *c) {
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                               None, cursor[CurResize], CurrentTime) != GrabSuccess)
+                       None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        c->ismax = False;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        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 +100,6 @@ resizemouse(Client *c) {
                                sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
                        resize(c, True, sticky);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
@@ -121,10 +131,8 @@ buttonpress(XEvent *e) {
                                return;
                        }
                }
-               if(ev->x < x + bmw) {
-                       if(ev->button == Button1)
-                               togglemode(NULL);
-               }
+               if((ev->x < x + bmw) && (ev->button == Button1))
+                       togglemode(NULL);
        }
        else if((c = getclient(ev->window))) {
                focus(c);
@@ -136,7 +144,8 @@ buttonpress(XEvent *e) {
                }
                else if(ev->button == Button2)
                        zoom(NULL);
-               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+                               !c->isfixed) {
                        restack();
                        resizemouse(c);
                }
@@ -148,12 +157,10 @@ configurerequest(XEvent *e) {
        unsigned long newmask;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
-       XEvent synev;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
                c->ismax = False;
-               gravitate(c, True);
                if(ev->value_mask & CWX)
                        c->x = ev->x;
                if(ev->value_mask & CWY)
@@ -164,7 +171,6 @@ configurerequest(XEvent *e) {
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               gravitate(c, False);
                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;
@@ -172,24 +178,16 @@ 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)
+               if(c->isfloat) {
                        resize(c, False, TopLeft);
+                       if(!isvisible(c))
+                               ban(c);
+               }
                else
-                       arrange(NULL);
+                       arrange();
        }
        else {
                wc.x = ev->x;
@@ -220,7 +218,6 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-
        if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
                focus(c);
        else if(ev->window == root) {
@@ -245,7 +242,7 @@ expose(XEvent *e) {
 
 static void
 keypress(XEvent *e) {
-       static unsigned int len = sizeof(key) / sizeof(key[0]);
+       static unsigned int len = sizeof key / sizeof key[0];
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
@@ -257,7 +254,6 @@ keypress(XEvent *e) {
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
-                       return;
                }
        }
 }
@@ -288,13 +284,11 @@ maprequest(XEvent *e) {
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-
        if(wa.override_redirect) {
                XSelectInput(dpy, ev->window,
                                (StructureNotifyMask | PropertyChangeMask));
                return;
        }
-
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
@@ -307,7 +301,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);
@@ -318,14 +311,15 @@ propertynotify(XEvent *e) {
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                                if(!c->isfloat && (c->isfloat = (trans != 0)))
-                                       arrange(NULL);
+                                       arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
-                               updatesize(c);
+                               updatesizehints(c);
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
+                       resizetitle(c);
                        drawtitle(c);
                }
        }
@@ -358,7 +352,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 
 void
 grabkeys(void) {
-       static unsigned int len = sizeof(key) / sizeof(key[0]);
+       static unsigned int len = sizeof key / sizeof key[0];
        unsigned int i;
        KeyCode code;