found less intrusive way

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index cbf6502..f73a7bd 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -22,9 +22,17 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
-drawborder()
+drawtext(const char *text, Bool invert, Bool highlight)
 {
+       int x, y, w, h;
+       static char buf[256];
+       unsigned int len, olen;
+       XGCValues gcv;
        XPoint points[5];
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+
+       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        points[0].x = dc.x;
        points[0].y = dc.y;
        points[1].x = dc.w - 1;
@@ -35,24 +43,8 @@ drawborder()
        points[3].y = 0;
        points[4].x = 0;
        points[4].y = -(dc.h - 1);
-       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
-static void
-drawtext(const char *text, Bool invert, Bool highlight)
-{
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       DC tmp;
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        XSetForeground(dpy, dc.gc, dc.border);
-       drawborder();
+       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 
        if(!text)
                return;
@@ -94,13 +86,17 @@ drawtext(const char *text, Bool invert, Bool highlight)
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        if(highlight) {
-               tmp = dc;
-               dc.x += 2;
-               dc.y += 2;
-               dc.w -= 4;
-               dc.h -= 4;
-               drawborder();
-               dc = tmp;
+               points[0].x = dc.x + 1;
+               points[0].y = dc.y + 1;
+               points[1].x = dc.w - 3;
+               points[1].y = 0;
+               points[2].x = 0;
+               points[2].y = dc.h - 3;
+               points[3].x = -(dc.w - 3);
+               points[3].y = 0;
+               points[4].x = 0;
+               points[4].y = -(dc.h - 3);
+               XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
        }
 }