applied dave's highlight patch for big fonts

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 65a3d51..bbcfadb 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -72,7 +72,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);
        }
 }
@@ -80,7 +80,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
 /* extern */
 
 void
-drawall() {
+drawall(void) {
        Client *c;
 
        for(c = clients; c; c = getnext(c->next))
@@ -89,7 +89,7 @@ drawall() {
 }
 
 void
-drawstatus() {
+drawstatus(void) {
        int i, x;
 
        dc.x = dc.y = 0;
@@ -104,7 +104,9 @@ drawstatus() {
        }
 
        dc.w = bmw;
-       drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
+       drawtext(arrange == dofloat ?
+               FLOATSYMBOL : stackpos == StackBottom ?
+                       BSTACKSYMBOL : VSTACKSYMBOL, dc.status, False);
 
        x = dc.x + dc.w;
        dc.w = textw(stext);
@@ -149,7 +151,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;
 }