From 81488b4862487c6debed8f447db217d2d2c78ecb Mon Sep 17 00:00:00 2001 From: bakkeby Date: Fri, 21 Aug 2020 15:49:15 +0200 Subject: [PATCH] Simplification of color configuration; settling on a set of color schemes that is shared between multiple patches (urgentborder, floatborder and titlecolor patches made non-optional) --- README.md | 14 ++- config.def.h | 228 ++++++++++++++----------------------- drw.h | 4 - dwm.c | 61 ++-------- patch/bar_awesomebar.c | 10 -- patch/bar_fancybar.c | 7 -- patch/bar_flexwintitle.c | 8 +- patch/bar_powerline_tags.c | 4 - patch/bar_tabgroups.c | 4 +- patch/bar_taggrid.c | 18 --- patch/bar_tags.c | 29 ++--- patch/bar_wintitle.c | 10 -- patch/xrdb.c | 98 +++++++++------- patches.def.h | 15 --- 14 files changed, 168 insertions(+), 342 deletions(-) diff --git a/README.md b/README.md index 109e54c..efc7e4c 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t ### Changelog: +2020-08-21 - Simplification of color configuration; settling on a set of color schemes that is shared between multiple patches (urgentborder, floatborder and titlecolor patches made non-optional) + 2020-08-20 - Added experimental flexwintitle patch based on bartabgroups 2020-08-13 - Added bartabgroups patch @@ -273,8 +275,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t - flexwintitle - based on the bartabgroups patch, this is a layout aware barmodules module for handling window titles intended to be used with flextile-deluxe - - [floatbordercolor](https://dwm.suckless.org/patches/float_border_color/) - - this patch allows a different border color to be chosen for floating windows + - [~floatbordercolor~](https://dwm.suckless.org/patches/float_border_color/) + - ~this patch allows a different border color to be chosen for floating windows~ - [floatpos](https://github.com/bakkeby/patches/wiki/floatpos/) - adds a float rule allowing the size and position of floating windows to be specified @@ -515,8 +517,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t - [tagswapmon](https://github.com/bakkeby/patches/wiki/tagswapmon/) - swap all visible windows on one monitor with those of an adjacent monitor - - [titlecolor](https://dwm.suckless.org/patches/titlecolor/) - - adds a new color scheme used by the (selected) window title in the bar + - [~titlecolor~](https://dwm.suckless.org/patches/titlecolor/) + - ~adds a new color scheme used by the (selected) window title in the bar~ - [togglefullscreen](https://github.com/bakkeby/patches/wiki/togglefullscreen/) - allows you to toggle fullscreen on and off using a single shortcut key @@ -533,8 +535,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t - [killunsel](https://dwm.suckless.org/patches/killunsel/) - kills all visible clients that are not selected (only the selected client will remain) - - [urgentborder](https://dwm.suckless.org/patches/urgentborder/) - - this patch makes "urgent" windows have different colors + - [~urgentborder~](https://dwm.suckless.org/patches/urgentborder/) + - ~this patch makes "urgent" windows have different colors~ - [vanitygaps](https://github.com/bakkeby/patches/blob/master/dwm/dwm-vanitygaps-6.2.diff) - adds configurable gaps between windows differentiating between outer, inner, horizontal and vertical gaps diff --git a/config.def.h b/config.def.h index 2454b46..b6838cb 100644 --- a/config.def.h +++ b/config.def.h @@ -68,7 +68,7 @@ static const char *fonts[] = { "monospace:size=10" }; #endif // BAR_PANGO_PATCH static const char dmenufont[] = "monospace:size=10"; -static char c000000[] = "#000000"; // placeholder value, overridden by vt colors or xrdb +static char c000000[] = "#000000"; // placeholder value static char normfgcolor[] = "#bbbbbb"; static char normbgcolor[] = "#222222"; static char normbordercolor[] = "#444444"; @@ -79,48 +79,35 @@ static char selbgcolor[] = "#005577"; static char selbordercolor[] = "#005577"; static char selfloatcolor[] = "#005577"; -#if BAR_STATUSCOLORS_PATCH -static char warnfgcolor[] = "#000000"; -static char warnbgcolor[] = "#ffff00"; -static char warnbordercolor[] = "#ff0000"; -static char warnfloatcolor[] = "#ffffff"; -#endif // BAR_STATUSCOLORS_PATCH +static char titlenormfgcolor[] = "#bbbbbb"; +static char titlenormbgcolor[] = "#222222"; +static char titlenormbordercolor[] = "#444444"; +static char titlenormfloatcolor[] = "#db8fd9"; -#if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH -static char urgfgcolor[] = "#000000"; -static char urgbgcolor[] = "#000000"; -static char urgbordercolor[] = "#ff0000"; // NB: patch only works with border color for now -static char urgfloatcolor[] = "#000000"; -#endif // URGENTBORDER_PATCH // BAR_STATUSCOLORS_PATCH +static char titleselfgcolor[] = "#eeeeee"; +static char titleselbgcolor[] = "#005577"; +static char titleselbordercolor[] = "#005577"; +static char titleselfloatcolor[] = "#005577"; + +static char tagsnormfgcolor[] = "#bbbbbb"; +static char tagsnormbgcolor[] = "#222222"; +static char tagsnormbordercolor[] = "#444444"; +static char tagsnormfloatcolor[] = "#db8fd9"; + +static char tagsselfgcolor[] = "#eeeeee"; +static char tagsselbgcolor[] = "#005577"; +static char tagsselbordercolor[] = "#005577"; +static char tagsselfloatcolor[] = "#005577"; -#if BAR_WINTITLEACTIONS_PATCH static char hidfgcolor[] = "#005577"; static char hidbgcolor[] = "#222222"; static char hidbordercolor[] = "#005577"; static char hidfloatcolor[] = "#f76e0c"; -#endif // BAR_WINTITLEACTIONS_PATCH -#if BAR_POWERLINE_STATUS_PATCH || (BAR_TITLECOLOR_PATCH && !BAR_VTCOLORS_PATCH) -static char titlefgcolor[] = "#FFF7D4"; -static char titlebgcolor[] = "#330000"; -static char titlebordercolor[] = "#330000"; -static char titlefloatcolor[] = "#f76e0c"; -static char titleselfgcolor[] = "#FFF7D4"; -static char titleselbgcolor[] = "#c278b6"; -static char titleselbordercolor[] = "#330000"; -static char titleselfloatcolor[] = "#FF0000"; -#endif // BAR_POWERLINE_STATUS_PATCH | BAR_TITLECOLOR_PATCH - -#if BAR_TABGROUPS_PATCH -static char tabgrpactivefgcolor[] = "#FFF7D4"; -static char tabgrpactivebgcolor[] = "#444444"; -static char tabgrpactivebordercolor[] = "#330000"; -static char tabgrpinactivefgcolor[] = "#bbbbbb"; -static char tabgrpinactivebgcolor[] = "#222222"; -static char tabgrpinactivebordercolor[] = "#991100"; -static char tabgrpactivefloatcolor[] = "#000000"; -static char tabgrpinactivefloatcolor[] = "#000000"; -#endif // BAR_TABGROUPS_PATCH +static char urgfgcolor[] = "#bbbbbb"; +static char urgbgcolor[] = "#222222"; +static char urgbordercolor[] = "#ff0000"; +static char urgfloatcolor[] = "#db8fd9"; #if BAR_FLEXWINTITLE_PATCH static char normTTBbgcolor[] = "#330000"; @@ -165,28 +152,12 @@ static const unsigned int alphas[][3] = { /* fg bg border */ [SchemeNorm] = { OPAQUE, baralpha, borderalpha }, [SchemeSel] = { OPAQUE, baralpha, borderalpha }, - #if BAR_STATUSCOLORS_PATCH - [SchemeWarn] = { OPAQUE, baralpha, borderalpha }, - #endif // BAR_STATUSCOLORS_PATCH - #if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH - [SchemeUrg] = { OPAQUE, baralpha, borderalpha }, - #endif // URGENTBORDER_PATCH / BAR_STATUSCOLORS_PATCH - #if BAR_WINTITLEACTIONS_PATCH - [SchemeHid] = { OPAQUE, baralpha, borderalpha }, - #endif // BAR_WINTITLEACTIONS_PATCH - #if BAR_VTCOLORS_PATCH - [SchemeTagsNorm] = { OPAQUE, baralpha, borderalpha }, - [SchemeTagsSel] = { OPAQUE, baralpha, borderalpha }, [SchemeTitleNorm] = { OPAQUE, baralpha, borderalpha }, [SchemeTitleSel] = { OPAQUE, baralpha, borderalpha }, - [SchemeStatus] = { OPAQUE, baralpha, borderalpha }, - #elif BAR_TITLECOLOR_PATCH - [SchemeTitle] = { OPAQUE, baralpha, borderalpha }, - #endif // BAR_VTCOLORS_PATCH / BAR_TITLECOLOR_PATCH - #if BAR_TABGROUPS_PATCH - [SchemeTabActive] = { OPAQUE, baralpha, borderalpha }, - [SchemeTabInactive] = { OPAQUE, baralpha, borderalpha }, - #endif // BAR_TABGROUPS_PATCH + [SchemeTagsNorm] = { OPAQUE, baralpha, borderalpha }, + [SchemeTagsSel] = { OPAQUE, baralpha, borderalpha }, + [SchemeHid] = { OPAQUE, baralpha, borderalpha }, + [SchemeUrg] = { OPAQUE, baralpha, borderalpha }, #if BAR_FLEXWINTITLE_PATCH [SchemeFlexActTTB] = { OPAQUE, baralpha, borderalpha }, [SchemeFlexActLTR] = { OPAQUE, baralpha, borderalpha }, @@ -227,106 +198,77 @@ static const unsigned int alphas[][3] = { #if BAR_VTCOLORS_PATCH static const char title_bg_dark[] = "#303030"; static const char title_bg_light[] = "#fdfdfd"; -static const int color_ptrs[][4] = { +static const int color_ptrs[][ColCount] = { /* fg bg border float */ [SchemeNorm] = { -1, -1, 5, 12 }, [SchemeSel] = { -1, -1, 11, 13 }, - #if BAR_STATUSCOLORS_PATCH - [SchemeWarn] = { -1, 1, 1, 14 }, - #endif // BAR_STATUSCOLORS_PATCH - #if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH - [SchemeUrg] = { 7, 9, 9, 15 }, - #endif // URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH - #if BAR_WINTITLEACTIONS_PATCH - [SchemeHid] = { 5, 0, 0, -1 }, - #endif // BAR_WINTITLEACTIONS_PATCH - #if BAR_TITLECOLOR_PATCH - [SchemeTitle] = { 6, -1, -1, -1 }, - #endif // BAR_TITLECOLOR_PATCH - #if BAR_TABGROUPS_PATCH - [SchemeTabActive] = { 6, 5, 5, -1 }, - [SchemeTabInactive] = { 2, 0, 0, -1 }, - #endif // BAR_TABGROUPS_PATCH - [SchemeTagsNorm] = { 2, 0, 0, -1 }, - [SchemeTagsSel] = { 6, 5, 5, -1 }, [SchemeTitleNorm] = { 6, -1, -1, -1 }, [SchemeTitleSel] = { 6, -1, -1, -1 }, - [SchemeStatus] = { 2, 0, 0, -1 }, + [SchemeTagsNorm] = { 2, 0, 0, -1 }, + [SchemeTagsSel] = { 6, 5, 5, -1 }, + [SchemeHid] = { 5, 0, 0, -1 }, + [SchemeUrg] = { 7, 9, 9, 15 }, }; #endif // BAR_VTCOLORS_PATCH -static -char *colors[][4] = { - /* fg bg border float */ - [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor, normfloatcolor }, - [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor, selfloatcolor }, - #if BAR_STATUSCOLORS_PATCH - [SchemeWarn] = { warnfgcolor, warnbgcolor, warnbordercolor, warnfloatcolor }, - #endif // BAR_STATUSCOLORS_PATCH - #if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH - [SchemeUrg] = { urgfgcolor, urgbgcolor, urgbordercolor, urgfloatcolor }, - #endif // URGENTBORDER_PATCH / BAR_STATUSCOLORS_PATCH - #if BAR_WINTITLEACTIONS_PATCH - [SchemeHid] = { hidfgcolor, hidbgcolor, hidbordercolor, hidfloatcolor }, - #endif // BAR_WINTITLEACTIONS_PATCH - #if BAR_TITLECOLOR_PATCH - [SchemeTitle] = { titlefgcolor, titlebgcolor, titlebordercolor, titlefloatcolor }, - #endif // BAR_TITLECOLOR_PATCH - #if BAR_TABGROUPS_PATCH - [SchemeTabActive] = { tabgrpactivefgcolor, tabgrpactivebgcolor, tabgrpactivebordercolor, tabgrpactivefloatcolor }, - [SchemeTabInactive] = { tabgrpinactivefgcolor, tabgrpinactivebgcolor, tabgrpinactivebordercolor, tabgrpinactivefloatcolor }, - #endif // BAR_TABGROUPS_PATCH - #if BAR_VTCOLORS_PATCH - [SchemeTagsNorm] = { c000000, c000000, c000000, c000000 }, - [SchemeTagsSel] = { c000000, c000000, c000000, c000000 }, - [SchemeTitleNorm] = { c000000, c000000, c000000, c000000 }, - [SchemeTitleSel] = { c000000, c000000, c000000, c000000 }, - [SchemeStatus] = { c000000, c000000, c000000, c000000 }, - #endif // BAR_VTCOLORS_PATCH / BAR_TITLECOLOR_PATCH +static char *colors[][ColCount] = { + /* fg bg border float */ + [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor, normfloatcolor }, + [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor, selfloatcolor }, + [SchemeTitleNorm] = { titlenormfgcolor, titlenormbgcolor, titlenormbordercolor, titlenormfloatcolor }, + [SchemeTitleSel] = { titleselfgcolor, titleselbgcolor, titleselbordercolor, titleselfloatcolor }, + [SchemeTagsNorm] = { tagsnormfgcolor, tagsnormbgcolor, tagsnormbordercolor, tagsnormfloatcolor }, + [SchemeTagsSel] = { tagsselfgcolor, tagsselbgcolor, tagsselbordercolor, tagsselfloatcolor }, + [SchemeHid] = { hidfgcolor, hidbgcolor, hidbordercolor, hidfloatcolor }, + [SchemeUrg] = { urgfgcolor, urgbgcolor, urgbordercolor, urgfloatcolor }, #if BAR_FLEXWINTITLE_PATCH - [SchemeFlexActTTB] = { selfgcolor, actTTBbgcolor, c000000, c000000 }, - [SchemeFlexActLTR] = { selfgcolor, actLTRbgcolor, c000000, c000000 }, - [SchemeFlexActMONO] = { selfgcolor, actMONObgcolor, c000000, c000000 }, - [SchemeFlexActGRID] = { selfgcolor, actGRIDbgcolor, c000000, c000000 }, - [SchemeFlexActGRD1] = { selfgcolor, actGRD1bgcolor, c000000, c000000 }, - [SchemeFlexActGRD2] = { selfgcolor, actGRD2bgcolor, c000000, c000000 }, - [SchemeFlexActGRDM] = { selfgcolor, actGRDMbgcolor, c000000, c000000 }, - [SchemeFlexActHGRD] = { selfgcolor, actHGRDbgcolor, c000000, c000000 }, - [SchemeFlexActDWDL] = { selfgcolor, actDWDLbgcolor, c000000, c000000 }, - [SchemeFlexActSPRL] = { selfgcolor, actSPRLbgcolor, c000000, c000000 }, - [SchemeFlexActFloat] = { selfgcolor, actfloatbgcolor, c000000, c000000 }, - [SchemeFlexInaTTB] = { normfgcolor, normTTBbgcolor, c000000, c000000 }, - [SchemeFlexInaLTR] = { normfgcolor, normLTRbgcolor, c000000, c000000 }, - [SchemeFlexInaMONO] = { normfgcolor, normMONObgcolor, c000000, c000000 }, - [SchemeFlexInaGRID] = { normfgcolor, normGRIDbgcolor, c000000, c000000 }, - [SchemeFlexInaGRD1] = { normfgcolor, normGRD1bgcolor, c000000, c000000 }, - [SchemeFlexInaGRD2] = { normfgcolor, normGRD2bgcolor, c000000, c000000 }, - [SchemeFlexInaGRDM] = { normfgcolor, normGRDMbgcolor, c000000, c000000 }, - [SchemeFlexInaHGRD] = { normfgcolor, normHGRDbgcolor, c000000, c000000 }, - [SchemeFlexInaDWDL] = { normfgcolor, normDWDLbgcolor, c000000, c000000 }, - [SchemeFlexInaSPRL] = { normfgcolor, normSPRLbgcolor, c000000, c000000 }, - [SchemeFlexInaFloat] = { normfgcolor, normfloatbgcolor, c000000, c000000 }, - [SchemeFlexSelTTB] = { selfgcolor, selTTBbgcolor, c000000, c000000 }, - [SchemeFlexSelLTR] = { selfgcolor, selLTRbgcolor, c000000, c000000 }, - [SchemeFlexSelMONO] = { selfgcolor, selMONObgcolor, c000000, c000000 }, - [SchemeFlexSelGRID] = { selfgcolor, selGRIDbgcolor, c000000, c000000 }, - [SchemeFlexSelGRD1] = { selfgcolor, selGRD1bgcolor, c000000, c000000 }, - [SchemeFlexSelGRD2] = { selfgcolor, selGRD2bgcolor, c000000, c000000 }, - [SchemeFlexSelGRDM] = { selfgcolor, selGRDMbgcolor, c000000, c000000 }, - [SchemeFlexSelHGRD] = { selfgcolor, selHGRDbgcolor, c000000, c000000 }, - [SchemeFlexSelDWDL] = { selfgcolor, selDWDLbgcolor, c000000, c000000 }, - [SchemeFlexSelSPRL] = { selfgcolor, selSPRLbgcolor, c000000, c000000 }, - [SchemeFlexSelFloat] = { selfgcolor, selfloatbgcolor, c000000, c000000 }, + [SchemeFlexActTTB] = { titleselfgcolor, actTTBbgcolor, c000000, c000000 }, + [SchemeFlexActLTR] = { titleselfgcolor, actLTRbgcolor, c000000, c000000 }, + [SchemeFlexActMONO] = { titleselfgcolor, actMONObgcolor, c000000, c000000 }, + [SchemeFlexActGRID] = { titleselfgcolor, actGRIDbgcolor, c000000, c000000 }, + [SchemeFlexActGRD1] = { titleselfgcolor, actGRD1bgcolor, c000000, c000000 }, + [SchemeFlexActGRD2] = { titleselfgcolor, actGRD2bgcolor, c000000, c000000 }, + [SchemeFlexActGRDM] = { titleselfgcolor, actGRDMbgcolor, c000000, c000000 }, + [SchemeFlexActHGRD] = { titleselfgcolor, actHGRDbgcolor, c000000, c000000 }, + [SchemeFlexActDWDL] = { titleselfgcolor, actDWDLbgcolor, c000000, c000000 }, + [SchemeFlexActSPRL] = { titleselfgcolor, actSPRLbgcolor, c000000, c000000 }, + [SchemeFlexActFloat] = { titleselfgcolor, actfloatbgcolor, c000000, c000000 }, + [SchemeFlexInaTTB] = { titlenormfgcolor, normTTBbgcolor, c000000, c000000 }, + [SchemeFlexInaLTR] = { titlenormfgcolor, normLTRbgcolor, c000000, c000000 }, + [SchemeFlexInaMONO] = { titlenormfgcolor, normMONObgcolor, c000000, c000000 }, + [SchemeFlexInaGRID] = { titlenormfgcolor, normGRIDbgcolor, c000000, c000000 }, + [SchemeFlexInaGRD1] = { titlenormfgcolor, normGRD1bgcolor, c000000, c000000 }, + [SchemeFlexInaGRD2] = { titlenormfgcolor, normGRD2bgcolor, c000000, c000000 }, + [SchemeFlexInaGRDM] = { titlenormfgcolor, normGRDMbgcolor, c000000, c000000 }, + [SchemeFlexInaHGRD] = { titlenormfgcolor, normHGRDbgcolor, c000000, c000000 }, + [SchemeFlexInaDWDL] = { titlenormfgcolor, normDWDLbgcolor, c000000, c000000 }, + [SchemeFlexInaSPRL] = { titlenormfgcolor, normSPRLbgcolor, c000000, c000000 }, + [SchemeFlexInaFloat] = { titlenormfgcolor, normfloatbgcolor, c000000, c000000 }, + [SchemeFlexSelTTB] = { titleselfgcolor, selTTBbgcolor, c000000, c000000 }, + [SchemeFlexSelLTR] = { titleselfgcolor, selLTRbgcolor, c000000, c000000 }, + [SchemeFlexSelMONO] = { titleselfgcolor, selMONObgcolor, c000000, c000000 }, + [SchemeFlexSelGRID] = { titleselfgcolor, selGRIDbgcolor, c000000, c000000 }, + [SchemeFlexSelGRD1] = { titleselfgcolor, selGRD1bgcolor, c000000, c000000 }, + [SchemeFlexSelGRD2] = { titleselfgcolor, selGRD2bgcolor, c000000, c000000 }, + [SchemeFlexSelGRDM] = { titleselfgcolor, selGRDMbgcolor, c000000, c000000 }, + [SchemeFlexSelHGRD] = { titleselfgcolor, selHGRDbgcolor, c000000, c000000 }, + [SchemeFlexSelDWDL] = { titleselfgcolor, selDWDLbgcolor, c000000, c000000 }, + [SchemeFlexSelSPRL] = { titleselfgcolor, selSPRLbgcolor, c000000, c000000 }, + [SchemeFlexSelFloat] = { titleselfgcolor, selfloatbgcolor, c000000, c000000 }, #endif // BAR_FLEXWINTITLE_PATCH }; #if BAR_POWERLINE_STATUS_PATCH -char *statuscolors[][4] = { - /* fg bg border float */ - [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor, normfloatcolor }, - [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor, selfloatcolor }, - [SchemeTitleNorm] = { titlefgcolor, titlebgcolor, titlebordercolor, titlefloatcolor }, - [SchemeTitleSel] = { titleselfgcolor, titleselbgcolor, titleselbordercolor, titleselfloatcolor }, +static char *statuscolors[][ColCount] = { + /* fg bg border float */ + [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor, normfloatcolor }, + [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor, selfloatcolor }, + [SchemeTitleNorm] = { titlenormfgcolor, titlenormbgcolor, titlenormbordercolor, titlenormfloatcolor }, + [SchemeTitleSel] = { titleselfgcolor, titleselbgcolor, titleselbordercolor, titleselfloatcolor }, + [SchemeTagsNorm] = { tagsnormfgcolor, tagsnormbgcolor, tagsnormbordercolor, tagsnormfloatcolor }, + [SchemeTagsSel] = { tagsselfgcolor, tagsselbgcolor, tagsselbordercolor, tagsselfloatcolor }, + [SchemeHid] = { hidfgcolor, hidbgcolor, hidbordercolor, hidfloatcolor }, + [SchemeUrg] = { urgfgcolor, urgbgcolor, urgbordercolor, urgfloatcolor }, }; #endif // BAR_POWERLINE_STATUS_PATCH diff --git a/drw.h b/drw.h index 8630974..0e18068 100644 --- a/drw.h +++ b/drw.h @@ -21,11 +21,7 @@ typedef struct Fnt { #endif // BAR_PANGO_PATCH } Fnt; -#if FLOAT_BORDER_COLOR_PATCH enum { ColFg, ColBg, ColBorder, ColFloat, ColCount }; /* Clr scheme index */ -#else -enum { ColFg, ColBg, ColBorder, ColCount }; /* Clr scheme index */ -#endif // FLOAT_BORDER_COLOR_PATCH typedef XftColor Clr; typedef struct { diff --git a/dwm.c b/dwm.c index 827ed2a..a6d1ca8 100644 --- a/dwm.c +++ b/dwm.c @@ -117,31 +117,12 @@ enum { enum { SchemeNorm, SchemeSel, - #if BAR_STATUSCOLORS_PATCH - SchemeWarn, - #endif // BAR_STATUSCOLORS_PATCH - #if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH - SchemeUrg, - #endif // URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH - #if BAR_WINTITLEACTIONS_PATCH - SchemeHid, - #endif // BAR_WINTITLEACTIONS_PATCH - #if BAR_VTCOLORS_PATCH - SchemeTagsNorm, - SchemeTagsSel, - SchemeStatus, - #endif - #if BAR_VTCOLORS_PATCH || BAR_POWERLINE_STATUS_PATCH SchemeTitleNorm, SchemeTitleSel, - #endif // BAR_POWERLINE_STATUS_PATCH - #if BAR_TITLECOLOR_PATCH - SchemeTitle, - #endif // BAR_VTCOLORS_PATCH - #if BAR_TABGROUPS_PATCH - SchemeTabActive, - SchemeTabInactive, - #endif // BAR_TABGROUPS_PATCH + SchemeTagsNorm, + SchemeTagsSel, + SchemeHid, + SchemeUrg, #if BAR_FLEXWINTITLE_PATCH SchemeFlexActTTB, SchemeFlexActLTR, @@ -1552,11 +1533,7 @@ drawbarwin(Bar *bar) rw = lw = bar->bw; rx = lx = 0; - #if BAR_VTCOLORS_PATCH - drw_setscheme(drw, scheme[SchemeTagsNorm]); - #else drw_setscheme(drw, scheme[SchemeNorm]); - #endif // BAR_VTCOLORS_PATCH drw_rect(drw, lx, 0, lw, bh, 1, 1); for (r = 0; r < LENGTH(barrules); r++) { br = &barrules[r]; @@ -1564,11 +1541,7 @@ drawbarwin(Bar *bar) continue; if (br->monitor != 'A' && br->monitor != -1 && br->monitor != mi) continue; - #if BAR_VTCOLORS_PATCH - drw_setscheme(drw, scheme[SchemeTagsNorm]); - #else drw_setscheme(drw, scheme[SchemeNorm]); - #endif // BAR_VTCOLORS_PATCH warg.max_width = (br->alignment < BAR_ALIGN_RIGHT_LEFT ? lw : rw); w = br->widthfunc(bar, &warg); w = MIN(warg.max_width, w); @@ -1697,14 +1670,10 @@ focus(Client *c) detachstack(c); attachstack(c); grabbuttons(c, 1); - #if FLOAT_BORDER_COLOR_PATCH if (c->isfloating) XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColFloat].pixel); else XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); - #else - XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); - #endif // FLOAT_BORDER_COLOR_PATCH setfocus(c); } else { XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); @@ -2072,14 +2041,10 @@ manage(Window w, XWindowAttributes *wa) wc.border_width = c->bw; XConfigureWindow(dpy, w, CWBorderWidth, &wc); - #if FLOAT_BORDER_COLOR_PATCH if (c->isfloating) XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColFloat].pixel); else XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel); - #else - XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel); - #endif // FLOAT_BORDER_COLOR_PATCH configure(c); /* propagates border_width, if size doesn't change */ #if !FLOATPOS_PATCH updatesizehints(c); @@ -2114,12 +2079,10 @@ manage(Window w, XWindowAttributes *wa) if (!c->isfloating) c->isfloating = c->oldstate = trans != None || c->isfixed; - if (c->isfloating) + if (c->isfloating) { XRaiseWindow(dpy, c->win); - #if FLOAT_BORDER_COLOR_PATCH - if (c->isfloating) XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColFloat].pixel); - #endif // FLOAT_BORDER_COLOR_PATCH + } #if ATTACHABOVE_PATCH || ATTACHASIDE_PATCH || ATTACHBELOW_PATCH || ATTACHBOTTOM_PATCH attachx(c); #else @@ -3344,12 +3307,10 @@ togglefloating(const Arg *arg) #endif // FAKEFULLSCREEN_CLIENT_PATCH #endif // !FAKEFULLSCREEN_PATCH selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; - #if FLOAT_BORDER_COLOR_PATCH if (selmon->sel->isfloating) XSetWindowBorder(dpy, selmon->sel->win, scheme[SchemeSel][ColFloat].pixel); else XSetWindowBorder(dpy, selmon->sel->win, scheme[SchemeSel][ColBorder].pixel); - #endif // FLOAT_BORDER_COLOR_PATCH if (selmon->sel->isfloating) { #if SAVEFLOATS_PATCH || EXRESIZE_PATCH if (selmon->sel->sfx != -9999) { @@ -3497,14 +3458,10 @@ unfocus(Client *c, int setfocus) #endif // FAKEFULLSCREEN_CLIENT_PATCH #endif // LOSEFULLSCREEN_PATCH grabbuttons(c, 0); - #if FLOAT_BORDER_COLOR_PATCH if (c->isfloating) XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColFloat].pixel); else XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel); - #else - XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel); - #endif // FLOAT_BORDER_COLOR_PATCH if (setfocus) { XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XDeleteProperty(dpy, root, netatom[NetActiveWindow]); @@ -3898,16 +3855,12 @@ updatewmhints(Client *c) XSetWMHints(dpy, c->win, wmh); } else c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0; - #if URGENTBORDER_PATCH if (c->isurgent) { - #if FLOAT_BORDER_COLOR_PATCH if (c->isfloating) XSetWindowBorder(dpy, c->win, scheme[SchemeUrg][ColFloat].pixel); else - #endif - XSetWindowBorder(dpy, c->win, scheme[SchemeUrg][ColBorder].pixel); + XSetWindowBorder(dpy, c->win, scheme[SchemeUrg][ColBorder].pixel); } - #endif // URGENTBORDER_PATCH if (wmh->flags & InputHint) c->neverfocus = !wmh->input; else diff --git a/patch/bar_awesomebar.c b/patch/bar_awesomebar.c index d8a11e9..613e8d9 100644 --- a/patch/bar_awesomebar.c +++ b/patch/bar_awesomebar.c @@ -31,21 +31,11 @@ draw_awesomebar(Bar *bar, BarDrawArg *a) if (!ISVISIBLE(c)) continue; if (bar->mon->sel == c) - #if BAR_VTCOLORS_PATCH scm = SchemeTitleSel; - #elif BAR_TITLECOLOR_PATCH - scm = SchemeTitle; - #else - scm = SchemeSel; - #endif // BAR_VTCOLORS_PATCH / BAR_TITLECOLOR_PATCH else if (HIDDEN(c)) scm = SchemeHid; else - #if BAR_VTCOLORS_PATCH scm = SchemeTitleNorm; - #else - scm = SchemeNorm; - #endif // BAR_VTCOLORS_PATCH drw_setscheme(drw, scheme[scm]); #if BAR_PANGO_PATCH diff --git a/patch/bar_fancybar.c b/patch/bar_fancybar.c index 810026d..b32181d 100644 --- a/patch/bar_fancybar.c +++ b/patch/bar_fancybar.c @@ -52,14 +52,7 @@ draw_fancybar(Bar *bar, BarDrawArg *a) if (!ISVISIBLE(c)) continue; ftw = MIN(m->sel == c ? w : mw, TEXTW(c->name)); - - #if BAR_VTCOLORS_PATCH drw_setscheme(drw, scheme[m->sel == c ? SchemeTitleSel : SchemeTitleNorm]); - #elif BAR_TITLECOLOR_PATCH - drw_setscheme(drw, scheme[m->sel == c ? SchemeTitle : SchemeNorm]); - #else - drw_setscheme(drw, scheme[m->sel == c ? SchemeSel : SchemeNorm]); - #endif // BAR_VTCOLORS_PATCH / BAR_TITLECOLOR_PATCH if (ftw > 0) /* trap special handling of 0 in drw_text */ #if BAR_PANGO_PATCH drw_text(drw, x, 0, ftw, bh, lrpad / 2, c->name, 0, False); diff --git a/patch/bar_flexwintitle.c b/patch/bar_flexwintitle.c index bf5b4f2..603af8f 100644 --- a/patch/bar_flexwintitle.c +++ b/patch/bar_flexwintitle.c @@ -157,13 +157,13 @@ getschemefor(Monitor *m, int group, int activegroup) if (m->lt[m->sellt]->arrange == &monocle) return (activegroup ? SchemeFlexActMONO : SchemeFlexInaMONO); #endif // MONOCLE_LAYOUT - return SchemeNorm; + return SchemeTitleNorm; case GRP_HIDDEN: return SchemeHid; case GRP_FLOAT: return (activegroup ? SchemeFlexActFloat : SchemeFlexInaFloat); } - return SchemeNorm; + return SchemeTitleNorm; } int @@ -175,7 +175,7 @@ getselschemefor(int scheme) return scheme + SchemeFlexInaTTB - SchemeFlexActTTB; if (scheme >= SchemeFlexActTTB) return scheme + SchemeFlexSelTTB - SchemeFlexActTTB; - return SchemeSel; + return SchemeTitleSel; } void @@ -190,10 +190,8 @@ flextitledraw(Monitor *m, Client *c, int unused, int x, int w, int tabscheme, Ar ? getselschemefor(tabscheme) : HIDDEN(c) ? SchemeHid - #if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH : c->isurgent ? SchemeUrg - #endif : tabscheme )]); if (w <= TEXTW("A") - lrpad + pad) // reduce text padding if wintitle is too small diff --git a/patch/bar_powerline_tags.c b/patch/bar_powerline_tags.c index a85559b..20f9227 100644 --- a/patch/bar_powerline_tags.c +++ b/patch/bar_powerline_tags.c @@ -57,11 +57,7 @@ draw_pwrl_tags(Bar *bar, BarDrawArg *a) if (!(occ & 1 << i || bar->mon->tagset[bar->mon->seltags] & 1 << i)) continue; #endif // BAR_HIDEVACANTTAGS_PATCH - #if URGENTBORDER_PATCH invert = 0; - #else - invert = urg & 1 << i; - #endif // URGENTBORDER_PATCH w = TEXTW(tags[i]); drw_settrans(drw, prevscheme, (nxtscheme = scheme[bar->mon->tagset[bar->mon->seltags] & 1 << i ? SchemeSel : SchemeNorm])); #if BAR_POWERLINE_TAGS_SLASH_PATCH diff --git a/patch/bar_tabgroups.c b/patch/bar_tabgroups.c index 116ddc7..7036882 100644 --- a/patch/bar_tabgroups.c +++ b/patch/bar_tabgroups.c @@ -59,8 +59,8 @@ bartabdraw(Monitor *m, Client *c, int unused, int x, int w, int groupactive, Arg ? SchemeHid #endif : groupactive - ? SchemeTabActive - : SchemeTabInactive + ? SchemeTitleSel + : SchemeTitleNorm ]); drw_text(drw, x, 0, w, bh, lrpad / 2, c->name, 0); if (c->isfloating) diff --git a/patch/bar_taggrid.c b/patch/bar_taggrid.c index dd439f7..ebd07c1 100644 --- a/patch/bar_taggrid.c +++ b/patch/bar_taggrid.c @@ -20,11 +20,7 @@ draw_taggrid(Bar *bar, BarDrawArg *a) columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0); /* Firstly we will fill the borders of squares */ - #if BAR_VTCOLORS_PATCH XSetForeground(drw->dpy, drw->gc, scheme[SchemeTagsNorm][ColBg].pixel); - #else - XSetForeground(drw->dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel); - #endif // BAR_VTCOLORS_PATCH XFillRectangle(dpy, drw->drawable, drw->gc, x, y, h*columns + 1, bh); /* We will draw LENGTH(tags) squares in tagraws raws. */ @@ -35,33 +31,19 @@ draw_taggrid(Bar *bar, BarDrawArg *a) invert = bar->mon->tagset[bar->mon->seltags] & 1 << i ? 0 : 1; /* Select active color for current square */ - #if BAR_VTCOLORS_PATCH XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeTagsSel][ColBg].pixel : scheme[SchemeTagsNorm][ColFg].pixel); - #else - XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeSel][ColBg].pixel : - scheme[SchemeNorm][ColFg].pixel); - #endif // BAR_VTCOLORS_PATCH XFillRectangle(dpy, drw->drawable, drw->gc, x+1, y+1, h-1, h-1); /* Mark square if tag has client */ if (occ & 1 << i) { - #if BAR_VTCOLORS_PATCH XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeTagsSel][ColFg].pixel : scheme[SchemeTagsNorm][ColBg].pixel); - #else - XSetForeground(drw->dpy, drw->gc, !invert ? scheme[SchemeSel][ColFg].pixel : - scheme[SchemeNorm][ColBg].pixel); - #endif // BAR_VTCOLORS_PATCH XFillRectangle(dpy, drw->drawable, drw->gc, x + 1, y + 1, h / 2, h / 2); } } else { - #if BAR_VTCOLORS_PATCH XSetForeground(drw->dpy, drw->gc, scheme[SchemeTagsNorm][ColBg].pixel); - #else - XSetForeground(drw->dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel); - #endif // BAR_VTCOLORS_PATCH XFillRectangle(dpy, drw->drawable, drw->gc, x+1, y+1, h-1, h); } x += h; diff --git a/patch/bar_tags.c b/patch/bar_tags.c index 1d97acf..f122602 100644 --- a/patch/bar_tags.c +++ b/patch/bar_tags.c @@ -57,33 +57,18 @@ draw_tags(Bar *bar, BarDrawArg *a) if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) continue; #endif // BAR_HIDEVACANTTAGS_PATCH - #if URGENTBORDER_PATCH invert = 0; - #else - invert = urg & 1 << i; - #endif // URGENTBORDER_PATCH w = TEXTW(tags[i]); #if BAR_ALTERNATIVE_TAGS_PATCH wdelta = selmon->alttag ? abs(TEXTW(tags[i]) - TEXTW(tagsalt[i])) / 2 : 0; #endif // BAR_ALTERNATIVE_TAGS_PATCH - #if URGENTBORDER_PATCH - if (m->tagset[m->seltags] & 1 << i) - #if BAR_VTCOLORS_PATCH - drw_setscheme(drw, scheme[SchemeTagsSel]); - #else - drw_setscheme(drw, scheme[SchemeSel]); - #endif // BAR_VTCOLORS_PATCH - else - #if BAR_VTCOLORS_PATCH - drw_setscheme(drw, scheme[urg & 1 << i ? SchemeUrg : SchemeTagsNorm]); - #else - drw_setscheme(drw, scheme[urg & 1 << i ? SchemeUrg : SchemeNorm]); - #endif // BAR_VTCOLORS_PATCH - #elif BAR_VTCOLORS_PATCH - drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeTagsSel : SchemeTagsNorm]); - #else // URGENTBORDER_PATCH - drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); - #endif // URGENTBORDER_PATCH + drw_setscheme(drw, scheme[ + m->tagset[m->seltags] & 1 << i + ? SchemeTagsSel + : urg & 1 << i + ? SchemeUrg + : SchemeTagsNorm + ]); #if BAR_ALTERNATIVE_TAGS_PATCH && BAR_PANGO_PATCH drw_text(drw, x, 0, w, bh, wdelta + lrpad / 2, (selmon->alttag ? tagsalt[i] : tags[i]), invert, False); #elif BAR_ALTERNATIVE_TAGS_PATCH diff --git a/patch/bar_wintitle.c b/patch/bar_wintitle.c index 9db97c1..ca30138 100644 --- a/patch/bar_wintitle.c +++ b/patch/bar_wintitle.c @@ -24,13 +24,7 @@ draw_wintitle(Bar *bar, BarDrawArg *a) Monitor *m = bar->mon; if (m->sel) { - #if BAR_VTCOLORS_PATCH drw_setscheme(drw, scheme[m == selmon ? SchemeTitleSel : SchemeTitleNorm]); - #elif BAR_TITLECOLOR_PATCH - drw_setscheme(drw, scheme[m == selmon ? SchemeTitle : SchemeNorm]); - #else - drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); - #endif // BAR_VTCOLORS_PATCH / BAR_TITLECOLOR_PATCH #if BAR_IGNORE_XFT_ERRORS_WHEN_DRAWING_TEXT_PATCH XSetErrorHandler(xerrordummy); #endif // BAR_IGNORE_XFT_ERRORS_WHEN_DRAWING_TEXT_PATCH @@ -61,11 +55,7 @@ draw_wintitle(Bar *bar, BarDrawArg *a) drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); #endif // BAR_ACTIVETAGINDICATORBAR_PATCH } else { - #if BAR_VTCOLORS_PATCH drw_setscheme(drw, scheme[SchemeTitleNorm]); - #else - drw_setscheme(drw, scheme[SchemeNorm]); - #endif // BAR_VTCOLORS_PATCH drw_rect(drw, x, 0, w, bh, 1, 1); } return x + w; diff --git a/patch/xrdb.c b/patch/xrdb.c index f3bd38a..b1270d4 100644 --- a/patch/xrdb.c +++ b/patch/xrdb.c @@ -19,52 +19,70 @@ loadxrdb() XRDB_LOAD_COLOR("dwm.normfgcolor", normfgcolor); XRDB_LOAD_COLOR("dwm.normbgcolor", normbgcolor); XRDB_LOAD_COLOR("dwm.normbordercolor", normbordercolor); - #if FLOAT_BORDER_COLOR_PATCH XRDB_LOAD_COLOR("dwm.normfloatcolor", normfloatcolor); - #endif // FLOAT_BORDER_COLOR_PATCH - XRDB_LOAD_COLOR("dwm.selfgcolor", selfgcolor); XRDB_LOAD_COLOR("dwm.selbgcolor", selbgcolor); XRDB_LOAD_COLOR("dwm.selbordercolor", selbordercolor); - #if FLOAT_BORDER_COLOR_PATCH XRDB_LOAD_COLOR("dwm.selfloatcolor", selfloatcolor); - #endif // FLOAT_BORDER_COLOR_PATCH - - #if BAR_STATUSCOLORS_PATCH - XRDB_LOAD_COLOR("dwm.warnfgcolor", warnfgcolor); - XRDB_LOAD_COLOR("dwm.warnbgcolor", warnbgcolor); - XRDB_LOAD_COLOR("dwm.warnbordercolor", warnbordercolor); - #if FLOAT_BORDER_COLOR_PATCH - XRDB_LOAD_COLOR("dwm.warnfloatcolor", warnfloatcolor); - #endif // FLOAT_BORDER_COLOR_PATCH - #endif // BAR_STATUSCOLORS_PATCH - - #if URGENTBORDER_PATCH || BAR_STATUSCOLORS_PATCH - XRDB_LOAD_COLOR("dwm.urgfgcolor", urgfgcolor); - XRDB_LOAD_COLOR("dwm.urgbgcolor", urgbgcolor); - XRDB_LOAD_COLOR("dwm.urgbordercolor", urgbordercolor); - #if FLOAT_BORDER_COLOR_PATCH - XRDB_LOAD_COLOR("dwm.urgfloatcolor", urgfloatcolor); - #endif // FLOAT_BORDER_COLOR_PATCH - #endif // URGENTBORDER_PATCH - - #if AWESOMEBAR_PATCH + XRDB_LOAD_COLOR("dwm.titlenormfgcolor", titlenormfgcolor); + XRDB_LOAD_COLOR("dwm.titlenormbgcolor", titlenormbgcolor); + XRDB_LOAD_COLOR("dwm.titlenormbordercolor", titlenormbordercolor); + XRDB_LOAD_COLOR("dwm.titlenormfloatcolor", titlenormfloatcolor); + XRDB_LOAD_COLOR("dwm.titleselfgcolor", titleselfgcolor); + XRDB_LOAD_COLOR("dwm.titleselbgcolor", titleselbgcolor); + XRDB_LOAD_COLOR("dwm.titleselbordercolor", titleselbordercolor); + XRDB_LOAD_COLOR("dwm.titleselfloatcolor", titleselfloatcolor); + XRDB_LOAD_COLOR("dwm.tagsnormfgcolor", tagsnormfgcolor); + XRDB_LOAD_COLOR("dwm.tagsnormbgcolor", tagsnormbgcolor); + XRDB_LOAD_COLOR("dwm.tagsnormbordercolor", tagsnormbordercolor); + XRDB_LOAD_COLOR("dwm.tagsnormfloatcolor", tagsnormfloatcolor); + XRDB_LOAD_COLOR("dwm.tagsselfgcolor", tagsselfgcolor); + XRDB_LOAD_COLOR("dwm.tagsselbgcolor", tagsselbgcolor); + XRDB_LOAD_COLOR("dwm.tagsselbordercolor", tagsselbordercolor); + XRDB_LOAD_COLOR("dwm.tagsselfloatcolor", tagsselfloatcolor); XRDB_LOAD_COLOR("dwm.hidfgcolor", hidfgcolor); XRDB_LOAD_COLOR("dwm.hidbgcolor", hidbgcolor); XRDB_LOAD_COLOR("dwm.hidbordercolor", hidbordercolor); - #if FLOAT_BORDER_COLOR_PATCH XRDB_LOAD_COLOR("dwm.hidfloatcolor", hidfloatcolor); - #endif // FLOAT_BORDER_COLOR_PATCH - #endif // AWESOMEBAR_PATCH - - #if BAR_TITLECOLOR_PATCH - XRDB_LOAD_COLOR("dwm.titlefgcolor", titlefgcolor); - XRDB_LOAD_COLOR("dwm.titlebgcolor", titlebgcolor); - XRDB_LOAD_COLOR("dwm.titlebordercolor", titlebordercolor); - #if FLOAT_BORDER_COLOR_PATCH - XRDB_LOAD_COLOR("dwm.titlefloatcolor", titlefloatcolor); - #endif // FLOAT_BORDER_COLOR_PATCH - #endif // BAR_TITLECOLOR_PATCH + XRDB_LOAD_COLOR("dwm.urgfgcolor", urgfgcolor); + XRDB_LOAD_COLOR("dwm.urgbgcolor", urgbgcolor); + XRDB_LOAD_COLOR("dwm.urgbordercolor", urgbordercolor); + XRDB_LOAD_COLOR("dwm.urgfloatcolor", urgfloatcolor); + #if BAR_FLEXWINTITLE_PATCH + XRDB_LOAD_COLOR("dwm.normTTBbgcolor", normTTBbgcolor); + XRDB_LOAD_COLOR("dwm.normLTRbgcolor", normLTRbgcolor); + XRDB_LOAD_COLOR("dwm.normMONObgcolor", normMONObgcolor); + XRDB_LOAD_COLOR("dwm.normGRIDbgcolor", normGRIDbgcolor); + XRDB_LOAD_COLOR("dwm.normGRD1bgcolor", normGRD1bgcolor); + XRDB_LOAD_COLOR("dwm.normGRD2bgcolor", normGRD2bgcolor); + XRDB_LOAD_COLOR("dwm.normGRDMbgcolor", normGRDMbgcolor); + XRDB_LOAD_COLOR("dwm.normHGRDbgcolor", normHGRDbgcolor); + XRDB_LOAD_COLOR("dwm.normDWDLbgcolor", normDWDLbgcolor); + XRDB_LOAD_COLOR("dwm.normSPRLbgcolor", normSPRLbgcolor); + XRDB_LOAD_COLOR("dwm.normfloatbgcolor", normfloatbgcolor); + XRDB_LOAD_COLOR("dwm.actTTBbgcolor", actTTBbgcolor); + XRDB_LOAD_COLOR("dwm.actLTRbgcolor", actLTRbgcolor); + XRDB_LOAD_COLOR("dwm.actMONObgcolor", actMONObgcolor); + XRDB_LOAD_COLOR("dwm.actGRIDbgcolor", actGRIDbgcolor); + XRDB_LOAD_COLOR("dwm.actGRD1bgcolor", actGRD1bgcolor); + XRDB_LOAD_COLOR("dwm.actGRD2bgcolor", actGRD2bgcolor); + XRDB_LOAD_COLOR("dwm.actGRDMbgcolor", actGRDMbgcolor); + XRDB_LOAD_COLOR("dwm.actHGRDbgcolor", actHGRDbgcolor); + XRDB_LOAD_COLOR("dwm.actDWDLbgcolor", actDWDLbgcolor); + XRDB_LOAD_COLOR("dwm.actSPRLbgcolor", actSPRLbgcolor); + XRDB_LOAD_COLOR("dwm.actfloatbgcolor", actfloatbgcolor); + XRDB_LOAD_COLOR("dwm.selTTBbgcolor", selTTBbgcolor); + XRDB_LOAD_COLOR("dwm.selLTRbgcolor", selLTRbgcolor); + XRDB_LOAD_COLOR("dwm.selMONObgcolor", selMONObgcolor); + XRDB_LOAD_COLOR("dwm.selGRIDbgcolor", selGRIDbgcolor); + XRDB_LOAD_COLOR("dwm.selGRD1bgcolor", selGRD1bgcolor); + XRDB_LOAD_COLOR("dwm.selGRD2bgcolor", selGRD2bgcolor); + XRDB_LOAD_COLOR("dwm.selGRDMbgcolor", selGRDMbgcolor); + XRDB_LOAD_COLOR("dwm.selHGRDbgcolor", selHGRDbgcolor); + XRDB_LOAD_COLOR("dwm.selDWDLbgcolor", selDWDLbgcolor); + XRDB_LOAD_COLOR("dwm.selSPRLbgcolor", selSPRLbgcolor); + XRDB_LOAD_COLOR("dwm.selfloatbgcolor", selfloatbgcolor); + #endif // BAR_FLEXWINTITLE_PATCH } } } @@ -82,11 +100,7 @@ xrdb(const Arg *arg) #if BAR_ALPHA_PATCH alphas[i], #endif // BAR_ALPHA_PATCH - #if FLOAT_BORDER_COLOR_PATCH - 4 - #else - 3 - #endif // FLOAT_BORDER_COLOR_PATCH + ColCount ); focus(NULL); arrange(NULL); diff --git a/patches.def.h b/patches.def.h index 7adf567..5c0b096 100644 --- a/patches.def.h +++ b/patches.def.h @@ -263,11 +263,6 @@ */ #define BAR_STATUSPADDING_PATCH 0 -/* Adds a new color scheme used by the (selected) window title in the bar. - * https://dwm.suckless.org/patches/titlecolor/ - */ -#define BAR_TITLECOLOR_PATCH 0 - /* This patch adds the ability for dwm to read colors from the linux virtual console. * /sys/module/vt/parameters/default_{red,grn,blu} * Essentially this way the colors you use in your regular tty is "mirrored" to dwm. @@ -442,11 +437,6 @@ */ #define FAKEFULLSCREEN_CLIENT_PATCH 0 -/* This patch allows a different border color to be chosen for floating windows. - * https://dwm.suckless.org/patches/float_border_color/ - */ -#define FLOAT_BORDER_COLOR_PATCH 0 - /* This patch adds a float rule allowing the size and position of floating windows to be specified * It also allows the size and position of floating windows to be controlled similar to the * exresize, moveresize, and moveplace patches. @@ -900,11 +890,6 @@ */ #define UNFLOATVISIBLE_PATCH 0 -/* This patch makes "urgent" windows have different colors. - * https://dwm.suckless.org/patches/urgentborder/ - */ -#define URGENTBORDER_PATCH 0 - /* This patch adds configurable gaps between windows differentiating between outer, inner, * horizontal and vertical gaps. * https://github.com/bakkeby/patches/blob/master/dwm/dwm-vanitygaps-6.2.diff