hotfix of a serious crashing bug

[dwm.git] / draw.c

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

-drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool line) {
+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;
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
        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);
 
        XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);


@@ -73,14 +74,27 @@ drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool line) {
                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) {
+       x = (h + 2) / 4;
+       if(filledsquare) {

                r.x = dc.x + 1;
                r.x = dc.x + 1;

-               r.y = dc.y + 2;
-               r.width = r.height = (h + 2) / 4;
+               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(line)
-               XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 1, dc.y + 1); }
+       else if(emptysquare) {
+               pt[0].x = dc.x + 1;
+               pt[0].y = dc.y + 1;
+               pt[1].x = x;
+               pt[1].y = 0;
+               pt[2].x = 0;
+               pt[2].y = x;
+               pt[3].x = -x;
+               pt[3].y = 0;
+               pt[4].x = 0;
+               pt[4].y = -x;
+               XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
+       }
+}

 
 /* extern */
 
 
 /* extern */