[hackers] [dwm] we don't need to set the font all the time

changeset: 850:2ea201354cf0
tag: tip
user: Anselm R. Garbe <arg_AT_suckless.org>
date: Fri Mar 02 15:14:40 2007 +0100
summary: we don't need to set the font all the time

diff -r 4f1ff9e068d3 -r 2ea201354cf0 draw.c
--- a/draw.c Thu Mar 01 12:33:45 2007 +0100
+++ b/draw.c Fri Mar 02 15:14:40 2007 +0100
@@ -95,7 +95,6 @@ drawtext(const char *text, unsigned long
         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
         }
         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
diff -r 4f1ff9e068d3 -r 2ea201354cf0 main.c
--- a/main.c Thu Mar 01 12:33:45 2007 +0100
+++ b/main.c Fri Mar 02 15:14:40 2007 +0100
@@ -205,6 +205,8 @@ setup(void) {
         dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
         dc.gc = XCreateGC(dpy, root, 0, 0);
         XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ if(!dc.font.set)
+ XSetFont(dpy, dc.gc, dc.font.xfont->fid);
         /* multihead support */
         selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
Received on Fri Mar 02 2007 - 15:17:39 UTC