reducing ConnectionNumber calls to a bare minimum

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 25ed6fa..9da7ac4 100644 (file)
--- a/event.c
+++ b/event.c
@@ -108,10 +108,17 @@ buttonpress(XEvent *e)
                        for(a.i = 0; a.i < ntags; a.i++) {
                                x += textw(tags[a.i]);
                                if(ev->x < x) {
-                                       view(&a);
-                                       break;
+                                       if(ev->button == Button3)
+                                               toggleview(&a);
+                                       else
+                                               view(&a);
+                                       return;
                                }
                        }
+                       if(ev->button == Button1)
+                               viewprev(&a);
+                       else if(ev->button == Button3)
+                               viewnext(&a);
                        break;
                case Button4:
                        viewprev(&a);
@@ -132,8 +139,7 @@ buttonpress(XEvent *e)
                                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))