osama/dwm
1
0
Fork 0
mirror of https://github.com/mintycube/dwm.git synced 2024-10-22 14:05:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fancybar: renaming tw variable to ftw due to clash with upstream sw --> tw variable rename

Browse Source
This commit is contained in:
bakkeby 2020-05-28 07:26:00 +02:00
parent 8236f1940b
commit 66a32a0e48
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dwm.c
View File

@ -1395,7 +1395,7 @@ drawbar(Monitor *m)
#if AWESOMEBAR_PATCH #if AWESOMEBAR_PATCH
int n = 0, scm; int n = 0, scm;
#elif FANCYBAR_PATCH #elif FANCYBAR_PATCH
int tw, mw, ew = 0; int ftw, mw, ew = 0;
int n = 0; int n = 0;
#endif // FANCYBAR_PATCH, AWESOMEBAR_PATCH #endif // FANCYBAR_PATCH, AWESOMEBAR_PATCH
#if BARPADDING_PATCH #if BARPADDING_PATCH
@ -1596,16 +1596,16 @@ drawbar(Monitor *m)
} }
#elif FANCYBAR_PATCH #elif FANCYBAR_PATCH
if (n > 0) { if (n > 0) {
tw = TEXTW(m->sel->name) + lrpad; ftw = TEXTW(m->sel->name) + lrpad;
mw = (tw >= w || n == 1) ? 0 : (w - tw) / (n - 1); mw = (ftw >= w || n == 1) ? 0 : (w - ftw) / (n - 1);
i = 0; i = 0;
for (c = m->clients; c; c = c->next) { for (c = m->clients; c; c = c->next) {
if (!ISVISIBLE(c) || c == m->sel) if (!ISVISIBLE(c) || c == m->sel)
continue; continue;
tw = TEXTW(c->name); ftw = TEXTW(c->name);
if (tw < mw) if (ftw < mw)
ew += (mw - tw); ew += (mw - ftw);
else else
i++; i++;
} }
@ -1615,7 +1615,7 @@ drawbar(Monitor *m)
for (c = m->clients; c; c = c->next) { for (c = m->clients; c; c = c->next) {
if (!ISVISIBLE(c)) if (!ISVISIBLE(c))
continue; continue;
tw = MIN(m->sel == c ? w : mw, TEXTW(c->name)); ftw = MIN(m->sel == c ? w : mw, TEXTW(c->name));
#if VTCOLORS_PATCH #if VTCOLORS_PATCH
drw_setscheme(drw, scheme[m->sel == c ? SchemeTitleSel : SchemeTitleNorm]); drw_setscheme(drw, scheme[m->sel == c ? SchemeTitleSel : SchemeTitleNorm]);
@ -1624,8 +1624,8 @@ drawbar(Monitor *m)
#else #else
drw_setscheme(drw, scheme[m->sel == c ? SchemeSel : SchemeNorm]); drw_setscheme(drw, scheme[m->sel == c ? SchemeSel : SchemeNorm]);
#endif // VTCOLORS_PATCH / TITLECOLOR_PATCH #endif // VTCOLORS_PATCH / TITLECOLOR_PATCH
if (tw > 0) /* trap special handling of 0 in drw_text */ if (ftw > 0) /* trap special handling of 0 in drw_text */
drw_text(drw, x, 0, tw, bh, lrpad / 2, c->name, 0); drw_text(drw, x, 0, ftw, bh, lrpad / 2, c->name, 0);
#if !HIDEVACANTTAGS_PATCH #if !HIDEVACANTTAGS_PATCH
if (c->isfloating) if (c->isfloating)
#if ACTIVETAGINDICATORBAR_PATCH #if ACTIVETAGINDICATORBAR_PATCH
@ -1634,8 +1634,8 @@ drawbar(Monitor *m)
drw_rect(drw, x + boxs, boxs, boxw, boxw, c->isfixed, 0); drw_rect(drw, x + boxs, boxs, boxw, boxw, c->isfixed, 0);
#endif // ACTIVETAGINDICATORBAR_PATCH #endif // ACTIVETAGINDICATORBAR_PATCH
#endif // HIDEVACANTTAGS_PATCH #endif // HIDEVACANTTAGS_PATCH
x += tw; x += ftw;
w -= tw; w -= ftw;
} }
} }
#if VTCOLORS_PATCH #if VTCOLORS_PATCH