This jarred me a bit while reading the code, since "sw" usually refers to the global screen geometry, but in drawbar() only it refers to text-related geometry. Renaming it makes it more obvious that these are not related.
| 696 | 696 | void |
|
| 697 | 697 | drawbar(Monitor *m) |
|
| 698 | 698 | { |
|
| 699 | - | int x, w, sw = 0; |
|
| 699 | + | int x, w, tw = 0; |
|
| 700 | 700 | int boxs = drw->fonts->h / 9; |
|
| 701 | 701 | int boxw = drw->fonts->h / 6 + 2; |
|
| 702 | 702 | unsigned int i, occ = 0, urg = 0; |
|
| 705 | 705 | /* draw status first so it can be overdrawn by tags later */ |
|
| 706 | 706 | if (m == selmon) { /* status is only drawn on selected monitor */ |
|
| 707 | 707 | drw_setscheme(drw, scheme[SchemeNorm]); |
|
| 708 | - | sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ |
|
| 709 | - | drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0); |
|
| 708 | + | tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ |
|
| 709 | + | drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); |
|
| 710 | 710 | } |
|
| 711 | 711 | ||
| 712 | 712 | for (c = m->clients; c; c = c->next) { |
|
| 729 | 729 | drw_setscheme(drw, scheme[SchemeNorm]); |
|
| 730 | 730 | x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); |
|
| 731 | 731 | ||
| 732 | - | if ((w = m->ww - sw - x) > bh) { |
|
| 732 | + | if ((w = m->ww - tw - x) > bh) { |
|
| 733 | 733 | if (m->sel) { |
|
| 734 | 734 | drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); |
|
| 735 | 735 | drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); |
|