aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarg@mig29 <unknown>2006-12-08 10:41:16 +0100
committerarg@mig29 <unknown>2006-12-08 10:41:16 +0100
commit796c4fb9e542d3e14c9a2a62a4a673d210c9ad12 (patch)
tree05afb1238abc377c01e2efd4cbfd9f1720628b8c
parent93c3f930c537ff5275fe4383ea00e8f13edcf13c (diff)
removed hardcoded 'fixed' fallback, useless and misleading
-rw-r--r--config.mk2
-rw-r--r--draw.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/config.mk b/config.mk
index 280a034..bc89b16 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
1# dmenu version 1# dmenu version
2VERSION = 1.6 2VERSION = 1.7
3 3
4# Customize below to fit your system 4# Customize below to fit your system
5 5
diff --git a/draw.c b/draw.c
index bd11091..ea02c4d 100644
--- a/draw.c
+++ b/draw.c
@@ -107,10 +107,7 @@ setfont(const char *fontstr) {
107 if(dc.font.xfont) 107 if(dc.font.xfont)
108 XFreeFont(dpy, dc.font.xfont); 108 XFreeFont(dpy, dc.font.xfont);
109 dc.font.xfont = NULL; 109 dc.font.xfont = NULL;
110 dc.font.xfont = XLoadQueryFont(dpy, fontstr); 110 if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
111 if (!dc.font.xfont)
112 dc.font.xfont = XLoadQueryFont(dpy, "fixed");
113 if (!dc.font.xfont)
114 eprint("error, cannot init 'fixed' font\n"); 111 eprint("error, cannot init 'fixed' font\n");
115 dc.font.ascent = dc.font.xfont->ascent; 112 dc.font.ascent = dc.font.xfont->ascent;
116 dc.font.descent = dc.font.xfont->descent; 113 dc.font.descent = dc.font.xfont->descent;