made Layout a static struct in layout.c, added some convenience getters in layout...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 1454b0b..4bedf18 100644 (file)
--- a/event.c
+++ b/event.c
@@ -16,7 +16,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static Client *
@@ -135,32 +135,24 @@ buttonpress(XEvent *e) {
                                        else
                                                toggleview(buf);
                                }
-                               else if(ev->button == Button4)
-                                       shiftview("-1");
-                               else if(ev->button == Button5)
-                                       shiftview("1");
                                return;
                        }
                }
-               if(ev->x < x + blw && ev->button == Button1)
+               if((ev->x < x + blw) && ev->button == Button1)
                        setlayout(NULL);
-               else if(ev->button == Button4)
-                       focusclient("-1");
-               else if(ev->button == Button5)
-                       focusclient("1");
        }
        else if((c = getclient(ev->window))) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
+               if(ev->button == Button1 && (isfloating() || c->isfloating)) {
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3
-               && (lt->arrange == floating || c->isfloating) && !c->isfixed)
+               && (isfloating() || c->isfloating) && !c->isfixed)
                {
                        restack();
                        resizemouse(c);
@@ -178,7 +170,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
+               if(c->isfixed || c->isfloating || isfloating()) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)
@@ -224,7 +216,7 @@ configurenotify(XEvent *e) {
                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                XResizeWindow(dpy, barwin, sw, bh);
                updatebarpos();
-               lt->arrange();
+               arrange();
        }
 }
 
@@ -325,7 +317,7 @@ propertynotify(XEvent *e) {
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                                if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-                                       lt->arrange();
+                                       arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                updatesizehints(c);
@@ -344,8 +336,10 @@ unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
-       if((c = getclient(ev->window)))
-               unmanage(c);
+       if((c = getclient(ev->window)) && (ev->event == root)) {
+               if(ev->send_event || c->unmapped-- == 0)
+                       unmanage(c);
+       }
 }
 
 /* extern */