From a686c9ccd293efd543b84c137d91fbeb0f95a621 Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Fri, 2 Mar 2007 15:14:40 +0100 Subject: we don't need to set the font all the time --- draw.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'draw.c') diff --git a/draw.c b/draw.c index e0a93fe..175017b 100644 --- a/draw.c +++ b/draw.c @@ -95,7 +95,6 @@ drawtext(const char *text, unsigned long col[ColLast]) { int x, y, w, h; static char buf[256]; unsigned int len, olen; - XGCValues gcv; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XSetForeground(dpy, dc.gc, col[ColBG]); @@ -124,16 +123,11 @@ drawtext(const char *text, unsigned long col[ColLast]) { } if(w > dc.w) return; /* too long */ - gcv.foreground = col[ColFG]; - if(dc.font.set) { - XChangeGC(dpy, dc.gc, GCForeground, &gcv); + XSetForeground(dpy, dc.gc, col[ColFG]); + if(dc.font.set) XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); - } - else { - gcv.font = dc.font.xfont->fid; - XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); + else XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); - } } unsigned int -- cgit v1.2.3-54-g00ecf