final2 indicator

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 4441a88..ccd3175 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -30,12 +30,13 @@ textnw(const char *text, unsigned int len) {
 }
 
 static void
-drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
+drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) {
        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 };
+       XPoint pt[5];
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
@@ -43,8 +44,8 @@ drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
                return;
        w = 0;
        olen = len = strlen(text);
-       if(len >= sizeof(buf))
-               len = sizeof(buf) - 1;
+       if(len >= sizeof buf)
+               len = sizeof buf - 1;
        memcpy(buf, text, len);
        buf[len] = 0;
        h = dc.font.ascent + dc.font.descent;
@@ -73,17 +74,24 @@ drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) {
                XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
-       if(ldot) {
+       if(dot) {
                r.x = dc.x + 2;
                r.y = dc.y + 2;
                r.width = r.height = (h + 2) / 4;
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
-       if(rdot) {
-               r.width = r.height = (h + 2) / 4;
-               r.x = dc.x + dc.w - r.width - 2;
-               r.y = dc.y + dc.h - r.height - 2;
-               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       if(border) {
+               pt[0].x = dc.x + 1;
+               pt[0].y = dc.y + 1;
+               pt[1].x = dc.w - 2;
+               pt[1].y = 0;
+               pt[2].x = 0;
+               pt[2].y = dc.h - 2;
+               pt[3].x = -(dc.w - 2);
+               pt[3].y = 0;
+               pt[4].x = 0;
+               pt[4].y = -(dc.h - 2);
+               XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
        }
 }