X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=a67ac58dc687a1941e83f4649fd1857c35092f74;hb=7739e6b466481e66ad6b6fc8fb49fd884035431b;hp=0237b40ebe1e244c3e1517d3ec48f96d3bc1503d;hpb=6e72d781f71dd38fffae1f34cb0c9930b40e74d6;p=dwm.git diff --git a/draw.c b/draw.c index 0237b40..a67ac58 100644 --- 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 hborder, Bool vborder) { +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 }; + XPoint pt[5]; XSetForeground(dpy, dc.gc, col[ColBG]); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); @@ -73,13 +74,25 @@ drawtext(const char *text, unsigned long col[ColLast], Bool hborder, Bool vborde XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); } - if(vborder) { - XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + 1, dc.y + dc.h - 1); - XDrawLine(dpy, dc.drawable, dc.gc, dc.x + dc.w - 2, dc.y + 1, dc.x + dc.w - 2, dc.y + dc.h - 1); + 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); } - if(hborder) { - XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + 1, dc.x + dc.w - 2, dc.y + 1); - XDrawLine(dpy, dc.drawable, dc.gc, dc.x + 1, dc.y + dc.h - 2, dc.x + dc.w - 2, dc.y + dc.h - 2); + 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); } }