From a9952ded1e6eaadec4c079b853a30db6e10ce2fe Mon Sep 17 00:00:00 2001 From: gotmor Date: Thu, 19 Jul 2007 20:31:29 +0000 Subject: 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 --- config.mk | 2 +- draw.c | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/config.mk b/config.mk index 03d1178..09ffb9e 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # dzen version -VERSION = 0.6.0 +VERSION = 0.6.1 # Customize below to fit your system diff --git a/draw.c b/draw.c index 9b5915a..1ffdc12 100644 --- a/draw.c +++ b/draw.c @@ -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; -- cgit v1.2.3-54-g00ecf