returning to old bar colorization behavior, like sander proposed for consistency...

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 3fbac5b..cee56f9 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -30,21 +29,17 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
        if(!text)
                return;
-
        w = 0;
        olen = len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
        buf[len] = 0;
-
        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
-
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
@@ -56,7 +51,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
                if(len > 3)
                        buf[len - 3] = '.';
        }
-
        if(w > dc.w)
                return; /* too long */
        gcv.foreground = col[ColFG];
@@ -72,7 +66,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
        if(highlight) {
                r.x = dc.x + 2;
                r.y = dc.y + 2;
-               r.width = r.height = 3;
+               r.width = r.height = (h + 2) / 4;
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
 }
@@ -93,7 +87,6 @@ drawstatus(void) {
        int i, x;
 
        dc.x = dc.y = 0;
-
        for(i = 0; i < ntags; i++) {
                dc.w = textw(tags[i]);
                if(seltag[i])
@@ -102,25 +95,19 @@ drawstatus(void) {
                        drawtext(tags[i], dc.norm, sel && sel->tags[i]);
                dc.x += dc.w;
        }
-
        dc.w = bmw;
-       drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
-
+       drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False);
        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;
        }
        drawtext(stext, dc.status, False);
-
        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);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
@@ -134,7 +121,6 @@ drawtitle(Client *c) {
                XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
                return;
        }
-
        XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
@@ -149,7 +135,8 @@ getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);
        return color.pixel;
 }
 
@@ -176,7 +163,6 @@ setfont(const char *fontstr) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
-
                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);