Correcting minor compilation errors in relation to hidevacanttags, barpadding and centeredwindowname patches

This commit is contained in:
bakkeby 2020-01-29 13:17:15 +01:00
parent 5e75da8dd1
commit 0da53e1e9b

8
dwm.c
View File

@ -1522,12 +1522,14 @@ drawbar(Monitor *m)
#endif // TITLECOLOR_PATCH #endif // TITLECOLOR_PATCH
if (tw > 0) /* trap special handling of 0 in drw_text */ if (tw > 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, tw, bh, lrpad / 2, c->name, 0);
#if !HIDEVACANTTAGS_PATCH
if (c->isfloating) if (c->isfloating)
#if ACTIVETAGINDICATORBAR_PATCH #if ACTIVETAGINDICATORBAR_PATCH
drw_rect(drw, x + boxw, 0, w - ( 2 * boxw + 1), boxw, c->isfixed, 0); drw_rect(drw, x + boxw, 0, w - ( 2 * boxw + 1), boxw, c->isfixed, 0);
#else #else
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
x += tw; x += tw;
w -= tw; w -= tw;
} }
@ -1547,9 +1549,9 @@ drawbar(Monitor *m)
#if CENTEREDWINDOWNAME_PATCH #if CENTEREDWINDOWNAME_PATCH
int mid = (m->ww - TEXTW(m->sel->name)) / 2 - x; int mid = (m->ww - TEXTW(m->sel->name)) / 2 - x;
#if BARPADDING_PATCH #if BARPADDING_PATCH
drw_text(drw, x, 0, w, bh, mid, m->sel->name, 0);
#else
drw_text(drw, x, 0, w - 2*sp, bh, mid, m->sel->name, 0); drw_text(drw, x, 0, w - 2*sp, bh, mid, m->sel->name, 0);
#else
drw_text(drw, x, 0, w, bh, mid, m->sel->name, 0);
#endif // BARPADDING_PATCH #endif // BARPADDING_PATCH
#else #else
#if BARPADDING_PATCH #if BARPADDING_PATCH
@ -1562,12 +1564,14 @@ drawbar(Monitor *m)
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(xerror); XSetErrorHandler(xerror);
#endif // IGNORE_XFT_ERRORS_WHEN_DRAWING_TEXT_PATCH #endif // IGNORE_XFT_ERRORS_WHEN_DRAWING_TEXT_PATCH
#if !HIDEVACANTTAGS_PATCH
if (m->sel->isfloating) if (m->sel->isfloating)
#if ACTIVETAGINDICATORBAR_PATCH #if ACTIVETAGINDICATORBAR_PATCH
drw_rect(drw, x + boxw, 0, w - ( 2 * boxw + 1), boxw, m->sel->isfixed, 0); drw_rect(drw, x + boxw, 0, w - ( 2 * boxw + 1), boxw, m->sel->isfixed, 0);
#else #else
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
#endif // ACTIVETAGINDICATORBAR_PATCH #endif // ACTIVETAGINDICATORBAR_PATCH
#endif // HIDEVACANTTAGS_PATCH
} else { } else {
drw_setscheme(drw, scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
#if BARPADDING_PATCH #if BARPADDING_PATCH