drw: simplify drw_font_xcreate and prevent a potential unneeded allocation

[dmenu.git] / drw.c

diff --git a/drw.c b/drw.c
index a98083e..4364117 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -82,8 +82,6 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
 void
 drw_resize(Drw *drw, unsigned int w, unsigned int h)
 {
-       if (!drw)
-               return;
        drw->w = w;
        drw->h = h;
        if (drw->drawable)
@@ -110,12 +108,8 @@ static Fnt *
 drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
 {
        Fnt *font;
-
-       if (!(fontname || fontpattern))
-               die("No font specified.\n");
-
-       if (!(font = calloc(1, sizeof(Fnt))))
-               return NULL;
+       XftFont *xfont = NULL;
+       FcPattern *pattern = NULL;
 
        if (fontname) {
                /* Using the pattern found at font->xfont->pattern does not yield same
@@ -124,28 +118,29 @@ drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
                 * behaviour whereas the former just results in
                 * missing-character-rectangles being drawn, at least with some fonts.
                 */
-               if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) ||
-                   !(font->pattern = FcNameParse((FcChar8 *) fontname))) {
-                       if (font->xfont) {
-                               XftFontClose(drw->dpy, font->xfont);
-                               font->xfont = NULL;
-                       }
+               if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
                        fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
+                       return NULL;
+               }
+               if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
+                       fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
+                       XftFontClose(drw->dpy, xfont);
+                       return NULL;
                }
        } else if (fontpattern) {
-               if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern)))
+               if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
                        fprintf(stderr, "error, cannot load font pattern.\n");
-               else
-                       font->pattern = NULL;
-       }
-
-       if (!font->xfont) {
-               free(font);
-               return NULL;
+                       return NULL;
+               }
+       } else {
+               die("no font specified.\n");
        }
 
-       font->ascent = font->xfont->ascent;
-       font->descent = font->xfont->descent;
+       font = ecalloc(1, sizeof(Fnt));
+       font->xfont = xfont;
+       font->pattern = pattern;
+       font->ascent = xfont->ascent;
+       font->descent = xfont->descent;
        font->h = font->ascent + font->descent;
        font->dpy = drw->dpy;
 
@@ -188,8 +183,6 @@ Clr *
 drw_clr_create(Drw *drw, const char *clrname)
 {
        Clr *clr;
-       if (!drw)
-               return NULL;
 
        clr = ecalloc(1, sizeof(Clr));
        if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
@@ -210,15 +203,13 @@ drw_clr_free(Clr *clr)
 void
 drw_setscheme(Drw *drw, ClrScheme *scheme)
 {
-       if (!drw)
-               return;
        drw->scheme = scheme;
 }
 
 void
 drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
 {
-       if (!drw || !drw->scheme)
+       if (!drw->scheme)
                return;
        XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
        if (filled)
@@ -369,8 +360,6 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 void
 drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
 {
-       if (!drw)
-               return;
        XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
        XSync(drw->dpy, False);
 }
@@ -380,8 +369,6 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
 {
        XGlyphInfo ext;
 
-       if (!font || !text)
-               return;
        XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
        tex->h = font->h;
        tex->w = ext.xOff;
@@ -392,9 +379,8 @@ drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
 {
        Extnts tex;
 
-       if (!font)
-               return -1;
        drw_font_getexts(font, text, len, &tex);
+
        return tex.w;
 }
 
@@ -403,8 +389,6 @@ drw_cur_create(Drw *drw, int shape)
 {
        Cur *cur;
 
-       if (!drw)
-               return NULL;
        cur = ecalloc(1, sizeof(Cur));
        cur->cursor = XCreateFontCursor(drw->dpy, shape);
 
@@ -414,7 +398,7 @@ drw_cur_create(Drw *drw, int shape)
 void
 drw_cur_free(Drw *drw, Cur *cursor)
 {
-       if (!drw || !cursor)
+       if (!cursor)
                return;
        XFreeCursor(drw->dpy, cursor->cursor);
        free(cursor);