removed shiftview(), if you scroll the views in the tag area, you can also use Button...

removed focusclient([-]1) bound to scroll wheel - if you slightly move the mouse you will focus the first client anways which is in the way

diff --git a/dwm.h b/dwm.h
index d54fdc0..999f027 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -144,7 +144,6 @@ void tag(const char *arg);          /* tags sel with arg's index */
 void toggletag(const char *arg);       /* toggles sel tags with arg's index */
 void toggleview(const char *arg);      /* toggles the tag with arg's index (in)visible */
 void view(const char *arg);            /* views the tag with arg's index */
-void shiftview(const char *arg);        /* views next(1)/previous(-1) tag */
 
 /* util.c */
 void *emallocz(unsigned int size);     /* allocates zero-initialized memory, exits on error */

diff --git a/event.c b/event.c
index 1454b0b..b870821 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,19 +135,11 @@ 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);

diff --git a/tag.c b/tag.c
index 2311ade..c44954b 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -99,24 +99,6 @@ settags(Client *c, Client *trans) {
                        c->tags[i] = seltag[i];
 }
 
-void 
-shiftview(const char *arg) {
-       int i, j;
-
-       for(i = 0; !seltag[i]; i++);
-       for(j = i + 1; j < ntags && !seltag[j]; j++);
-       if(j < ntags)
-               return; /* more than one tag selected */
-       seltag[i] = False;
-       i += arg ? atoi(arg) : 0;
-       if(i < 0)
-               i = ntags - 1;
-       else if(i >= ntags)
-               i = 0;
-       seltag[i] = True;
-       lt->arrange();
-}
-
 void
 tag(const char *arg) {
        int i;