leavenotify also don't needs the check

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 42a6fc0..0133889 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,4 +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"
@@ -48,6 +48,14 @@ 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;
                }
@@ -123,8 +131,20 @@ buttonpress(XEvent *e) {
                                return;
                        }
                }
-               if((ev->x < x + bmw) && (ev->button == Button1))
-                       togglemode(NULL);
+               if(ev->x < x + bmw)
+                       switch(ev->button) {
+                       case Button1:
+                               togglemode(NULL);
+                               break;
+                       case Button4:
+                               a.i = 1;
+                               incnmaster(&a);
+                               break;
+                       case Button5:
+                               a.i = -1;
+                               incnmaster(&a);
+                               break;
+                       }
        }
        else if((c = getclient(ev->window))) {
                focus(c);
@@ -136,7 +156,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);
                }
@@ -152,7 +173,6 @@ configurerequest(XEvent *e) {
 
        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)
@@ -163,7 +183,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;
@@ -177,7 +196,7 @@ configurerequest(XEvent *e) {
                if(c->isfloat) {
                        resize(c, False, TopLeft);
                        if(!isvisible(c))
-                               ban(c);
+                               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
                else
                        arrange();
@@ -211,31 +230,27 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-       if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
+       if((c = getclient(ev->window)) && isvisible(c))
                focus(c);
        else if(ev->window == root) {
                issel = True;
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-               drawall();
+               focus(sel);
        }
 }
 
 static void
 expose(XEvent *e) {
-       Client *c;
        XExposeEvent *ev = &e->xexpose;
 
        if(ev->count == 0) {
                if(barwin == ev->window)
                        drawstatus();
-               else if((c = getctitle(ev->window)))
-                       drawtitle(c);
        }
 }
 
 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;
@@ -247,7 +262,6 @@ keypress(XEvent *e) {
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
-                       return;
                }
        }
 }
@@ -257,8 +271,8 @@ leavenotify(XEvent *e) {
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen) {
+               focus(NULL);
                issel = False;
-               drawall();
        }
 }
 
@@ -308,13 +322,13 @@ propertynotify(XEvent *e) {
                                        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);
+                       if(c == sel)
+                               drawstatus();
                }
        }
 }
@@ -346,7 +360,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;