removed viewnext/viewprev

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 25ed6fa..bc7d42c 100644 (file)
--- a/event.c
+++ b/event.c
@@ -102,23 +102,16 @@ buttonpress(XEvent *e)
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {

-               switch(ev->button) {
-               default:
-                       x = 0;
-                       for(a.i = 0; a.i < ntags; a.i++) {
-                               x += textw(tags[a.i]);
-                               if(ev->x < x) {
+               x = 0;
+               for(a.i = 0; a.i < ntags; a.i++) {
+                       x += textw(tags[a.i]);
+                       if(ev->x < x) {
+                               if(ev->button == Button3)
+                                       toggleview(&a);
+                               else

                                        view(&a);
                                        view(&a);

-                                       break;
-                               }
+                               return;

                        }
                        }

-                       break;
-               case Button4:
-                       viewprev(&a);
-                       break;
-               case Button5:
-                       viewnext(&a);
-                       break;

                }
        }
        else if((c = getclient(ev->window))) {
                }
        }
        else if((c = getclient(ev->window))) {


@@ -132,8 +125,7 @@ buttonpress(XEvent *e)
                                movemouse(c);
                        break;
                case Button2:
                                movemouse(c);
                        break;
                case Button2:

-                       if(!c->ismax && arrange != dofloat && !c->isfloat)
-                               zoom(NULL);
+                       zoom(NULL);

                        break;
                case Button3:
                        if(!c->ismax && (arrange == dofloat || c->isfloat))
                        break;
                case Button3:
                        if(!c->ismax && (arrange == dofloat || c->isfloat))