about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorarg@mig29 <unknown>2006-12-08 10:40:09 +0100
committerarg@mig29 <unknown>2006-12-08 10:40:09 +0100
commita308b7507abb77940f3b4ba34655c5a7c234bee3 (patch)
tree94ff408abea2837a11e85cedecffc7e211690ba3
parent630e7ff26f46339f93e394dd75bd6cc8c0cc841f (diff)
downloaddwm-a308b7507abb77940f3b4ba34655c5a7c234bee3.tar.gz
removed the hardcoded fixed fallback, it is useless in non-Latin1 environments
-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 6961464..ee11556 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 2.6
+VERSION = 2.7
 
 # Customize below to fit your system
 
diff --git a/draw.c b/draw.c
index eeb3e56..3bf687e 100644
--- a/draw.c
+++ b/draw.c
@@ -197,10 +197,7 @@ 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)
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
 			eprint("error, cannot init 'fixed' font\n");
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
a> 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219