|
@@ -696,7 +696,7 @@ dirtomon(int dir)
|
|
|
void
|
|
void
|
|
|
drawbar(Monitor *m)
|
|
drawbar(Monitor *m)
|
|
|
{
|
|
{
|
|
|
- int x, w, sw = 0;
|
|
|
|
|
|
|
+ int x, w, tw = 0;
|
|
|
int boxs = drw->fonts->h / 9;
|
|
int boxs = drw->fonts->h / 9;
|
|
|
int boxw = drw->fonts->h / 6 + 2;
|
|
int boxw = drw->fonts->h / 6 + 2;
|
|
|
unsigned int i, occ = 0, urg = 0;
|
|
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 */
|
|
/* draw status first so it can be overdrawn by tags later */
|
|
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
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) {
|
|
for (c = m->clients; c; c = c->next) {
|
|
@@ -729,7 +729,7 @@ drawbar(Monitor *m)
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
|
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) {
|
|
if (m->sel) {
|
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|