about summary refs log tree commit diff stats
path: root/dwm.c
diff options
context:
space:
mode:
authorChris Down <chris@chrisdown.name>2020-04-22 15:48:27 +0100
committerHiltjo Posthuma <hiltjo@codemadness.org>2020-04-22 20:33:39 +0200
commited3ab6b4fceded0e9f2d22372df49a2bbd58de66 (patch)
treeaa2ac30695411b4e894b4b51f29c4b9f7926f7f3 /dwm.c
parentf087d20e6e60a49c756936b4312f5d194d8e63b4 (diff)
downloaddwm-ed3ab6b4fceded0e9f2d22372df49a2bbd58de66.tar.gz
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.
Diffstat (limited to 'dwm.c')
-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);
iv>
36863953 ^
e087f6d4




d3f9d547 ^
e087f6d4












d3f9d547 ^
e087f6d4


d3f9d547 ^
e087f6d4



d3f9d547 ^
e087f6d4


d3f9d547 ^
e087f6d4











d3f9d547 ^
e087f6d4



























































d3f9d547 ^
e087f6d4


















1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163