fixed font loading

git-svn-id: http://dzen.googlecode.com/svn/trunk@134 f2baff5b-bf2c-0410-a398-912abdc3d8b2

1 files changed, 10 insertions, 3 deletions

diff --git a/draw.c b/draw.c
index f9c2517..8d788fa 100644
--- a/draw.c
+++ b/draw.c
@@ -172,6 +172,7 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
 	char lbuf[MAX_LINE_LEN], *rbuf = NULL;
 	int t=-1;
 	char *tval=NULL;
+	XGCValues gcv;
 	Drawable pm;
 	XRectangle r = { dzen.x, dzen.y, dzen.w, dzen.h};
 
@@ -261,8 +262,11 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
 				if(dzen.font.set) 
 					XmbDrawImageString(dzen.dpy, pm, dzen.font.set,
 							dzen.tgc, px, py, lbuf, tw);
-				else
+				else {
+					gcv.font = dzen.font.xfont->fid;
+					XChangeGC(dzen.dpy, dzen.tgc, GCForeground | GCFont, &gcv);
 					XDrawImageString(dzen.dpy, pm, dzen.tgc, px, py, lbuf, tw); 
+				}
 				px += tw;
 			}
 
@@ -305,8 +309,11 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
 		if(dzen.font.set)
 			XmbDrawImageString(dzen.dpy, pm, dzen.font.set,
 					dzen.tgc, px, py, lbuf, tw);
-		else
-			XDrawImageString(dzen.dpy, pm, dzen.tgc, px, py, lbuf, tw); 
+		else {
+			gcv.font = dzen.font.xfont->fid;
+			XChangeGC(dzen.dpy, dzen.tgc, GCForeground | GCFont, &gcv);
+			XDrawImageString(dzen.dpy, pm, dzen.tgc, px, py, lbuf, tw);
+		}
 		px += tw;