added colorful tags patch

1 year ago · b3c95692aa
parent 954e60b735
commit b3c95692aa
6 changed files with 108 additions and 4 deletions
--- a/config.def.h
+++ b/config.def.h
@ -213,6 +213,29 @@ static char scratchnormbgcolor[]         = "#664C67";
 static char scratchnormbordercolor[]     = "#77547E";
 static char scratchnormfloatcolor[]      = "#77547E";
 #endif // RENAMED_SCRATCHPADS_PATCH
+// COLORFULTAGS_PATCH
+#if BAR_COLORFULTAGS_PATCH
+static char tag1fgcolor[] = "#f92672";
+static char tag1bgcolor[] = "#272822";
+static char tag2fgcolor[] = "#a6e22e";
+static char tag2bgcolor[] = "#272822";
+static char tag3fgcolor[] = "#f4bf75";
+static char tag3bgcolor[] = "#272822";
+static char tag4fgcolor[] = "#66d9ef";
+static char tag4bgcolor[] = "#272822";
+static char tag5fgcolor[] = "#ae81ff";
+static char tag5bgcolor[] = "#272822";
+static char tag6fgcolor[] = "#f8f8f2";
+static char tag6bgcolor[] = "#272822";
+static char tag7fgcolor[] = "#75715e";
+static char tag7bgcolor[] = "#272822";
+static char tag8fgcolor[] = "#f4bf75";
+static char tag8bgcolor[] = "#272822";
+static char tag9fgcolor[] = "#a1efe4";
+static char tag9bgcolor[] = "#272822";
+static char layoutfgcolor[] = "#ae81ff";
+static char layoutbgcolor[] = "#272822";
+#endif

 #if BAR_FLEXWINTITLE_PATCH
 static char normTTBbgcolor[]             = "#330000";
@ -268,6 +291,20 @@ static const unsigned int alphas[][3] = {
 	[SchemeScratchSel]  = { OPAQUE, baralpha, borderalpha },
 	[SchemeScratchNorm] = { OPAQUE, baralpha, borderalpha },
 	#endif // RENAMED_SCRATCHPADS_PATCH
+
+  #if BAR_COLORFULTAGS_PATCH
+	[SchemeTag1]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag2]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag3]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag4]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag5]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag6]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag7]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag8]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeTag9]         = { OPAQUE, baralpha, borderalpha},
+	[SchemeLayout]       = { OPAQUE, baralpha, borderalpha},
+	#endif // BAR_COLORFULTAGS_PATCH
+
 	#if BAR_FLEXWINTITLE_PATCH
 	[SchemeFlexActTTB]   = { OPAQUE, baralpha, borderalpha },
 	[SchemeFlexActLTR]   = { OPAQUE, baralpha, borderalpha },
