X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=16f934d7d8808492796cc59447ba9cb7781b4de1;hb=c732cc90ab924556d87566dfbf3537a6247b20e9;hp=0c920e5d1c063d3b63b0874d309e8cd2c1416b50;hpb=4688ad181da14be36e034918580ec0ce5968ffdb;p=dwm.git diff --git a/draw.c b/draw.c index 0c920e5..16f934d 100644 --- a/draw.c +++ b/draw.c @@ -3,7 +3,6 @@ * See LICENSE file for license details. */ #include "dwm.h" - #include #include #include @@ -31,7 +30,7 @@ drawborder(void) } static unsigned int -textnw(char *text, unsigned int len) +textnw(const char *text, unsigned int len) { XRectangle r; @@ -99,7 +98,7 @@ drawall() { Client *c; - for(c = clients; c; c = getnext(c->next, tsel)) + for(c = clients; c; c = getnext(c->next)) drawtitle(c); drawstatus(); } @@ -115,7 +114,7 @@ drawstatus() drawtext(NULL, !istile, False); dc.w = 0; - for(i = 0; i < TLast; i++) { + for(i = 0; i < ntags; i++) { dc.x += dc.w; dc.w = textw(tags[i]); if(istile) @@ -126,7 +125,7 @@ drawstatus() x = dc.x + dc.w; dc.w = textw(stext); dc.x = bx + bw - dc.w; - drawtext(stext, !istile, False); + drawtext(stext, !istile, True); if(sel && ((dc.w = dc.x - x) >= bh)) { dc.x = x; drawtext(sel->name, istile, True); @@ -154,11 +153,11 @@ drawtitle(Client *c) dc.x = dc.y = 0; dc.w = 0; - for(i = 0; i < TLast; i++) { + for(i = 0; i < ntags; i++) { if(c->tags[i]) { dc.x += dc.w; - dc.w = textw(c->tags[i]); - drawtext(c->tags[i], !istile, True); + dc.w = textw(tags[i]); + drawtext(tags[i], !istile, True); } } dc.x += dc.w; @@ -230,7 +229,7 @@ setfont(const char *fontstr) } unsigned int -textw(char *text) +textw(const char *text) { return textnw(text, strlen(text)) + dc.font.height; }