aboutsummaryrefslogtreecommitdiffstats
path: root/draw.c
diff options
context:
space:
mode:
authorgotmor <gotmor@f2baff5b-bf2c-0410-a398-912abdc3d8b2>2008-01-13 00:39:34 +0000
committergotmor <gotmor@f2baff5b-bf2c-0410-a398-912abdc3d8b2>2008-01-13 00:39:34 +0000
commit47a78f0cebb8c4593add600a38a756f328ca3c90 (patch)
treeabe502469596b6656c0677eae71347fd858781e3 /draw.c
parent2d9004765dacb68faeafe7025fdf6f58925c4978 (diff)
downloaddzen-47a78f0cebb8c4593add600a38a756f328ca3c90.tar.gz
dzen-47a78f0cebb8c4593add600a38a756f328ca3c90.zip
fixed ^fn()
git-svn-id: http://dzen.googlecode.com/svn/trunk@199 f2baff5b-bf2c-0410-a398-912abdc3d8b2
Diffstat (limited to 'draw.c')
-rw-r--r--draw.c15
1 files changed, 12 insertions, 3 deletions
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: