[hackers] [dmenu] also, don't set the font all the time

changeset: 186:e89ec7536deb
tag: tip
user: Anselm R. Garbe <arg_AT_suckless.org>
date: Fri Mar 02 15:16:36 2007 +0100
summary: also, don't set the font all the time

diff -r 72576b5d31de -r e89ec7536deb config.mk
--- a/config.mk Thu Mar 01 15:47:54 2007 +0100
+++ b/config.mk Fri Mar 02 15:16:36 2007 +0100
@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 2.6
+VERSION = 2.7
 
 # Customize below to fit your system
 
diff -r 72576b5d31de -r e89ec7536deb draw.c
--- a/draw.c Thu Mar 01 15:47:54 2007 +0100
+++ b/draw.c Fri Mar 02 15:16:36 2007 +0100
@@ -12,7 +12,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]);
@@ -41,17 +40,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);
- 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);
+ XSetForeground(dpy, dc.gc, col[ColFG]);
+ if(dc.font.set)
+ XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+ else
                 XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
- }
 }
 
 unsigned int
diff -r 72576b5d31de -r e89ec7536deb main.c
--- a/main.c Thu Mar 01 15:47:54 2007 +0100
+++ b/main.c Fri Mar 02 15:16:36 2007 +0100
@@ -493,6 +493,8 @@ main(int argc, char *argv[]) {
         dc.drawable = XCreatePixmap(dpy, root, mw, mh, 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);
         if(maxname)
                 cmdw = textw(maxname);
         if(cmdw > mw / 3)
Received on Fri Mar 02 2007 - 15:17:36 UTC