X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=draw.c;h=92f07ca786b705d991a6d06fd3051d64ff8e76e3;hb=1e01ca03176e6e845a2a300545061e7384c4836d;hp=62f6e2caf9cd16983d5cf0c8dc262f28d80521bc;hpb=dd7ee0dae1e8cb9ffd58fbcab7708e9042eb560c;p=dmenu.git diff --git a/draw.c b/draw.c index 62f6e2c..92f07ca 100644 --- a/draw.c +++ b/draw.c @@ -1,4 +1,4 @@ -/* (C)opyright MMIV-MMVI Anselm R. Garbe +/* (C)opyright MMIV-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dmenu.h" @@ -79,7 +79,7 @@ getcolor(const char *colstr) { void setfont(const char *fontstr) { - char **missing, *def; + char *def, **missing; int i, n; missing = NULL; @@ -107,11 +107,8 @@ setfont(const char *fontstr) { if(dc.font.xfont) XFreeFont(dpy, dc.font.xfont); dc.font.xfont = NULL; - dc.font.xfont = XLoadQueryFont(dpy, fontstr); - if (!dc.font.xfont) - dc.font.xfont = XLoadQueryFont(dpy, "fixed"); - if (!dc.font.xfont) - eprint("error, cannot init 'fixed' font\n"); + if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) + eprint("error, cannot load font: '%s'\n", fontstr); dc.font.ascent = dc.font.xfont->ascent; dc.font.descent = dc.font.xfont->descent; }