simpler vline

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 351a43d..2028fd9 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -9,21 +9,17 @@
 
 #define MAX(a, b)  ((a) > (b) ? (a) : (b))
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
-#define DEFFONT    "fixed"
+#define DEFAULTFN  "fixed"
 
 static Bool loadfont(DC *dc, const char *fontstr);
 
 void
 drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
-       XRectangle r;
-
-       r.x = dc->x + x;
-       r.y = dc->y + y;
-       r.width  = fill ? w : w-1;
-       r.height = fill ? h : h-1;
-
        XSetForeground(dc->dpy, dc->gc, color);
-       (fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1);
+       if(fill)
+               XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
+       else
+               XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
 }
 
 void
@@ -65,7 +61,7 @@ eprintf(const char *fmt, ...) {
        vfprintf(stderr, fmt, ap);
        va_end(ap);
 
-       if(fmt[strlen(fmt)-1] == ':') {
+       if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
                fputc(' ', stderr);
                perror(NULL);
        }
@@ -113,35 +109,34 @@ initdc(void) {
 
 void
 initfont(DC *dc, const char *fontstr) {
-       if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
+       if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
                if(fontstr != NULL)
                        fprintf(stderr, "cannot load font '%s'\n", fontstr);
-               if(fontstr == NULL || !loadfont(dc, DEFFONT))
-                       eprintf("cannot load font '%s'\n", DEFFONT);
+               if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
+                       eprintf("cannot load font '%s'\n", DEFAULTFN);
        }
        dc->font.height = dc->font.ascent + dc->font.descent;
 }
 
 Bool
 loadfont(DC *dc, const char *fontstr) {
-       char *def, **missing;
-       int i, n;
+       char *def, **missing, **names;
+       int i, n = 1;
+       XFontStruct **xfonts;
 
        if(!*fontstr)
                return False;
-       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
-               char **names;
-               XFontStruct **xfonts;
-
+       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def)))
                n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
-               for(i = dc->font.ascent = dc->font.descent = 0; i < n; i++) {
-                       dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent);
-                       dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
-               }
-       }
-       else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
-               dc->font.ascent = dc->font.xfont->ascent;
-               dc->font.descent = dc->font.xfont->descent;
+       else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr)))
+               xfonts = &dc->font.xfont;
+       else
+               n = 0;
+
+       for(i = 0; i < n; i++) {
+               dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
+               dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
+               dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
        }
        if(missing)
                XFreeStringList(missing);