JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
removed 1 missing LOC
[dwm.git] / event.c
diff --git a/event.c b/event.c
index 967be91..1aed904 100644 (file)
--- a/event.c
+++ b/event.c
@@ -17,7 +17,6 @@ typedef struct {
        Arg arg;
 } Key;
 
-CMDS
 KEYS
 
 static unsigned int valid_mask =  255 &  ~(NUMLOCKMASK | LockMask);
@@ -32,12 +31,12 @@ movemouse(Client *c)
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch (ev.type) {
                default: break;
                case Expose:
@@ -65,12 +64,12 @@ resizemouse(Client *c)
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch(ev.type) {
                default: break;
                case Expose:
@@ -116,12 +115,10 @@ buttonpress(XEvent *e)
                        }
                        break;
                case Button4:
-                       a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
-                       view(&a);
+                       viewnext(&a);
                        break;
                case Button5:
-                       a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
-                       view(&a);
+                       viewprev(&a);
                        break;
                }
        }