diff options
| -rw-r--r-- | draw.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/draw.c b/draw.c index 671062c..f5f9556 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 ldot, Bool rdot) { +drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) { 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); @@ -79,11 +80,18 @@ drawtext(const char *text, unsigned long col[ColLast], Bool ldot, Bool rdot) { 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; + pt[0].y = dc.y; + pt[1].x = dc.w - 1; + pt[1].y = 0; + pt[2].x = 0; + pt[2].y = dc.h - 1; + pt[3].x = -(dc.w - 1); + pt[3].y = 0; + pt[4].x = 0; + pt[4].y = -(dc.h - 1); + XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious); } } |