reducing ConnectionNumber calls to a bare minimum

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 36d873f..9da7ac4 100644 (file)
--- a/event.c
+++ b/event.c
@@ -108,16 +108,23 @@ 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:
-                       viewnext(&a);
+                       viewprev(&a);
                        break;
                case Button5:
-                       viewprev(&a);
+                       viewnext(&a);
                        break;
                }
        }
@@ -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))
@@ -226,8 +232,11 @@ enternotify(XEvent *e)
 
        if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
                focus(c);
-       else if(ev->window == root)
+       else if(ev->window == root) {
                issel = True;
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               drawall();
+       }
 }
 
 static void
@@ -267,8 +276,10 @@ leavenotify(XEvent *e)
 {
        XCrossingEvent *ev = &e->xcrossing;
 
-       if((ev->window == root) && !ev->same_screen)
-               issel = True;
+       if((ev->window == root) && !ev->same_screen) {
+               issel = False;
+               drawall();
+       }
 }
 
 static void