added some TODOs, some other focus fixes

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 8862f59..b54ccd4 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -211,6 +211,7 @@ static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
+static void unfocus(Client *c);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);
 static void updategeom(void);
@@ -391,9 +392,20 @@ buttonpress(XEvent *e) {
        unsigned int i, x, click;
        Arg arg = {0};
        Client *c;
+       Monitor *m;
        XButtonPressedEvent *ev = &e->xbutton;
 
        click = ClkRootWin;
+       /* focus monitor if necessary */
+       for(m = mons; m; m = m->next)
+               if(ev->window == m->barwin) {
+                       if(m != selmon) {
+                               unfocus(selmon->stack);
+                               selmon = m;
+                               focus(NULL);
+                       }
+                       break;
+               }
        if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
                i = 0;
                x = selmon->btx;
@@ -757,11 +769,11 @@ void
 focus(Client *c) {
        if(!c || !ISVISIBLE(c))
                for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
-       if(selmon->sel && selmon->sel != c) {
-               grabbuttons(selmon->sel, False);
-               XSetWindowBorder(dpy, selmon->sel->win, dc.norm[ColBorder]);
-       }
+       if(selmon->sel)
+               unfocus(selmon->sel);
        if(c) {
+               if(c->mon != selmon)
+                       selmon = c->mon;
                if(c->isurgent)
                        clearurgent(c);
                detachstack(c);
@@ -792,8 +804,13 @@ focusmon(const Arg *arg) {
 
        for(i = 0, m = mons; m; m = m->next, i++)
                if(i == arg->ui) {
-                       selmon = m;
-                       focus(NULL);
+                       if(m->stack)
+                               focus(m->stack);
+                       else {
+                               unfocus(selmon->stack);
+                               selmon = m;
+                               focus(NULL);
+                       }
                        drawbars();
                        break;
                }
@@ -1213,8 +1230,7 @@ resize(Client *c, int x, int y, int w, int h) {
                c->w = wc.width = w;
                c->h = wc.height = h;
                wc.border_width = c->bw;
-               XConfigureWindow(dpy, c->win,
-                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+               XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
                configure(c);
                XSync(dpy, False);
        }
@@ -1488,8 +1504,9 @@ tagmon(const Arg *arg) {
                        c->mon = m;
                        attach(c);
                        attachstack(c);
-                       selmon->sel = selmon->stack;
                        m->sel = c;
+                       for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+                       selmon->sel = c;
                        arrange();
                        break;
                }
@@ -1584,6 +1601,15 @@ toggleview(const Arg *arg) {
 }
 
 void
+unfocus(Client *c) {
+       if(!c)
+               return;
+       grabbuttons(c, False);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+void
 unmanage(Client *c) {
        XWindowChanges wc;
 
@@ -1595,7 +1621,10 @@ unmanage(Client *c) {
        detach(c);
        detachstack(c);
        if(c->mon->sel == c) {
-               c->mon->sel = c->mon->stack;
+               /* TODO: consider separate the next code into a function or into detachstack? */
+               Client *tc;
+               for(tc = c->mon->stack; tc && !ISVISIBLE(tc); tc = tc->snext);
+               c->mon->sel = tc;
                focus(NULL);
        }
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
@@ -1726,7 +1755,7 @@ updategeom(void) {
        }
 
        /* reassign left over clients of disappeared monitors */
-       for(tm = mons; tm; tm = tm->next) {
+       for(tm = mons; tm; tm = tm->next)
                while(tm->clients) {
                        c = tm->clients;
                        tm->clients = c->next;
@@ -1735,7 +1764,6 @@ updategeom(void) {
                        attach(c);
                        attachstack(c);
                }
-       }
 
        /* select focused monitor */
        selmon = newmons;