|
|
@ -60,7 +60,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/* enums */ |
|
|
|
/* enums */ |
|
|
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ |
|
|
|
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, |
|
|
|
enum { NetSupported, NetWMName, NetWMState, NetWMCheck, |
|
|
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType, |
|
|
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType, |
|
|
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ |
|
|
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ |
|
|
@ -705,7 +705,7 @@ 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[SchemeStatus]); |
|
|
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ |
|
|
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ |
|
|
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0); |
|
|
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0); |
|
|
|
} |
|
|
|
} |
|
|
@ -718,7 +718,7 @@ drawbar(Monitor *m) |
|
|
|
x = 0; |
|
|
|
x = 0; |
|
|
|
for (i = 0; i < LENGTH(tags); i++) { |
|
|
|
for (i = 0; i < LENGTH(tags); i++) { |
|
|
|
w = TEXTW(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); |
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); |
|
|
|
if (occ & 1 << i) |
|
|
|
if (occ & 1 << i) |
|
|
|
drw_rect(drw, x + boxs, boxs, boxw, boxw, |
|
|
|
drw_rect(drw, x + boxs, boxs, boxw, boxw, |
|
|
@ -727,17 +727,17 @@ drawbar(Monitor *m) |
|
|
|
x += w; |
|
|
|
x += w; |
|
|
|
} |
|
|
|
} |
|
|
|
w = blw = TEXTW(m->ltsymbol); |
|
|
|
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); |
|
|
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); |
|
|
|
|
|
|
|
|
|
|
|
if ((w = m->ww - sw - x) > bh) { |
|
|
|
if ((w = m->ww - sw - x) > bh) { |
|
|
|
if (m->sel) { |
|
|
|
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); |
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); |
|
|
|
if (m->sel->isfloating) |
|
|
|
if (m->sel->isfloating) |
|
|
|
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); |
|
|
|
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]); |
|
|
|
drw_setscheme(drw, scheme[SchemeInfoNorm]); |
|
|
|
drw_rect(drw, x, 0, w, bh, 1, 1); |
|
|
|
drw_rect(drw, x, 0, w, bh, 1, 1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|