diff options
| -rw-r--r-- | draw.c | 26 |
1 files changed, 11 insertions, 15 deletions
@@ -30,13 +30,13 @@ textnw(const char *text, unsigned int len) { } static void -drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) { +drawtext(const char *text, unsigned long col[ColLast], Bool dot, Bool border) { 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]; + XPoint pt[3]; XSetForeground(dpy, dc.gc, col[ColBG]); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); @@ -74,24 +74,20 @@ drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) { XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); } - if(ldot) { - r.x = dc.x + 2; - r.y = dc.y + 2; + if(dot) { 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); + pt[0].y = dc.y + dc.h - 1; + pt[1].x = 0; + pt[1].y = -(dc.h - 1); + pt[2].x = dc.w - 1; + pt[2].y = 0; + XDrawLines(dpy, dc.drawable, dc.gc, pt, 3, CoordModePrevious); } } |