|
|
|
@ -59,7 +59,7 @@
|
|
|
|
|
|
|
|
|
|
/* enums */
|
|
|
|
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
|
|
|
|
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
|
|
|
|
enum { SchemeNorm, SchemeSel, SchemeStatus, SchemeTagsSel, SchemeTagsNorm, SchemeInfoSel, SchemeInfoNorm }; /* color schemes */
|
|
|
|
|
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|
|
|
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
|
|
|
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
|
|
|
@ -704,7 +704,7 @@ 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]);
|
|
|
|
|
drw_setscheme(drw, scheme[SchemeStatus]);
|
|
|
|
|
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
|
|
|
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
|
|
|
|
}
|
|
|
|
@ -717,7 +717,7 @@ drawbar(Monitor *m)
|
|
|
|
|
x = 0;
|
|
|
|
|
for (i = 0; i < LENGTH(tags); i++) {
|
|
|
|
|
w = TEXTW(tags[i]);
|
|
|
|
|
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
|
|
|
|
|
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]);
|
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
|
|
|
|
|
if (occ & 1 << i)
|
|
|
|
|
drw_rect(drw, x + boxs, boxs, boxw, boxw,
|
|
|
|
@ -726,17 +726,17 @@ drawbar(Monitor *m)
|
|
|
|
|
x += w;
|
|
|
|
|
}
|
|
|
|
|
w = blw = TEXTW(m->ltsymbol);
|
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
|
drw_setscheme(drw, scheme[SchemeTagsNorm]);
|
|
|
|
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
|
|
|
|
|
|
|
|
|
if ((w = m->ww - tw - x) > bh) {
|
|
|
|
|
if (m->sel) {
|
|
|
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
|
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeInfoSel : SchemeInfoNorm]);
|
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
|
|
|
if (m->sel->isfloating)
|
|
|
|
|
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
|
|
|
|
} else {
|
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
|
drw_setscheme(drw, scheme[SchemeInfoNorm]);
|
|
|
|
|
drw_rect(drw, x, 0, w, bh, 1, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|