commit 15e48815ea14e3574ebc9673de32fb7139b11c25
Author: Joachim Büchel <[email protected]>
Date: Sun Jun 7 13:51:29 2020 +0200
[st][patch][solarized] add patch for swap version for 0.8.3
The last patch of the swap version couldn't be applied on top of 0.8.3.
Also there was a bug messing up colours in some terminal applications.
diff --git a/st.suckless.org/patches/solarized/index.md
b/st.suckless.org/patches/solarized/index.md
index a7013b2e..16d01fbc 100644
--- a/st.suckless.org/patches/solarized/index.md
+++ b/st.suckless.org/patches/solarized/index.md
@@ -56,6 +56,7 @@ or the dark color scheme:
* [st-solarized-both-0.8.1.diff](st-solarized-both-0.8.1.diff)
*
[st-solarized-both-20170626-b331da5.diff](st-solarized-both-20170626-b331da5.diff)
*
[st-solarized-both-20190128-3be4cf1.diff](st-solarized-both-20190128-3be4cf1.diff)
+* [st-solarized-both-0.8.3.diff](st-solarized-both-0.8.3.diff)
Authors
-------
@@ -68,3 +69,4 @@ Authors
* Linh Nguyen - <[email protected]> (0.8.1 port for no\_bold\_colors and
swap versions)
* Varun Iyer - <[email protected]> (20190129 port for swap version)
* Paschalis Bizopoulos (20190306 port for light version)
+* Joachim Büchel - <[email protected]> (0.8.3 port for swap version)
diff --git a/st.suckless.org/patches/solarized/st-solarized-both-0.8.3.diff
b/st.suckless.org/patches/solarized/st-solarized-both-0.8.3.diff
new file mode 100644
index 00000000..a17e3687
--- /dev/null
+++ b/st.suckless.org/patches/solarized/st-solarized-both-0.8.3.diff
@@ -0,0 +1,208 @@
+From a5a82d6a2efa04415043b7ea8eff16d90d5bf86a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joachim=20B=C3=BCchel?= <[email protected]>
+Date: Sun, 7 Jun 2020 13:22:18 +0200
+Subject: [PATCH] Solarized light and dark theme
+
+Port st-solarized-both to 0.8.3
+---
+ config.def.h | 72 +++++++++++++++++++++++++++++++---------------------
+ st.h | 1 +
+ x.c | 26 +++++++++++++++----
+ 3 files changed, 65 insertions(+), 34 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 8a58f1c..1010a4f 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -86,31 +86,44 @@ 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 */
++};
++
++/* Terminal colors for alternate (light) palette */
++static const char *altcolorname[] = {
++ /* 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 */
+ };
+
+
+@@ -118,10 +131,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
+@@ -185,6 +198,7 @@ static Shortcut shortcuts[] = {
+ { TERMMOD, XK_Y, selpaste, {.i = 0} },
+ { ShiftMask, XK_Insert, selpaste, {.i = 0} },
+ { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
++ { XK_ANY_MOD, XK_F6, swapcolors, {.i = 0} },
+ };
+
+ /*
+diff --git a/st.h b/st.h
+index d978458..606c302 100644
+--- a/st.h
++++ b/st.h
+@@ -119,6 +119,7 @@ extern char *vtiden;
+ extern wchar_t *worddelimiters;
+ extern int allowaltscreen;
+ extern char *termname;
++extern int usealtcolors;
+ extern unsigned int tabspaces;
+ extern unsigned int defaultfg;
+ extern unsigned int defaultbg;
+diff --git a/x.c b/x.c
+index 22c7dfc..5598fb6 100644
+--- a/x.c
++++ b/x.c
+@@ -55,6 +55,7 @@ static void clipcopy(const Arg *);
+ static void clippaste(const Arg *);
+ static void numlock(const Arg *);
+ static void selpaste(const Arg *);
++static void swapcolors(const Arg *);
+ static void zoom(const Arg *);
+ static void zoomabs(const Arg *);
+ static void zoomreset(const Arg *);
+@@ -254,6 +255,8 @@ static char *opt_title = NULL;
+
+ static int oldbutton = 3; /* button event on startup: 3 = release */
+
++int usealtcolors = 0; /* 1 to use alternate palette */
++
+ void
+ clipcopy(const Arg *dummy)
+ {
+@@ -292,6 +295,14 @@ numlock(const Arg *dummy)
+ win.mode ^= MODE_NUMLOCK;
+ }
+
++void
++swapcolors(const Arg *dummy)
++{
++ usealtcolors = !usealtcolors;
++ xloadcols();
++ redraw();
++}
++
+ void
+ zoom(const Arg *arg)
+ {
+@@ -748,6 +759,11 @@ sixd_to_16bit(int x)
+ return x == 0 ? 0 : 0x3737 + 0x2828 * x;
+ }
+
++const char* getcolorname(int i)
++{
++ return (usealtcolors) ? altcolorname[i] : colorname[i];
++}
++
+ int
+ xloadcolor(int i, const char *name, Color *ncolor)
+ {
+@@ -766,7 +782,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
+ return XftColorAllocValue(xw.dpy, xw.vis,
+ xw.cmap, &color, ncolor);
+ } else
+- name = colorname[i];
++ name = getcolorname(i);
+ }
+
+ return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
+@@ -789,8 +805,8 @@ xloadcols(void)
+
+ for (i = 0; i < dc.collen; i++)
+ if (!xloadcolor(i, NULL, &dc.col[i])) {
+- if (colorname[i])
+- die("could not allocate color '%s'
", colorname[i]);
++ if (getcolorname(i))
++ die("could not allocate color '%s'
", getcolorname(i));
+ else
+ die("could not allocate color %d
", i);
+ }
+@@ -1169,13 +1185,13 @@ xinit(int cols, int rows)
+ cursor = XCreateFontCursor(xw.dpy, mouseshape);
+ XDefineCursor(xw.dpy, xw.win, cursor);
+
+- if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
++ if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousefg), &xmousefg) ==
0) {
+ xmousefg.red = 0xffff;
+ xmousefg.green = 0xffff;
+ xmousefg.blue = 0xffff;
+ }
+
+- if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
++ if (XParseColor(xw.dpy, xw.cmap, getcolorname(mousebg), &xmousebg) ==
0) {
+ xmousebg.red = 0x0000;
+ xmousebg.green = 0x0000;
+ xmousebg.blue = 0x0000;
+--
+2.27.0
+
