added some TODOs, some other focus fixes

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 4c001fa..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;
@@ -644,7 +656,7 @@ drawbar(Monitor *m) {
        }
        else
                x = dc.x;
-       if(m == selmon) {
+       if(m == selmon) { /* status is only drawn on selected monitor */
                dc.w = TEXTW(stext);
                dc.x = m->ww - dc.w;
                if(dc.x < x) {
@@ -652,20 +664,19 @@ drawbar(Monitor *m) {
                        dc.w = m->ww - x;
                }
                drawtext(stext, dc.norm, False);
-               if((dc.w = dc.x - x) > bh) {
-                       dc.x = x;
-                       if(selmon->sel) {
-                               drawtext(selmon->sel->name, dc.sel, False);
-                               drawsquare(selmon->sel->isfixed, selmon->sel->isfloating, False, dc.sel);
-                       }
-                       else
-                               drawtext(NULL, dc.norm, False);
-               }
        }
        else {
+               dc.x = m->ww;
+       }
+       if((dc.w = dc.x - x) > bh) {
                dc.x = x;
-               dc.w = m->ww - x;
-               drawtext(NULL, dc.norm, False);
+               if(m->sel) {
+                       col = m == selmon ? dc.sel : dc.norm;
+                       drawtext(m->sel->name, col, False);
+                       drawsquare(m->sel->isfixed, m->sel->isfloating, False, col);
+               }
+               else
+                       drawtext(NULL, dc.norm, False);
        }
        XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
        XSync(dpy, False);
@@ -758,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);
@@ -793,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;
                }
@@ -829,12 +845,14 @@ focusstack(const Arg *arg) {
 
 Client *
 getclient(Window w) {
-       Client *c = NULL;
+       Client *c;
        Monitor *m;
 
        for(m = mons; m; m = m->next)
-               for(c = m->clients; c && c->win != w; c = c->next);
-       return c;
+               for(c = m->clients; c; c = c->next)
+                       if(c->win == w)
+                               return c;
+       return NULL;
 }
 
 unsigned long
@@ -1212,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);
        }
@@ -1487,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;
                }
@@ -1583,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;
 
@@ -1594,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);
@@ -1725,15 +1755,15 @@ updategeom(void) {
        }
 
        /* reassign left over clients of disappeared monitors */
-       for(tm = mons; tm; tm = tm->next) {
-               while((c = tm->clients)) {
-                       detach(c);
+       for(tm = mons; tm; tm = tm->next)
+               while(tm->clients) {
+                       c = tm->clients;
+                       tm->clients = c->next;
                        detachstack(c);
                        c->mon = newmons;
                        attach(c);
                        attachstack(c);
                }
-       }
 
        /* select focused monitor */
        selmon = newmons;