aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Down <chris@chrisdown.name>2020-04-22 16:48:27 +0200
committerHiltjo Posthuma <hiltjo@codemadness.org>2020-04-22 20:33:39 +0200
commited3ab6b4fceded0e9f2d22372df49a2bbd58de66 (patch)
treeaa2ac30695411b4e894b4b51f29c4b9f7926f7f3
parentf087d20e6e60a49c756936b4312f5d194d8e63b4 (diff)
downloaddwm-retake-ed3ab6b4fceded0e9f2d22372df49a2bbd58de66.tar.gz
dwm-retake-ed3ab6b4fceded0e9f2d22372df49a2bbd58de66.tar.bz2
drawbar: Don't shadow sw global
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.
-rw-r--r--dwm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dwm.c b/dwm.c
index 972f261..fb1e326 100644
--- a/dwm.c
+++ b/dwm.c
@@ -696,7 +696,7 @@ dirtomon(int dir)
void
drawbar(Monitor *m)
{
- int x, w, sw = 0;
+ int x, w, tw = 0;
int boxs = drw->fonts->h / 9;
int boxw = drw->fonts->h / 6 + 2;
unsigned int i, occ = 0, urg = 0;
@@ -705,8 +705,8 @@ drawbar(Monitor *m)
/* draw status first so it can be overdrawn by tags later */
if (m == selmon) { /* status is only drawn on selected monitor */
drw_setscheme(drw, scheme[SchemeNorm]);
- sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
- drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
+ tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+ drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
}
for (c = m->clients; c; c = c->next) {
@@ -729,7 +729,7 @@ drawbar(Monitor *m)
drw_setscheme(drw, scheme[SchemeNorm]);
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
- if ((w = m->ww - sw - x) > bh) {
+ if ((w = m->ww - tw - x) > bh) {
if (m->sel) {
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);