]> git.armaanb.net Git - dwm.git/commitdiff
applied sumik's multihead patch
authorAnselm R.Garbe <arg@10ksloc.org>
Thu, 10 Aug 2006 09:26:32 +0000 (11:26 +0200)
committerAnselm R.Garbe <arg@10ksloc.org>
Thu, 10 Aug 2006 09:26:32 +0000 (11:26 +0200)
client.c
draw.c
event.c

index f2686236d9d0ff92b2d49677ff38fa6964a03843..773b8f82148d993878b177bb371b02e5d0aff269 100644 (file)
--- a/client.c
+++ b/client.c
@@ -49,6 +49,8 @@ ban(Client *c)
 void
 focus(Client *c)
 {
+       if (!issel)
+               return;
        Client *old = sel;
        XEvent ev;
 
diff --git a/draw.c b/draw.c
index 5d19bfb26486f1c9688449f88103393fd9c2ff07..869c2f21797b8627102c56e64f227e2924836968 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -138,7 +138,7 @@ drawtitle(Client *c)
        int i;
        Bool istile = arrange == dotile;
 
-       if(c == sel) {
+       if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->title);
                XSetWindowBorder(dpy, c->win, dc.fg);
diff --git a/event.c b/event.c
index 36d873f983907a3d7b28590ca889d09acd5bbea3..25ed6faad4054962bec61348a59795d925d757c5 100644 (file)
--- a/event.c
+++ b/event.c
@@ -114,10 +114,10 @@ buttonpress(XEvent *e)
                        }
                        break;
                case Button4:
-                       viewnext(&a);
+                       viewprev(&a);
                        break;
                case Button5:
-                       viewprev(&a);
+                       viewnext(&a);
                        break;
                }
        }
@@ -226,8 +226,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 +270,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