X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/1f2226df1380f178240bb81dddcad6c5ff2e9d62..b3d9451c2ddfad7c1b10e9a868afed4d92b37e41:/drw.c

diff --git a/drw.c b/drw.c
index 4815e3a..80e3c39 100644
--- a/drw.c
+++ b/drw.c
@@ -108,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
@@ -122,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;
 
@@ -227,9 +224,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 	char buf[1024];
 	int tx, ty, th;
 	Extnts tex;
-	Colormap cmap;
-	Visual *vis;
-	XftDraw *d;
+	XftDraw *d = NULL;
 	Fnt *curfont, *nextfont;
 	size_t i, len;
 	int utf8strlen, utf8charlen, render;
@@ -241,22 +236,18 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 	XftResult result;
 	int charexists = 0;
 
-	if (!(render = x || y || w || h))
-		w = ~w;
-
-	if (!drw || !drw->scheme) {
+	if (!drw->scheme || !drw->fontcount)
 		return 0;
-	} else if (render) {
-		XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-	}
 
-	if (!text || !drw->fontcount) {
-		return 0;
-	} else if (render) {
-		cmap = DefaultColormap(drw->dpy, drw->screen);
-		vis = DefaultVisual(drw->dpy, drw->screen);
-		d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap);
+	if (!(render = x || y || w || h)) {
+		w = ~w;
+	} else {
+		XSetForeground(drw->dpy, drw->gc, invert ?
+		               drw->scheme->fg->pix : drw->scheme->bg->pix);
+		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+		d = XftDrawCreate(drw->dpy, drw->drawable,
+		                  DefaultVisual(drw->dpy, drw->screen),
+		                  DefaultColormap(drw->dpy, drw->screen));
 	}
 
 	curfont = drw->fonts[0];
@@ -328,7 +319,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 			if (!drw->fonts[0]->pattern) {
 				/* Refer to the comment in drw_font_xcreate for more
 				 * information. */
-				die("The first font in the cache must be loaded from a font string.\n");
+				die("the first font in the cache must be loaded from a font string.\n");
 			}
 
 			fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
@@ -347,14 +338,13 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
 				if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
 					drw->fonts[drw->fontcount++] = curfont;
 				} else {
-					if (curfont)
-						drw_font_free(curfont);
+					drw_font_free(curfont);
 					curfont = drw->fonts[0];
 				}
 			}
 		}
 	}
-	if (render)
+	if (d)
 		XftDrawDestroy(d);
 
 	return x;