some drawbar() polishing, and certain related fixes

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 699aed1..9f1b1f4 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -145,7 +145,7 @@ void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);
-void drawsquare(Monitor *, Bool filled, Bool empty, unsigned long col[ColLast]);
+void drawsquare(Monitor *, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
 void drawtext(Monitor *, const char *text, unsigned long col[ColLast], Bool invert);
 void *emallocz(unsigned int size);
 void enternotify(XEvent *e);
@@ -164,9 +164,9 @@ void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);
 unsigned int idxoftag(const char *tag);
 void initfont(Monitor*, const char *fontstr);
-Bool isoccupied(Monitor *m, unsigned int t);
+Bool isoccupied(unsigned int monitor, unsigned int t);
 Bool isprotodel(Client *c);
-Bool isurgent(int monitor, unsigned int t);
+Bool isurgent(unsigned int monitor, unsigned int t);
 Bool isvisible(Client *c, int monitor);
 void keypress(XEvent *e);
 void killclient(const char *arg);
@@ -374,7 +374,8 @@ buttonpress(XEvent *e) {
                else if(ev->button == Button2) {
                        if((floating != m->layout->arrange) && c->isfloating)
                                togglefloating(NULL);
-                       zoom(NULL);
+                       else
+                               zoom(NULL);
                }
                else if(ev->button == Button3 && !c->isfixed) {
                        restack();
@@ -561,37 +562,46 @@ detachstack(Client *c) {
 void
 drawbar(void) {
        int i, j, x;
+       Client *c;
 
        for(i = 0; i < mcount; i++) {
                Monitor *m = &monitors[i];
                m->dc.x = 0;
+               for(c = stack; c && !isvisible(c, i); c = c->snext);
+               fprintf(stderr, "m%d %s\n", i, c ? c->name : "NIL");
                for(j = 0; j < LENGTH(tags); j++) {
                        m->dc.w = textw(m, tags[j]);
                        if(m->seltags[j]) {
                                drawtext(m, tags[j], m->dc.sel, isurgent(i, j));
-                               drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
+                               drawsquare(m, c && c->tags[j] && c->monitor == i,
+                                               isoccupied(i, j), isurgent(i, j), m->dc.sel);
                        }
                        else {
                                drawtext(m, tags[j], m->dc.norm, isurgent(i, j));
-                               drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.norm);
+                               drawsquare(m, c && c->tags[j] && c->monitor == i,
+                                               isoccupied(i, j), isurgent(i, j), m->dc.norm);
                        }
                        m->dc.x += m->dc.w;
                }
                m->dc.w = blw;
                drawtext(m, m->layout->symbol, m->dc.norm, False);
                x = m->dc.x + m->dc.w;
-               m->dc.w = textw(m, stext);
-               m->dc.x = m->sw - m->dc.w;
-               if(m->dc.x < x) {
-                       m->dc.x = x;
-                       m->dc.w = m->sw - x;
+               if(i == selmonitor) {
+                       m->dc.w = textw(m, stext);
+                       m->dc.x = m->sw - m->dc.w;
+                       if(m->dc.x < x) {
+                               m->dc.x = x;
+                               m->dc.w = m->sw - x;
+                       }
+                       drawtext(m, stext, m->dc.norm, False);
                }
-               drawtext(m, stext, m->dc.norm, False);
+               else
+                       m->dc.x = m->sw;
                if((m->dc.w = m->dc.x - x) > bh) {
                        m->dc.x = x;
-                       if(sel && sel->monitor == selmonitor) {
-                               drawtext(m, sel->name, m->dc.sel, False);
-                               drawsquare(m, False, sel->isfloating, m->dc.sel);
+                       if(c) {
+                               drawtext(m, c->name, m->dc.sel, False);
+                               drawsquare(m, False, c->isfloating, False, m->dc.sel);
                        }
                        else
                                drawtext(m, NULL, m->dc.norm, False);
@@ -602,12 +612,12 @@ drawbar(void) {
 }
 
 void
-drawsquare(Monitor *m, Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
        int x;
        XGCValues gcv;
        XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
 
-       gcv.foreground = col[ColFG];
+       gcv.foreground = col[invert ? ColBG : ColFG];
        XChangeGC(dpy, m->dc.gc, GCForeground, &gcv);
        x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4;
        r.x = m->dc.x + 1;
@@ -676,8 +686,10 @@ enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior);
-               //return;
+       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
+               if(!isxinerama || ev->window != monitors[selmonitor].root)
+                       return;
+       }
        if((c = getclient(ev->window)))
                focus(c);
        else {
@@ -744,6 +756,7 @@ focus(Client *c) {
        }
        else {
                XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime);
+               drawbar();
        }
 }
 
@@ -969,11 +982,11 @@ initfont(Monitor *m, const char *fontstr) {
 }
 
 Bool
-isoccupied(Monitor *m, unsigned int t) {
+isoccupied(unsigned int monitor, unsigned int t) {
        Client *c;
 
        for(c = clients; c; c = c->next)
-               if(c->tags[t] && c->monitor == selmonitor)
+               if(c->tags[t] && c->monitor == monitor)
                        return True;
        return False;
 }
@@ -994,7 +1007,7 @@ isprotodel(Client *c) {
 }
 
 Bool
-isurgent(int monitor, unsigned int t) {
+isurgent(unsigned int monitor, unsigned int t) {
        Client *c;
 
        for(c = clients; c; c = c->next)
@@ -1007,8 +1020,10 @@ Bool
 isvisible(Client *c, int monitor) {
        unsigned int i;
 
+       if(c->monitor != monitor)
+               return False;
        for(i = 0; i < LENGTH(tags); i++)
-               if(c->tags[i] && monitors[c->monitor].seltags[i] && c->monitor == monitor)
+               if(c->tags[i] && monitors[c->monitor].seltags[i])
                        return True;
        return False;
 }
@@ -1140,14 +1155,11 @@ monitorat() {
 
        XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask);
        for(i = 0; i < mcount; i++) {
-               fprintf(stderr, "checking monitor[%d]: %d %d %d %d\n", i, monitors[i].sx, monitors[i].sy, monitors[i].sw, monitors[i].sh);
                if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
                && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
-                       fprintf(stderr, "%d,%d -> %d\n", x, y, i);
                        return i;
                }
        }
-       fprintf(stderr, "?,? -> 0\n");
        return 0;
 }
 
@@ -1723,12 +1735,13 @@ tile(void) {
                for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
                        n++;
 
+               /* window geoms */
+               mw = (n == 1) ? m->waw : m->mwfact * m->waw;
+               th = (n > 1) ? m->wah / (n - 1) : 0;
+               if(n > 1 && th < bh)
+                       th = m->wah;
+
                for(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
-                       /* window geoms */
-                       mw = (n == 1) ? m->waw : m->mwfact * m->waw;
-                       th = (n > 1) ? m->wah / (n - 1) : 0;
-                       if(n > 1 && th < bh)
-                               th = m->wah;
                        if(j == 0) { /* master */
                                nx = m->wax;
                                ny = m->way;
@@ -1976,14 +1989,17 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 void
 view(const char *arg) {
        unsigned int i;
-
+       Bool tmp[LENGTH(tags)];
        Monitor *m = &monitors[monitorat()];
 
-       memcpy(m->prevtags, m->seltags, sizeof initags);
        for(i = 0; i < LENGTH(tags); i++)
-               m->seltags[i] = (NULL == arg);
-       m->seltags[idxoftag(arg)] = True;
-       arrange();
+               tmp[i] = (NULL == arg);
+       tmp[idxoftag(arg)] = True;
+       if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
+               memcpy(m->prevtags, m->seltags, sizeof initags);
+               memcpy(m->seltags, tmp, sizeof initags);
+               arrange();
+       }
 }
 
 void