diff options
author | gotmor <gotmor@f2baff5b-bf2c-0410-a398-912abdc3d8b2> | 2007-07-19 20:31:29 +0000 |
---|---|---|
committer | gotmor <gotmor@f2baff5b-bf2c-0410-a398-912abdc3d8b2> | 2007-07-19 20:31:29 +0000 |
commit | a9952ded1e6eaadec4c079b853a30db6e10ce2fe (patch) | |
tree | ff03ca889fa3258f29f2f60ebb19050b7a2acaff /draw.c | |
parent | d654854188f071ce66fc4be4abb4522f0712e6f0 (diff) | |
download | dzen-a9952ded1e6eaadec4c079b853a30db6e10ce2fe.tar.gz dzen-a9952ded1e6eaadec4c079b853a30db6e10ce2fe.zip |
last font fixes, change GC only once
release 0.6.1
git-svn-id: http://dzen.googlecode.com/svn/trunk@136 f2baff5b-bf2c-0410-a398-912abdc3d8b2
Diffstat (limited to 'draw.c')
-rw-r--r-- | draw.c | 21 |
1 files changed, 9 insertions, 12 deletions
@@ -218,15 +218,17 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) { XSetForeground(dzen.dpy, dzen.tgc, dzen.norm[ColBG]); } + if(!dzen.font.set){ + gcv.font = dzen.font.xfont->fid; + XChangeGC(dzen.dpy, dzen.tgc, GCFont, &gcv); + } + if( (lnr + dzen.slave_win.first_line_vis) >= dzen.slave_win.tcnt) { if(dzen.font.set) XmbDrawImageString(dzen.dpy, pm, dzen.font.set, dzen.tgc, px, py, "", 0); - else { - gcv.font = dzen.font.xfont->fid; - XChangeGC(dzen.dpy, dzen.tgc, GCFont, &gcv); + else XDrawImageString(dzen.dpy, pm, dzen.tgc, px, py, "", 0); - } XCopyArea(dzen.dpy, pm, dzen.slave_win.drawable[lnr], dzen.gc, 0, 0, px, dzen.line_height, xorig, 0); @@ -265,11 +267,8 @@ 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 { - gcv.font = dzen.font.xfont->fid; - XChangeGC(dzen.dpy, dzen.tgc, GCFont, &gcv); + else XDrawImageString(dzen.dpy, pm, dzen.tgc, px, py, lbuf, tw); - } px += tw; } @@ -312,11 +311,9 @@ 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 { - gcv.font = dzen.font.xfont->fid; - XChangeGC(dzen.dpy, dzen.tgc, GCFont, &gcv); + else XDrawImageString(dzen.dpy, pm, dzen.tgc, px, py, lbuf, tw); - } + px += tw; |