X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=64b11afcb83017b4899cb71f6b2de9acec320b67;hb=00e95e1f38f7f63584925182a98fb36e84b0f246;hp=7da24f25f83890313f36b9986dba986f282af259;hpb=9f35cc52fe27f694ce146356e6c71267ecd19217;p=dwm.git diff --git a/draw.c b/draw.c index 7da24f2..64b11af 100644 --- a/draw.c +++ b/draw.c @@ -94,27 +94,25 @@ drawall() void drawstatus() { - static const char *mode[] = { "~", "|" }; int i, x; dc.x = dc.y = 0; dc.w = bw; - if(!modew) - modew = textw(mode[0]) > textw(mode[1]) ? textw(mode[0]) : textw(mode[1]); - drawtext(mode[arrange == dotile ? 1 : 0], dc.status, False); - - dc.w = 0; - dc.x = modew; + drawtext(NULL, dc.status, False); for(i = 0; i < ntags; i++) { - dc.x += dc.w; dc.w = textw(tags[i]); if(seltag[i]) drawtext(tags[i], dc.sel, sel && sel->tags[i]); else drawtext(tags[i], dc.norm, sel && sel->tags[i]); + dc.x += dc.w; } - x = dc.x + dc.w + 1; + + dc.w = bmw; + drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False); + + x = dc.x + dc.w; dc.w = textw(stext); dc.x = bx + bw - dc.w; if(dc.x < x) {