Added tag 2.5.1 for changeset c7f84f23ec5aef29988dcdc4ec22a7352ee8f58e

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index ccd3175..a67ac58 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -30,7 +30,7 @@ textnw(const char *text, unsigned int len) {
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) {
+drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) {

        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;


@@ -74,23 +74,24 @@ drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) {
                XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
                XDrawString(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);
        }

-       if(dot) {
-               r.x = dc.x + 2;
-               r.y = dc.y + 2;
-               r.width = r.height = (h + 2) / 4;
+       x = (h + 2) / 4;
+       if(filledsquare) {
+               r.x = dc.x + 1;
+               r.y = dc.y + 1;
+               r.width = r.height = x + 1;

                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }

-       if(border) {
+       else if(emptysquare) {

                pt[0].x = dc.x + 1;
                pt[0].y = dc.y + 1;
                pt[0].x = dc.x + 1;
                pt[0].y = dc.y + 1;

-               pt[1].x = dc.w - 2;
+               pt[1].x = x;

                pt[1].y = 0;
                pt[2].x = 0;
                pt[1].y = 0;
                pt[2].x = 0;

-               pt[2].y = dc.h - 2;
-               pt[3].x = -(dc.w - 2);
+               pt[2].y = x;
+               pt[3].x = -x;

                pt[3].y = 0;
                pt[4].x = 0;
                pt[3].y = 0;
                pt[4].x = 0;

-               pt[4].y = -(dc.h - 2);
+               pt[4].y = -x;

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