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

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 949812f..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);
@@ -224,19 +228,6 @@ configurenotify(XEvent *e) {
        }
 }
 
-static void
-createnotify(XEvent *e) {
-       static XWindowAttributes wa;
-       XCreateWindowEvent *ev = &e->xcreatewindow;
-
-       if(!XGetWindowAttributes(dpy, ev->window, &wa))
-               return;
-       if(wa.override_redirect)
-               return;
-       if(!getclient(ev->window) && (wa.map_state == IsViewable))
-               manage(ev->window, &wa);
-}
-
 static void
 destroynotify(XEvent *e) {
        Client *c;
@@ -363,7 +354,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
-       [CreateNotify] = createnotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [LeaveNotify] = leavenotify,