@ -337,6 +374,20 @@ static char *colors[][ColCount] = {
 	[SchemeScratchSel]  = { scratchselfgcolor, scratchselbgcolor, scratchselbordercolor, scratchselfloatcolor },
 	[SchemeScratchNorm] = { scratchnormfgcolor, scratchnormbgcolor, scratchnormbordercolor, scratchnormfloatcolor },
 	#endif // RENAMED_SCRATCHPADS_PATCH
+
+  #if BAR_COLORFULTAGS_PATCH
+	[SchemeTag1]         = { tag1fgcolor,      tag1bgcolor,      c000000 },
+	[SchemeTag2]         = { tag2fgcolor,      tag2bgcolor,      c000000 },
+	[SchemeTag3]         = { tag3fgcolor,      tag3bgcolor,	     c000000 },
+	[SchemeTag4]         = { tag4fgcolor,      tag4bgcolor,	     c000000 },
+	[SchemeTag5]         = { tag5fgcolor,      tag5bgcolor,      c000000 },
+	[SchemeTag6]         = { tag6fgcolor,      tag6bgcolor,      c000000 },
+	[SchemeTag7]         = { tag7fgcolor,      tag7bgcolor,      c000000 },
+	[SchemeTag8]         = { tag8fgcolor,      tag8bgcolor,      c000000 },
+	[SchemeTag9]         = { tag9fgcolor,      tag9bgcolor,      c000000 },
+	[SchemeLayout]       = { layoutfgcolor,    layoutbgcolor,    c000000 },
+	#endif // BAR_COLORFULTAGS_PATCH
+
 	#if BAR_FLEXWINTITLE_PATCH
 	[SchemeFlexActTTB]   = { titleselfgcolor,  actTTBbgcolor,    actTTBbgcolor,        c000000 },
 	[SchemeFlexActLTR]   = { titleselfgcolor,  actLTRbgcolor,    actLTRbgcolor,        c000000 },
--- a/dwm.c
+++ b/dwm.c
@ -153,6 +153,20 @@ enum {
 	SchemeScratchSel,
 	SchemeScratchNorm,
 	#endif // RENAMED_SCRATCHPADS_PATCH
+
+  #if BAR_COLORFULTAGS_PATCH
+	SchemeTag1,
+	SchemeTag2,
+	SchemeTag3,
+	SchemeTag4,
+	SchemeTag5,
+	SchemeTag6,
+	SchemeTag7,
+	SchemeTag8,
+	SchemeTag9,
+	SchemeLayout,
+	#endif // BAR_COLORFULTAGS_PATCH
+
 	#if BAR_FLEXWINTITLE_PATCH
 	SchemeFlexActTTB,
 	SchemeFlexActLTR,
--- a/patch/bar_ltsymbol.c
+++ b/patch/bar_ltsymbol.c
@ -7,6 +7,9 @@ width_ltsymbol(Bar *bar, BarArg *a)
 int
 draw_ltsymbol(Bar *bar, BarArg *a)
 {
+  #if BAR_COLORFULTAGS_PATCH
+	drw_setscheme(drw, scheme[SchemeLayout]);
+	#endif // BAR_COLORFULTAGS_PATCH
 	return drw_text(drw, a->x, a->y, a->w, a->h, lrpad / 2, bar->mon->ltsymbol, 0, False);
 }

--- a/patch/bar_tags.c
+++ b/patch/bar_tags.c
@ -49,12 +49,16 @@ draw_tags(Bar *bar, BarArg *a)
 		invert = 0;
 		w = TEXTW(icon);
 		drw_setscheme(drw, scheme[
+      #if BAR_COLORFULTAGS_PATCH
+			(occ | m->tagset[m->seltags]) & 1 << i
+			? SchemeTag1 + i
+			: SchemeTagsNorm
+			#else
 			m->tagset[m->seltags] & 1 << i
 			? SchemeTagsSel
-			: urg & 1 << i
-			? SchemeUrg
-			: SchemeTagsNorm
-		]);
+      : (urg & 1 << i ? SchemeUrg : SchemeTagsNorm)
+			#endif // BAR_COLORFULTAGS_PATCH
+    ]);
 		drw_text(drw, x, a->y, w, a->h, lrpad / 2, icon, invert, False);
 		drawindicator(m, NULL, occ, x, a->y, w, a->h, i, -1, invert, tagindicatortype);
 		#if BAR_UNDERLINETAGS_PATCH
--- a/patch/xrdb.c
+++ b/patch/xrdb.c
@ -58,6 +58,31 @@ loadxrdb()
 				XRDB_LOAD_COLOR("dwm.scratchnormbordercolor", scratchnormbordercolor);
 				XRDB_LOAD_COLOR("dwm.scratchnormfloatcolor", scratchnormfloatcolor);
 				#endif // RENAMED_SCRATCHPADS_PATCH
+
+        #if BAR_COLORFULTAGS_PATCH
+				XRDB_LOAD_COLOR("dwm.tags.fg1", tag1fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg1", tag1bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg2", tag2fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg2", tag2bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg3", tag3fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg3", tag3bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg4", tag4fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg4", tag4bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg5", tag5fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg5", tag5bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg6", tag6fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg6", tag6bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg7", tag7fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg7", tag7bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg8", tag8fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg8", tag8bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.fg9", tag9fgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.bg9", tag9bgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.layoutfg", layoutfgcolor);
+				XRDB_LOAD_COLOR("dwm.tags.layoutbg", layoutbgcolor);
+				#endif // BAR_COLORFULTAGS_PATCH
+
+
 				#if BAR_FLEXWINTITLE_PATCH
 				XRDB_LOAD_COLOR("dwm.normTTBbgcolor", normTTBbgcolor);
 				XRDB_LOAD_COLOR("dwm.normLTRbgcolor", normLTRbgcolor);
--- a/patches.def.h
+++ b/patches.def.h
@ -326,6 +326,13 @@
 * https://github.com/bakkeby/dwm-flexipatch/issues/50 (_IS_FLOATING patch)
 * https://dwm.suckless.org/patches/ewmhtags/
 */
+
+/* Allow configuration of colors for each tag. Looks good with the underline patch.
+ * https://github.com/fitrh/dwm/issues/1
+ */
+#define BAR_COLORFULTAGS_PATCH 0
+
+
 #define BAR_EWMHTAGS_PATCH 0

 /* Allows the bar height to be explicitly set rather than being derived from font.