diff --git a/config.h b/config.h index 10ce310..bdb0bf9 100644 --- a/config.h +++ b/config.h @@ -18,16 +18,19 @@ static const unsigned int gappoh = 10; /* horiz outer gap between windo static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */ static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */ -static const char fg[] = "#ffffff"; -static const char nord_fg[] = "#D8DEE9"; -static const char one_bg[] = "#1C1B1D"; -static const char nord_bg[] = "#2E3440"; -static const char nord_blue[] = "#81A1C1"; +static const char fg[] = "#282828"; +static const char bg[] = "#f2e5bc"; +static const char acc[] = "#d79921"; static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { nord_fg, nord_bg, nord_bg }, - [SchemeSel] = { nord_bg, nord_blue, nord_blue }, + /* fg bg border */ + [SchemeNorm] = { fg, bg, bg }, + [SchemeSel] = { bg, acc, acc }, + [SchemeStatus] = { fg, bg, "#000000" }, // Statusbar right + [SchemeTagsSel] = { fg, acc, "#000000" }, // Tagbar left selected + [SchemeTagsNorm] = { fg, bg, "#000000" }, // Tagbar left unselected + [SchemeInfoSel] = { fg, bg, "#000000" }, // infobar middle selected + [SchemeInfoNorm] = { fg, bg, "#000000" }, // infobar middle unselected }; /* tagging */ diff --git a/dwm.c b/dwm.c index 2bb3869..2386fc9 100644 --- a/dwm.c +++ b/dwm.c @@ -66,13 +66,13 @@ /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -enum { SchemeNorm, SchemeSel }; /* color schemes */ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, NetWMFullscreen, NetActiveWindow, NetWMWindowType, NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ +enum { SchemeNorm, SchemeSel, SchemeStatus, SchemeTagsSel, SchemeTagsNorm, SchemeInfoSel, SchemeInfoNorm }; /* color schemes */ typedef union { int i; @@ -815,6 +815,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); } @@ -828,6 +829,7 @@ drawbar(Monitor *m) 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, @@ -837,16 +839,19 @@ drawbar(Monitor *m) } 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); } }