applied Jeroen's {clean,spell}.diff patches, thanks Jeroen!

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 9897640..1454b0b 100644 (file)
--- a/event.c
+++ b/event.c
@@ -135,15 +135,19 @@ 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)
-                       switch(ev->button) {
-                       case Button1:
-                               setlayout(NULL);
-                               break;
-                       }
+               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);
@@ -301,8 +305,7 @@ maprequest(XEvent *e) {
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-       fprintf(stderr, "does the window suck? %s\n", wa.map_state == IsViewable ? "no" : "yes");
-       if(wa.override_redirect || wa.map_state != IsViewable)
+       if(wa.override_redirect)
                return;
        if(!getclient(ev->window))
                manage(ev->window, &wa);