X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=bec015783ee4b61da43a8dce33ac6574dc234d2b;hb=a678ee636547c8a7a2651250960277629c33c4c3;hp=f5f9556ba96d3878c0d8dac7090d0698de1e54c9;hpb=0c9d9a3d949c0c0c3fb24417b54fca8182f54cb6;p=dwm.git diff --git a/draw.c b/draw.c index f5f9556..bec0157 100644 --- a/draw.c +++ b/draw.c @@ -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,7 +74,7 @@ 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) { + if(dot) { r.x = dc.x + 2; r.y = dc.y + 2; r.width = r.height = (h + 2) / 4; @@ -82,16 +82,12 @@ drawtext(const char *text, unsigned long col[ColLast], Bool border, Bool ldot) { } 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); } }