alpha/font/solarized

config.def.h

@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
+static char *font = "Cascadia Code:size=12:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -87,31 +87,23 @@ float alpha = 0.8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-	/* 8 normal colors */
+	/* solarized dark */
-	"black",
+	"#073642",  /*  0: black    */
-	"red3",
+	"#dc322f",  /*  1: red      */
-	"green3",
+	"#859900",  /*  2: green    */
-	"yellow3",
+	"#b58900",  /*  3: yellow   */
-	"blue2",
+	"#268bd2",  /*  4: blue     */
-	"magenta3",
+	"#d33682",  /*  5: magenta  */
-	"cyan3",
+	"#2aa198",  /*  6: cyan     */
-	"gray90",
+	"#eee8d5",  /*  7: white    */
-
+	"#002b36",  /*  8: brblack  */
-	/* 8 bright colors */
+	"#cb4b16",  /*  9: brred    */
-	"gray50",
+	"#586e75",  /* 10: brgreen  */
-	"red",
+	"#657b83",  /* 11: bryellow */
-	"green",
+	"#839496",  /* 12: brblue   */
-	"yellow",
+	"#6c71c4",  /* 13: brmagenta*/
-	"#5c5cff",
+	"#93a1a1",  /* 14: brcyan   */
-	"magenta",
+	"#fdf6e3",  /* 15: brwhite  */
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
 	"black",
 };
 
@@ -120,10 +112,10 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 7;
+unsigned int defaultfg = 12;
 unsigned int defaultbg = 258;
-static unsigned int defaultcs = 256;
+static unsigned int defaultcs = 14;
-static unsigned int defaultrcs = 257;
+static unsigned int defaultrcs = 15;
 
 /*
  * Default shape of cursor

patches/st-no_bold_colors-20170623-b331da5.diff

@@ -0,0 +1,13 @@
+diff --git a/x.c b/x.c
+index fbfd350..110f3cc 100644
+--- a/x.c
++++ b/x.c
+@@ -1158,7 +1158,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+ 
+ 	/* Change basic system colors [0-7] to bright system colors [8-15] */
+ 	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
+-		fg = &dc.col[base.fg + 8];
++		fg = &dc.col[base.fg];
+ 
+ 	if (IS_SET(MODE_REVERSE)) {
+ 		if (fg == &dc.col[defaultfg]) {

patches/st-solarized-dark-20180411-041912a.diff

@@ -0,0 +1,68 @@
+diff --git a/config.def.h b/config.def.h
+index 82b1b09..6065bb6 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -84,31 +84,23 @@ unsigned int tabspaces = 8;
+ 
+ /* Terminal colors (16 first used in escape sequence) */
+ static const char *colorname[] = {
+-	/* 8 normal colors */
+-	"black",
+-	"red3",
+-	"green3",
+-	"yellow3",
+-	"blue2",
+-	"magenta3",
+-	"cyan3",
+-	"gray90",
+-
+-	/* 8 bright colors */
+-	"gray50",
+-	"red",
+-	"green",
+-	"yellow",
+-	"#5c5cff",
+-	"magenta",
+-	"cyan",
+-	"white",
+-
+-	[255] = 0,
+-
+-	/* more colors can be added after 255 to use with DefaultXX */
+-	"#cccccc",
+-	"#555555",
++	/* solarized dark */
++	"#073642",  /*  0: black    */
++	"#dc322f",  /*  1: red      */
++	"#859900",  /*  2: green    */
++	"#b58900",  /*  3: yellow   */
++	"#268bd2",  /*  4: blue     */
++	"#d33682",  /*  5: magenta  */
++	"#2aa198",  /*  6: cyan     */
++	"#eee8d5",  /*  7: white    */
++	"#002b36",  /*  8: brblack  */
++	"#cb4b16",  /*  9: brred    */
++	"#586e75",  /* 10: brgreen  */
++	"#657b83",  /* 11: bryellow */
++	"#839496",  /* 12: brblue   */
++	"#6c71c4",  /* 13: brmagenta*/
++	"#93a1a1",  /* 14: brcyan   */
++	"#fdf6e3",  /* 15: brwhite  */
+ };
+ 
+ 
+@@ -116,10 +108,10 @@ static const char *colorname[] = {
+  * Default colors (colorname index)
+  * foreground, background, cursor, reverse cursor
+  */
+-unsigned int defaultfg = 7;
+-unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
+-static unsigned int defaultrcs = 257;
++unsigned int defaultfg = 12;
++unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
++static unsigned int defaultrcs = 15;
+ 
+ /*
+  * Default shape of cursor

x.c

@@ -1385,7 +1385,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 
 	/* Change basic system colors [0-7] to bright system colors [8-15] */
 	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
-		fg = &dc.col[base.fg + 8];
+		fg = &dc.col[base.fg];
 
 	if (IS_SET(MODE_REVERSE)) {
 		if (fg == &dc.col[defaultfg]) {