removed useless call

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 7507595..ba1fafd 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -9,26 +9,6 @@
 
 /* static */
 
-static void
-drawborder(void)
-{
-       XPoint points[5];
-
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       XSetForeground(dpy, dc.gc, dc.border);
-       points[0].x = dc.x;
-       points[0].y = dc.y;
-       points[1].x = dc.w - 1;
-       points[1].y = 0;
-       points[2].x = 0;
-       points[2].y = dc.h - 1;
-       points[3].x = -(dc.w - 1);
-       points[3].y = 0;
-       points[4].x = 0;
-       points[4].y = -(dc.h - 1);
-       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
 static unsigned int
 textnw(const char *text, unsigned int len)
 {
@@ -44,25 +24,37 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, Bool invert, Bool border)
+drawtext(const char *text, unsigned int colidx, Bool border)
 {
        int x, y, w, h;
        static char buf[256];
-       unsigned int len;
-       XGCValues gcv;
+       unsigned int len, olen;
+       XPoint points[5];
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, dc.bg[colidx]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
        w = 0;
-       if(border)
-               drawborder();
+       XSetForeground(dpy, dc.gc, dc.fg[colidx]);
+       if(border) {
+               points[0].x = dc.x;
+               points[0].y = dc.y;
+               points[1].x = dc.w - 1;
+               points[1].y = 0;
+               points[2].x = 0;
+               points[2].y = dc.h - 1;
+               points[3].x = -(dc.w - 1);
+               points[3].y = 0;
+               points[4].x = 0;
+               points[4].y = -(dc.h - 1);
+               XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
+       }
 
        if(!text)
                return;
 
-       len = strlen(text);
+       olen = len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
@@ -75,21 +67,23 @@ drawtext(const char *text, Bool invert, Bool border)
        /* 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;
-       if(dc.font.set) {
-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
-                               x, y, buf, len);
-       }
+       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 | GCBackground | GCFont, &gcv);
-               XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
 }