urgency hook handling needs also to invert the square if present

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 5814844..f992ea9 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);
@@ -368,10 +368,7 @@ buttonpress(XEvent *e) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1) {
-                       if((m->layout->arrange == floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();
                        movemouse(c);
                }
                else if(ev->button == Button2) {
@@ -381,10 +378,7 @@ buttonpress(XEvent *e) {
                                zoom(NULL);
                }
                else if(ev->button == Button3 && !c->isfixed) {
-                       if((floating == m->layout->arrange) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();
                        resizemouse(c);
                }
        }
@@ -576,11 +570,13 @@ drawbar(void) {
                        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, sel && sel->tags[j] && sel->monitor == selmonitor,
+                                               isoccupied(m, 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, sel && sel->tags[j] && sel->monitor == selmonitor,
+                                               isoccupied(m, j), isurgent(i, j), m->dc.norm);
                        }
                        m->dc.x += m->dc.w;
                }
@@ -598,7 +594,7 @@ drawbar(void) {
                        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);
+                               drawsquare(m, False, sel->isfloating, False, m->dc.sel);
                        }
                        else
                                drawtext(m, NULL, m->dc.norm, False);
@@ -609,12 +605,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;
@@ -1147,14 +1143,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;
 }
 
@@ -1195,7 +1188,10 @@ movemouse(Client *c) {
                                ny = m->way;
                        else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
                                ny = m->way + m->wah - c->h - 2 * c->border;
-                       resize(c, nx, ny, c->w, c->h, False);
+                       if((monitors[selmonitor].layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+                               togglefloating(NULL);
+                       if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, False);
                        memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
                        break;
                }
@@ -1358,7 +1354,10 @@ resizemouse(Client *c) {
                                nw = 1;
                        if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
                                nh = 1;
-                       resize(c, c->x, c->y, nw, nh, True);
+                       if((monitors[selmonitor].layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+                               togglefloating(NULL);
+                       if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+                               resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
        }
@@ -1724,12 +1723,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;
@@ -1977,14 +1977,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