fixed man page

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 4e079e5..d0f21cd 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -24,22 +24,22 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, Bool invert)
+drawtext(const char *text, unsigned long col[ColLast])
 {
        int x, y, w, h;
        static char buf[256];
-       unsigned int len;
+       unsigned int len, olen;
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       w = 0;
 
        if(!text)
                return;
 
-       len = strlen(text);
+       w = 0;
+       olen = len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
@@ -52,21 +52,28 @@ drawtext(const char *text, Bool invert)
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
+       if(len < olen) {
+               if(len > 1)
+                       buf[len - 1] = '.';
+               if(len > 2)
+                       buf[len - 2] = '.';
+               if(len > 3)
+                       buf[len - 3] = '.';
+       }
 
        if(w > dc.w)
                return; /* too long */
 
-       gcv.foreground = invert ? dc.bg : dc.fg;
-       gcv.background = invert ? dc.fg : dc.bg;
+       gcv.foreground = col[ColFG];
        if(dc.font.set) {
-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+               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 | GCBackground | GCFont, &gcv);
-               XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
 }