X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=fe73867a1d39ced4f3f656c8a22b48bb5df60d2c;hp=eeb3e568de3265452d19e5023e7c2e30ba17ae3a;hb=1d4a24dae02cfb3a3241c3d293e96dba910317bd;hpb=d42c3ba2dc249a77f1f2417a1c72a3b7744fd932

diff --git a/draw.c b/draw.c
index eeb3e56..fe73867 100644
--- a/draw.c
+++ b/draw.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -102,7 +102,7 @@ drawall(void) {
 	Client *c;
 
 	for(c = clients; c; c = getnext(c->next))
-		drawtitle(c);
+		drawclient(c);
 	drawstatus();
 }
 
@@ -120,7 +120,7 @@ drawstatus(void) {
 		dc.x += dc.w;
 	}
 	dc.w = bmw;
-	drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
+	drawtext(mtext, dc.status, False, False);
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
 	dc.x = bw - dc.w;
@@ -138,7 +138,7 @@ drawstatus(void) {
 }
 
 void
-drawtitle(Client *c) {
+drawclient(Client *c) {
 	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->twin);
@@ -197,11 +197,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;
 	}