X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=5be403b6c72d5fc6373cbcc9af9c97919c11f518;hb=c73d5cb7b67d60abc92ff83aff57fc610dcd08e1;hp=0e399d88e746a1be617dd5d1a66a3660228f9913;hpb=4ba3cfaee9c27744e79febc25caef69b28e477e4;p=dwm.git diff --git a/draw.c b/draw.c index 0e399d8..5be403b 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 dot, Bool line) { +drawtext(const char *text, unsigned long col[ColLast], Bool filleddot, Bool emptydot) { 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,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); } - if(dot) { - r.x = dc.x + 1; + x = (h + 2) / 4; + if(filleddot) { + r.x = dc.x + 2; r.y = dc.y + 2; - r.width = r.height = (h + 2) / 4; + r.width = r.height = x; 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); } + if(emptydot) { + pt[0].x = dc.x + 2; + pt[0].y = dc.y + 2; + 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 */