removed unnecessary Xlib call

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 066a0bf..38ae8c3 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -38,8 +38,6 @@ drawtext(const char *text, Bool invert, Bool border)
 
        w = 0;
        if(border) {
 
        w = 0;
        if(border) {

-               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[0].x = dc.x;
                points[0].y = dc.y;
                points[1].x = dc.w - 1;


@@ -50,6 +48,7 @@ drawtext(const char *text, Bool invert, Bool border)
                points[3].y = 0;
                points[4].x = 0;
                points[4].y = -(dc.h - 1);
                points[3].y = 0;
                points[4].x = 0;
                points[4].y = -(dc.h - 1);

+               XSetForeground(dpy, dc.gc, dc.border);

                XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
        }
 
                XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
        }
 


@@ -70,12 +69,12 @@ drawtext(const char *text, Bool invert, Bool border)
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
        if(len < olen) {
        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)
                if(len > 3)

-                       memcpy(buf + len - 4, "...\0", 4);
-               else if(len > 2)
-                       memcpy(buf + len - 3, "..\0", 3);
-               else if(len > 1)
-                       memcpy(buf + len - 2, ".\0", 2);
+                       buf[len - 3] = '.';

        }
 
        if(w > dc.w)
        }
 
        if(w > dc.w)