|
|
@ -862,12 +862,21 @@ 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]);
|
|
|
|
|
|
|
|
#if STATUSPADDING_PATCH
|
|
|
|
|
|
|
|
sw = TEXTW(stext);
|
|
|
|
|
|
|
|
#if SYSTRAY_PATCH
|
|
|
|
|
|
|
|
drw_text(drw, m->ww - sw - stw, 0, sw, bh, lrpad / 2, stext, 0);
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
drw_text(drw, m->ww - sw, 0, sw, bh, lrpad / 2, stext, 0);
|
|
|
|
|
|
|
|
#endif // SYSTRAY_PATCH
|
|
|
|
|
|
|
|
#else
|
|
|
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
|
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
|
|
#if SYSTRAY_PATCH
|
|
|
|
#if SYSTRAY_PATCH
|
|
|
|
drw_text(drw, m->ww - sw - stw, 0, sw, bh, 0, stext, 0);
|
|
|
|
drw_text(drw, m->ww - sw - stw, 0, sw, bh, 0, stext, 0);
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
|
|
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
|
|
|
#endif // SYSTRAY_PATCH
|
|
|
|
#endif // SYSTRAY_PATCH
|
|
|
|
|
|
|
|
#endif // STATUSPADDING_PATCH
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (c = m->clients; c; c = c->next) {
|
|
|
|
for (c = m->clients; c; c = c->next) {
|
|
|
@ -1958,8 +1967,13 @@ setup(void)
|
|
|
|
#endif // ALPHA_PATCH
|
|
|
|
#endif // ALPHA_PATCH
|
|
|
|
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
|
|
|
|
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
|
|
|
|
die("no fonts could be loaded.");
|
|
|
|
die("no fonts could be loaded.");
|
|
|
|
|
|
|
|
#if STATUSPADDING_PATCH
|
|
|
|
|
|
|
|
lrpad = drw->fonts->h + horizpadbar;
|
|
|
|
|
|
|
|
bh = drw->fonts->h + vertpadbar;
|
|
|
|
|
|
|
|
#else
|
|
|
|
lrpad = drw->fonts->h;
|
|
|
|
lrpad = drw->fonts->h;
|
|
|
|
bh = drw->fonts->h + 2;
|
|
|
|
bh = drw->fonts->h + 2;
|
|
|
|
|
|
|
|
#endif // STATUSPADDING_PATCH
|
|
|
|
updategeom();
|
|
|
|
updategeom();
|
|
|
|
/* init atoms */
|
|
|
|
/* init atoms */
|
|
|
|
utf8string = XInternAtom(dpy, "UTF8_STRING", False);
|
|
|
|
utf8string = XInternAtom(dpy, "UTF8_STRING", False);
|
|
|
|