commit 16ba7864ee292f3763184745dbb1769f1d6ab56b
parent 17e9b0a4bf577d8609e8e0ef3dacec80a10207f8
Author: FRIGN <dev@frign.de>
Date: Thu, 17 Sep 2015 21:03:29 +0200
st solarized - Rework page
Don't state obvious things and offer clean patches for each release.
Diffstat:
13 files changed, 458 insertions(+), 200 deletions(-)
diff --git a/st.suckless.org/patches/solarized.md b/st.suckless.org/patches/solarized.md
@@ -0,0 +1,53 @@
+Solarized
+=========
+
+Description
+-----------
+
+[Solarized](http://ethanschoonover.com/solarized) is a color scheme by
+Ethan Schoonover which exists in a dark and a light variant. These
+patches make the Solarized color scheme available for st.
+
+
+Notes
+-----
+
+Once applied, only the terminal colors are changed. For applications
+such as tmux or vim, you may need to
+[adjust the colors there as well](https://bbs.archlinux.org/viewtopic.php?id=164108).
+
+
+Example
+-------
+
+[](st-solarized-light.png)
+[](st-solarized-dark.png)
+
+The font used is Source Code Pro.
+
+Download
+--------
+
+To get correct colors, you first need to apply the following patch
+to disable lighting up bold colors.
+
+ * [st-0.5-no-bold-colors.diff](st-0.5-no-bold-colors.diff)
+ * [st-0.6-no-bold-colors.diff](st-0.6-no-bold-colors.diff)
+ * [st-git-20150917-no-bold-colors.diff](st-git-20150917-no-bold-colors.diff)
+
+Choose one of the following patches to get either the light
+or the dark color scheme:
+
+ * [st-0.5-solarized-light.diff](st-0.5-solarized-light.diff)
+ * [st-0.6-solarized-light.diff](st-0.6-solarized-light.diff)
+ * [st-git-20150917-solarized-light.diff](st-git-20150917-solarized-light.diff)
+
+ * [st-0.5-solarized-dark.diff](st-0.5-solarized-dark.diff)
+ * [st-0.6-solarized-dark.diff](st-0.6-solarized-dark.diff)
+ * [st-git-20150917-solarized-dark.diff](st-git-20150917-solarized-dark.diff)
+
+Authors
+-------
+
+ * Nils Reuße - nilsreusse@gmail.com
+ * Laslo Hunhold - dev@frign.de (st-0.5, st-0.6, st-git-20150917 ports)
diff --git a/st.suckless.org/patches/solarized_color_scheme.md b/st.suckless.org/patches/solarized_color_scheme.md
@@ -1,58 +0,0 @@
-Solarized color scheme
-======================
-
-Description
------------
-
-[Solarized][1] is a color scheme by Ethan Schoonover which exists in a
-dark and a light variant. These patches make the solarized colors
-available on st.
-
-
-Notes
------
-
-No matter if you choose the light or dark theme, to get the correct
-colors, you *always* have to apply the [patch to st.c][8] (if you're
-using the latest git version of st, use [this patch to st.c][3]). Then,
-apply one of the patches for either the [light][4] or the [dark][5]
-version of solarized.
-
-These patches apply to the latest git of st, but should apply to older
-versions as well.
-
-Once applied, only the terminal colors are changed. For applications
-such as tmux or vim, you may need to adjust the colors there as well.
-You find more information in my [thread][2] at the arch linux forums.
-
-
-Example
--------
-
-[](st-solarized-light.png)
-[](st-solarized-dark.png)
-
-The font is [Source Code Pro][6].
-
-Download
---------
-
- * [st-0.5-no-bold-colors.diff][7]
- * [st-0.6-no-bold-colors.diff][8]
- * [st-no-bold-colors.diff][3]
- * [st-solarized-light.diff][4]
- * [st-solarized-dark.diff][5]
-
-[1]: http://ethanschoonover.com/solarized
-[2]: https://bbs.archlinux.org/viewtopic.php?id=164108
-[3]: st-no-bold-colors.diff
-[4]: st-solarized-light.diff
-[5]: st-solarized-dark.diff
-[6]: http://en.wikipedia.org/wiki/Source_Code_Pro
-[7]: st-0.5-no-bold-colors.diff
-[8]: st-0.6-no-bold-colors.diff
-
-Author
-------
-
- * Nils Reuße - nilsreusse @ gmail
diff --git a/st.suckless.org/patches/st-0.5-no-bold-colors.diff b/st.suckless.org/patches/st-0.5-no-bold-colors.diff
@@ -1,7 +1,8 @@
diff --git a/st.c b/st.c
+index 392f12d..f893147 100644
--- a/st.c
+++ b/st.c
-@@ -3203,7 +3203,7 @@
+@@ -3152,7 +3152,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
if(base.mode & ATTR_BOLD) {
if(BETWEEN(base.fg, 0, 7)) {
/* basic system colors */
diff --git a/st.suckless.org/patches/st-0.5-solarized-dark.diff b/st.suckless.org/patches/st-0.5-solarized-dark.diff
@@ -0,0 +1,65 @@
+diff --git a/config.def.h b/config.def.h
+index 58b470e..f1c5ed1 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -51,30 +51,23 @@ static 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",
++ /* 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 */
+ };
+
+
+@@ -82,9 +75,9 @@ static const char *colorname[] = {
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+-static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
++static unsigned int defaultfg = 12;
++static unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
+
+ /*
+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
diff --git a/st.suckless.org/patches/st-0.5-solarized-light.diff b/st.suckless.org/patches/st-0.5-solarized-light.diff
@@ -0,0 +1,65 @@
+diff --git a/config.def.h b/config.def.h
+index 58b470e..ec39cca 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -51,30 +51,23 @@ static 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",
++ /* solarized light */
++ "#eee8d5", /* 0: black */
++ "#dc322f", /* 1: red */
++ "#859900", /* 2: green */
++ "#b58900", /* 3: yellow */
++ "#268bd2", /* 4: blue */
++ "#d33682", /* 5: magenta */
++ "#2aa198", /* 6: cyan */
++ "#073642", /* 7: white */
++ "#fdf6e3", /* 8: brblack */
++ "#cb4b16", /* 9: brred */
++ "#93a1a1", /* 10: brgreen */
++ "#839496", /* 11: bryellow */
++ "#657b83", /* 12: brblue */
++ "#6c71c4", /* 13: brmagenta*/
++ "#586e75", /* 14: brcyan */
++ "#002b36", /* 15: brwhite */
+ };
+
+
+@@ -82,9 +75,9 @@ static const char *colorname[] = {
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+-static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
++static unsigned int defaultfg = 12;
++static unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
+
+ /*
+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
diff --git a/st.suckless.org/patches/st-0.6-solarized-dark.diff b/st.suckless.org/patches/st-0.6-solarized-dark.diff
@@ -0,0 +1,65 @@
+diff --git a/config.def.h b/config.def.h
+index 64e75b8..bc8d298 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -61,30 +61,23 @@ static 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",
++ /* 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 */
+ };
+
+
+@@ -92,9 +85,9 @@ static const char *colorname[] = {
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+-static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
++static unsigned int defaultfg = 12;
++static unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
+
+ /*
+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
diff --git a/st.suckless.org/patches/st-0.6-solarized-light.diff b/st.suckless.org/patches/st-0.6-solarized-light.diff
@@ -0,0 +1,65 @@
+diff --git a/config.def.h b/config.def.h
+index 64e75b8..fba47b1 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -61,30 +61,23 @@ static 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",
++ /* solarized light */
++ "#eee8d5", /* 0: black */
++ "#dc322f", /* 1: red */
++ "#859900", /* 2: green */
++ "#b58900", /* 3: yellow */
++ "#268bd2", /* 4: blue */
++ "#d33682", /* 5: magenta */
++ "#2aa198", /* 6: cyan */
++ "#073642", /* 7: white */
++ "#fdf6e3", /* 8: brblack */
++ "#cb4b16", /* 9: brred */
++ "#93a1a1", /* 10: brgreen */
++ "#839496", /* 11: bryellow */
++ "#657b83", /* 12: brblue */
++ "#6c71c4", /* 13: brmagenta*/
++ "#586e75", /* 14: brcyan */
++ "#002b36", /* 15: brwhite */
+ };
+
+
+@@ -92,9 +85,9 @@ static const char *colorname[] = {
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+-static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
++static unsigned int defaultfg = 12;
++static unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
+
+ /*
+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
diff --git a/st.suckless.org/patches/st-git-20150917-no-bold-colors.diff b/st.suckless.org/patches/st-git-20150917-no-bold-colors.diff
@@ -0,0 +1,13 @@
+diff --git a/st.c b/st.c
+index bd8b815..ae5a7ba 100644
+--- a/st.c
++++ b/st.c
+@@ -3724,7 +3724,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]) {
diff --git a/st.suckless.org/patches/st-git-20150917-solarized-dark.diff b/st.suckless.org/patches/st-git-20150917-solarized-dark.diff
@@ -0,0 +1,65 @@
+diff --git a/config.def.h b/config.def.h
+index b6adc5e..9dc0faa 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -70,30 +70,23 @@ static 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",
++ /* 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 */
+ };
+
+
+@@ -101,9 +94,9 @@ static const char *colorname[] = {
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+-static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
++static unsigned int defaultfg = 12;
++static unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
+
+ /*
+ * Default shape of cursor
diff --git a/st.suckless.org/patches/st-git-20150917-solarized-light.diff b/st.suckless.org/patches/st-git-20150917-solarized-light.diff
@@ -0,0 +1,65 @@
+diff --git a/config.def.h b/config.def.h
+index b6adc5e..69dbf07 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -70,30 +70,23 @@ static 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",
++ /* solarized light */
++ "#eee8d5", /* 0: black */
++ "#dc322f", /* 1: red */
++ "#859900", /* 2: green */
++ "#b58900", /* 3: yellow */
++ "#268bd2", /* 4: blue */
++ "#d33682", /* 5: magenta */
++ "#2aa198", /* 6: cyan */
++ "#073642", /* 7: white */
++ "#fdf6e3", /* 8: brblack */
++ "#cb4b16", /* 9: brred */
++ "#93a1a1", /* 10: brgreen */
++ "#839496", /* 11: bryellow */
++ "#657b83", /* 12: brblue */
++ "#6c71c4", /* 13: brmagenta*/
++ "#586e75", /* 14: brcyan */
++ "#002b36", /* 15: brwhite */
+ };
+
+
+@@ -101,9 +94,9 @@ static const char *colorname[] = {
+ * Default colors (colorname index)
+ * foreground, background, cursor
+ */
+-static unsigned int defaultfg = 7;
+-static unsigned int defaultbg = 0;
+-static unsigned int defaultcs = 256;
++static unsigned int defaultfg = 12;
++static unsigned int defaultbg = 8;
++static unsigned int defaultcs = 14;
+
+ /*
+ * Default shape of cursor
diff --git a/st.suckless.org/patches/st-no-bold-colors.diff b/st.suckless.org/patches/st-no-bold-colors.diff
@@ -1,13 +0,0 @@
-diff --git a/st.c b/st.c
-index 64e2cec..13ceadc 100644
---- a/st.c
-+++ b/st.c
-@@ -3680,7 +3680,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]) {
diff --git a/st.suckless.org/patches/st-solarized-dark.diff b/st.suckless.org/patches/st-solarized-dark.diff
@@ -1,64 +0,0 @@
-diff --git a/config.def.h b/config.def.h
---- a/config.def.h
-+++ b/config.def.h
-@@ -51,30 +51,23 @@
-
- /* 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",
-+ /* 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 */
- };
-
-
-@@ -82,9 +75,9 @@
- * Default colors (colorname index)
- * foreground, background, cursor
- */
--static unsigned int defaultfg = 7;
--static unsigned int defaultbg = 0;
--static unsigned int defaultcs = 256;
-+static unsigned int defaultfg = 12;
-+static unsigned int defaultbg = 8;
-+static unsigned int defaultcs = 14;
-
- /*
- * Colors used, when the specific fg == defaultfg. So in reverse mode this
diff --git a/st.suckless.org/patches/st-solarized-light.diff b/st.suckless.org/patches/st-solarized-light.diff
@@ -1,64 +0,0 @@
-diff --git a/config.def.h b/config.def.h
---- a/config.def.h
-+++ b/config.def.h
-@@ -51,30 +51,23 @@
-
- /* 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",
-+ /* solarized light */
-+ "#eee8d5", /* 0: black */
-+ "#dc322f", /* 1: red */
-+ "#859900", /* 2: green */
-+ "#b58900", /* 3: yellow */
-+ "#268bd2", /* 4: blue */
-+ "#d33682", /* 5: magenta */
-+ "#2aa198", /* 6: cyan */
-+ "#073642", /* 7: white */
-+ "#fdf6e3", /* 8: brblack */
-+ "#cb4b16", /* 9: brred */
-+ "#93a1a1", /* 10: brgreen */
-+ "#839496", /* 11: bryellow */
-+ "#657b83", /* 12: brblue */
-+ "#6c71c4", /* 13: brmagenta*/
-+ "#586e75", /* 14: brcyan */
-+ "#002b36", /* 15: brwhite */
- };
-
-
-@@ -82,9 +75,9 @@
- * Default colors (colorname index)
- * foreground, background, cursor
- */
--static unsigned int defaultfg = 7;
--static unsigned int defaultbg = 0;
--static unsigned int defaultcs = 256;
-+static unsigned int defaultfg = 12;
-+static unsigned int defaultbg = 8;
-+static unsigned int defaultcs = 14;
-
- /*
- * Colors used, when the specific fg == defaultfg. So in reverse mode this
