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

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4c0e4e7..1454b0b 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,6 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -137,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);
@@ -218,11 +220,10 @@ configurenotify(XEvent *e) {
        if (ev->window == root && (ev->width != sw || ev->height != sh)) {
                sw = ev->width;
                sh = ev->height;
-               wah = sh - bh;
-               waw = sw;
                XFreePixmap(dpy, dc.drawable);
                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                XResizeWindow(dpy, barwin, sw, bh);
+               updatebarpos();
                lt->arrange();
        }
 }
@@ -243,11 +244,11 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-       if((c = getclient(ev->window)) && isvisible(c))
+       if((c = getclient(ev->window)))
                focus(c);
        else if(ev->window == root) {
                selscreen = True;
-               focustopvisible();
+               focus(NULL);
        }
 }