also, don't set the font all the time

diff --git a/config.mk b/config.mk
index b261284..07b323b 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dmenu version
 # dmenu version

-VERSION = 2.6
+VERSION = 2.7

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 

diff --git a/draw.c b/draw.c
index 145df16..d36df30 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -12,7 +12,6 @@ drawtext(const char *text, unsigned long col[ColLast]) {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        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]);
        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 col[ColLast]) {
        }
        if(w > dc.w)
                return; /* too 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);
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);

-       }

 }
 
 unsigned int
 }
 
 unsigned int

diff --git a/main.c b/main.c
index d87e5dc..0f07773 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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);
        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)
        if(maxname)
                cmdw = textw(maxname);
        if(cmdw > mw / 3)