From 47a78f0cebb8c4593add600a38a756f328ca3c90 Mon Sep 17 00:00:00 2001
From: gotmor <gotmor@f2baff5b-bf2c-0410-a398-912abdc3d8b2>
Date: Sun, 13 Jan 2008 00:39:34 +0000
Subject: fixed ^fn()

git-svn-id: http://dzen.googlecode.com/svn/trunk@199 f2baff5b-bf2c-0410-a398-912abdc3d8b2
---
 draw.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'draw.c')

diff --git a/draw.c b/draw.c
index 2c1f83f..8bed5f4 100644
--- a/draw.c
+++ b/draw.c
@@ -529,10 +529,15 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
 							XSetForeground(dzen.dpy, dzen.tgc, lastfg);
 							break;
 						case fn:
-							if(tval[0])
+							if(tval[0]) {
 								setfont(tval);
+							}
 							else
-								setfont(dzen.fnt);
+								setfont(dzen.fnt ? dzen.fnt : FONT);
+							if(!dzen.font.set){ 
+								gcv.font = dzen.font.xfont->fid;
+								XChangeGC(dzen.dpy, dzen.tgc, GCFont, &gcv);
+							}
 							break;
 						/*
 						case sa:
@@ -719,7 +724,11 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
 					if(tval[0])
 						setfont(tval);
 					else
-						setfont(dzen.fnt);
+						setfont(dzen.fnt ? dzen.fnt : FONT);
+					if(!dzen.font.set){ 
+						gcv.font = dzen.font.xfont->fid;
+						XChangeGC(dzen.dpy, dzen.tgc, GCFont, &gcv);
+					}
 					break;
 				/*
 				case sa:
-- 
cgit v1.2.3-54-g00ecf