darkening the fg colors somewhat

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 178f1d2..0e399d8 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -8,6 +8,16 @@
 
 /* static */
 
 
 /* static */
 

+static Bool
+isoccupied(unsigned int t)
+{
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->tags[t])
+                       return True;
+       return False;
+}
+

 static unsigned int
 textnw(const char *text, unsigned int len) {
        XRectangle r;
 static unsigned int
 textnw(const char *text, unsigned int len) {
        XRectangle r;


@@ -20,7 +30,7 @@ textnw(const char *text, unsigned int len) {
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
+drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool line) {

        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;


@@ -33,8 +43,8 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
                return;
        w = 0;
        olen = len = strlen(text);
                return;
        w = 0;
        olen = len = strlen(text);

-       if(len >= sizeof(buf))
-               len = sizeof(buf) - 1;
+       if(len >= sizeof buf)
+               len = sizeof buf - 1;

        memcpy(buf, text, len);
        buf[len] = 0;
        h = dc.font.ascent + dc.font.descent;
        memcpy(buf, text, len);
        buf[len] = 0;
        h = dc.font.ascent + dc.font.descent;


@@ -63,13 +73,14 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
                XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
                XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }

-       if(highlight) {
-               r.x = dc.x + 2;
+       if(dot) {
+               r.x = dc.x + 1;

                r.y = dc.y + 2;
                r.width = r.height = (h + 2) / 4;
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
                r.y = dc.y + 2;
                r.width = r.height = (h + 2) / 4;
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }

-}
+       if(line)
+               XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 1, dc.y + 1); }

 
 /* extern */
 
 
 /* extern */
 


@@ -90,27 +101,24 @@ drawstatus(void) {
        for(i = 0; i < ntags; i++) {
                dc.w = textw(tags[i]);
                if(seltag[i])
        for(i = 0; i < ntags; i++) {
                dc.w = textw(tags[i]);
                if(seltag[i])

-                       drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+                       drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));

                else
                else

-                       drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+                       drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));

                dc.x += dc.w;
        }
        dc.w = bmw;
                dc.x += dc.w;
        }
        dc.w = bmw;

-       drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False);
+       drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False, False);

        x = dc.x + dc.w;
        dc.w = textw(stext);
        x = dc.x + dc.w;
        dc.w = textw(stext);

-       dc.x = bx + bw - dc.w;
+       dc.x = bw - dc.w;

        if(dc.x < x) {
                dc.x = x;
                dc.w = bw - x;
        }
        if(dc.x < x) {
                dc.x = x;
                dc.w = bw - x;
        }

-       drawtext(stext, dc.status, False);
+       drawtext(stext, dc.status, False, False);

        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;

-               if(sel)
-                       drawtext(sel->name, dc.sel, False);
-               else
-                       drawtext(NULL, dc.norm, False);
+               drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);

        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);


@@ -128,7 +136,7 @@ drawtitle(Client *c) {
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;

-       drawtext(c->name, dc.norm, False);
+       drawtext(c->name, dc.norm, False,False);

        XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }
        XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }