diff options
author | gotmor <gotmor@f2baff5b-bf2c-0410-a398-912abdc3d8b2> | 2008-01-13 00:39:34 +0000 |
---|---|---|
committer | gotmor <gotmor@f2baff5b-bf2c-0410-a398-912abdc3d8b2> | 2008-01-13 00:39:34 +0000 |
commit | 47a78f0cebb8c4593add600a38a756f328ca3c90 (patch) | |
tree | abe502469596b6656c0677eae71347fd858781e3 | |
parent | 2d9004765dacb68faeafe7025fdf6f58925c4978 (diff) | |
download | dzen-47a78f0cebb8c4593add600a38a756f328ca3c90.tar.gz dzen-47a78f0cebb8c4593add600a38a756f328ca3c90.zip |
fixed ^fn()
git-svn-id: http://dzen.googlecode.com/svn/trunk@199 f2baff5b-bf2c-0410-a398-912abdc3d8b2
-rw-r--r-- | draw.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -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: |