[wiki] [sites] Updated outdated solarized-both patch to latest git edition, added my credits || =

From: <git_AT_suckless.org>
Date: Mon, 26 Jun 2017 18:36:37 +0200

commit 43c8ef6b4ecd55759e123c7fb72f4dacf21b80d4
Author: = <harry.gindi_AT_live.com>
Date: Mon Jun 26 12:35:34 2017 -0400

    Updated outdated solarized-both patch to latest git edition, added my credits

diff --git a/st.suckless.org/patches/solarized.md b/st.suckless.org/patches/solarized.md
index 44eeb07..f71ab18 100644
--- a/st.suckless.org/patches/solarized.md
+++ b/st.suckless.org/patches/solarized.md
_AT_@ -53,14 +53,13 @@ or the dark color scheme:
 
 *Both (swap between light/dark with F6)*:
 
- * [st-solarized-both-20160727-308bfbf.diff](st-solarized-both-20160727-308bfbf.diff)
- * [st-solarized-both-20160727-745c40f.diff](st-solarized-both-20160727-745c40f.diff)
+ * [st-solarized-both-20170626-b331da5.diff](st-solarized-both-20170626-b331da5.diff)
 
 
 Authors
 -------
-
  * Nils Reuße - <nilsreusse_AT_gmail.com>
- * Laslo Hunhold - <dev_AT_frign.de> (0.5, 0.6, git ports)
+ * Laslo Hunhold - <dev_AT_frign.de> (0.5, 0.6)
  * Ryan Roden-Corrent - <ryan_AT_rcorre.net> (both)
- * Marcel Krüger - <zauguin_AT_gmail.com> (both git port)
+ * Marcel Krüger - <zauguin_AT_gmail.com> (oudated git ports)
+ * Harry Gindi - <harry.gindi_AT_live.com> (git ports for light, dark, and swap versions)
diff --git a/st.suckless.org/patches/st-solarized-both-20160727-308bfbf.diff b/st.suckless.org/patches/st-solarized-both-20160727-308bfbf.diff
deleted file mode 100644
index c966579..0000000
--- a/st.suckless.org/patches/st-solarized-both-20160727-308bfbf.diff
+++ /dev/null
_AT_@ -1,189 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index b41747f..adaa9b8 100644
---- a/config.def.h
-+++ b/config.def.h
-_AT_@ -84,42 +84,54 @@ 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",
--	"#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  */
-+};
- 
- /*
-  * Default colors (colorname index)
-  * foreground, background, cursor, reverse cursor
-  */
--static unsigned int defaultfg = 7;
--static unsigned int defaultbg = 0;
--static unsigned int defaultcs = 256;
--static unsigned int defaultrcs = 257;
-+static unsigned int defaultfg = 12;
-+static unsigned int defaultbg = 8;
-+static unsigned int defaultcs = 14;
-+static unsigned int defaultrcs = 15;
- 
- /*
-  * Default shape of cursor
-_AT_@ -172,6 +184,7 @@ static Shortcut shortcuts[] = {
- 	{ MODKEY|ShiftMask,     XK_C,           clipcopy,       {.i =  0} },
- 	{ MODKEY|ShiftMask,     XK_V,           clippaste,      {.i =  0} },
- 	{ MODKEY,               XK_Num_Lock,    numlock,        {.i =  0} },
-+	{ XK_ANY_MOD,           XK_F6,          swapcolors,     {.i =  0} },
- };
- 
- /*
-diff --git a/st.c b/st.c
-index 2594c65..b4a3089 100644
---- a/st.c
-+++ b/st.c
-_AT_@ -328,6 +328,7 @@ typedef struct {
- static void clipcopy(const Arg *);
- static void clippaste(const Arg *);
- static void numlock(const Arg *);
-+static void swapcolors(const Arg *);
- static void selpaste(const Arg *);
- static void xzoom(const Arg *);
- static void xzoomabs(const Arg *);
-_AT_@ -355,7 +356,7 @@ typedef struct {
- 
- /* Drawing Context */
- typedef struct {
--	Color col[MAX(LEN(colorname), 256)];
-+	Color col[MAX(MAX(LEN(colorname), LEN(altcolorname)), 256)];
- 	Font font, bfont, ifont, ibfont;
- 	GC gc;
- } DC;
-_AT_@ -533,6 +534,8 @@ static char *opt_name  = NULL;
- static char *opt_title = NULL;
- static int oldbutton   = 3; /* button event on startup: 3 = release */
- 
-+static int usealtcolors = 0; /* 1 to use alternate palette */
-+
- static char *usedfont = NULL;
- static double usedfontsize = 0;
- static double defaultfontsize = 0;
-_AT_@ -3148,6 +3151,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)
- {
-_AT_@ -3166,7 +3174,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);
-_AT_@ -3186,8 +3194,8 @@ xloadcols(void)
- 
- 	for (i = 0; i < LEN(dc.col); 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);
- 		}
-_AT_@ -3514,13 +3522,13 @@ xinit(void)
- 	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;
-_AT_@ -4074,6 +4082,14 @@ numlock(const Arg *dummy)
- 	term.numlock ^= 1;
- }
- 
-+void
-+swapcolors(const Arg *dummy)
-+{
-+	usealtcolors = !usealtcolors;
-+	xloadcols();
-+	redraw();
-+}
-+
- char*
- kmap(KeySym k, uint state)
- {
diff --git a/st.suckless.org/patches/st-solarized-both-20160727-745c40f.diff b/st.suckless.org/patches/st-solarized-both-20160727-745c40f.diff
deleted file mode 100644
index c6e6373..0000000
--- a/st.suckless.org/patches/st-solarized-both-20160727-745c40f.diff
+++ /dev/null
_AT_@ -1,226 +0,0 @@
-From d76c18a7214d47b64ace4a23893de3dde23cb1d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcel=20Kr=C3=BCger?= <zauguin_AT_gmail.com>
-Date: Sat, 8 Apr 2017 18:57:22 +0200
-Subject: [PATCH] Solarized
-
----
- config.def.h | 71 +++++++++++++++++++++++++++++++++++-------------------------
- st.c         | 13 ++++++++++-
- st.h         |  3 +++
- x.c          | 15 ++++++++-----
- 4 files changed, 67 insertions(+), 35 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 877afab..7ad0b44 100644
---- a/config.def.h
-+++ b/config.def.h
-_AT_@ -84,42 +84,54 @@ static unsigned int tabspaces = 8;
- 
- /* Terminal colors (16 first used in escape sequence) */
- 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 */
-+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  */
-+};
- 
- /*
-  * Default colors (colorname index)
-  * foreground, background, cursor, reverse cursor
-  */
--unsigned int defaultfg = 7;
--unsigned int defaultbg = 0;
--unsigned int defaultcs = 256;
--unsigned int defaultrcs = 257;
-+unsigned int defaultfg = 12;
-+unsigned int defaultbg = 8;
-+unsigned int defaultcs = 14;
-+unsigned int defaultrcs = 15;
- 
- /*
-  * Default shape of cursor
-_AT_@ -178,6 +190,7 @@ Shortcut shortcuts[] = {
- 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
- 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
- 	{ TERMMOD,              XK_I,           iso14755,       {.i =  0} },
-+	{ XK_ANY_MOD,           XK_F6,          swapcolors,     {.i =  0} },
- };
- 
- /*
-diff --git a/st.c b/st.c
-index ae93ade..31e383b 100644
---- a/st.c
-+++ b/st.c
-_AT_@ -129,6 +129,7 @@ typedef struct {
- static void clipcopy(const Arg *);
- static void clippaste(const Arg *);
- static void numlock(const Arg *);
-+static void swapcolors(const Arg *);
- static void selpaste(const Arg *);
- static void zoom(const Arg *);
- static void zoomabs(const Arg *);
-_AT_@ -219,6 +220,8 @@ char *opt_name  = NULL;
- char *opt_title = NULL;
- int oldbutton   = 3; /* button event on startup: 3 = release */
- 
-+int usealtcolors = 0; /* 1 to use alternate palette */
-+
- static CSIEscape csiescseq;
- static STREscape strescseq;
- static int iofd = 1;
-_AT_@ -233,7 +236,7 @@ static Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
- static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
- 
- /* config.h array lengths */
--size_t colornamelen = LEN(colorname);
-+size_t colornamelen = MAX(LEN(colorname), LEN(altcolorname));
- size_t mshortcutslen = LEN(mshortcuts);
- size_t shortcutslen = LEN(shortcuts);
- size_t selmaskslen = LEN(selmasks);
-_AT_@ -2628,6 +2631,14 @@ numlock(const Arg *dummy)
- 	term.numlock ^= 1;
- }
- 
-+void
-+swapcolors(const Arg *dummy)
-+{
-+	usealtcolors = !usealtcolors;
-+	xloadcols();
-+	redraw();
-+}
-+
- char*
- kmap(KeySym k, uint state)
- {
-diff --git a/st.h b/st.h
-index 44d4938..ff74cc6 100644
---- a/st.h
-+++ b/st.h
-_AT_@ -232,6 +232,8 @@ extern char *opt_name;
- extern char *opt_title;
- extern int oldbutton;
- 
-+extern int usealtcolors;
-+
- extern char *usedfont;
- extern double usedfontsize;
- extern double defaultfontsize;
-_AT_@ -250,6 +252,7 @@ extern unsigned int cursorthickness;
- extern unsigned int blinktimeout;
- extern char termname[];
- extern const char *colorname[];
-+extern const char *altcolorname[];
- extern size_t colornamelen;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
-diff --git a/x.c b/x.c
-index fbfd350..123131c 100644
---- a/x.c
-+++ b/x.c
-_AT_@ -573,6 +573,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)
- {
-_AT_@ -591,7 +596,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);
-_AT_@ -614,8 +619,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);
- 		}
-_AT_@ -950,13 +955,13 @@ xinit(void)
- 	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;
diff --git a/st.suckless.org/patches/st-solarized-both-20170626-b331da5.diff b/st.suckless.org/patches/st-solarized-both-20170626-b331da5.diff
new file mode 100644
index 0000000..95040e5
--- /dev/null
+++ b/st.suckless.org/patches/st-solarized-both-20170626-b331da5.diff
_AT_@ -0,0 +1,216 @@
+diff --git a/config.def.h b/config.def.h
+index 877afab..7305ec9 100644
+--- a/config.def.h
++++ b/config.def.h
+_AT_@ -84,42 +84,54 @@ static unsigned int tabspaces = 8;
+ 
+ /* Terminal colors (16 first used in escape sequence) */
+ 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 */
++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  */
++ };
+ 
+ /*
+  * Default colors (colorname index)
+  * foreground, background, cursor, reverse cursor
+  */
+-unsigned int defaultfg = 7;
+-unsigned int defaultbg = 0;
+-unsigned int defaultcs = 256;
+-unsigned int defaultrcs = 257;
++unsigned int defaultfg = 12;
++unsigned int defaultbg = 8;
++unsigned int defaultcs = 14;
++unsigned int defaultrcs = 15;
+ 
+ /*
+  * Default shape of cursor
+_AT_@ -178,6 +190,7 @@ Shortcut shortcuts[] = {
+ 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
+ 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
+ 	{ TERMMOD,              XK_I,           iso14755,       {.i =  0} },
++	{ XK_ANY_MOD,           XK_F6,          swapcolors,     {.i =  0} },
+ };
+ 
+ /*
+diff --git a/st.c b/st.c
+index 8d4a9f2..fc7d9a6 100644
+--- a/st.c
++++ b/st.c
+_AT_@ -129,6 +129,7 @@ typedef struct {
+ static void clipcopy(const Arg *);
+ static void clippaste(const Arg *);
+ static void numlock(const Arg *);
++static void swapcolors(const Arg *);
+ static void selpaste(const Arg *);
+ static void zoom(const Arg *);
+ static void zoomabs(const Arg *);
+_AT_@ -219,6 +220,8 @@ char *opt_name  = NULL;
+ char *opt_title = NULL;
+ int oldbutton   = 3; /* button event on startup: 3 = release */
+ 
++int usealtcolors = 0; /* 1 to use alternate palette */
++
+ static CSIEscape csiescseq;
+ static STREscape strescseq;
+ static int iofd = 1;
+_AT_@ -233,7 +236,7 @@ static Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
+ static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
+ 
+ /* config.h array lengths */
+-size_t colornamelen = LEN(colorname);
++size_t colornamelen = MAX(LEN(colorname), LEN(altcolorname));
+ size_t mshortcutslen = LEN(mshortcuts);
+ size_t shortcutslen = LEN(shortcuts);
+ size_t selmaskslen = LEN(selmasks);
+_AT_@ -2631,6 +2634,14 @@ numlock(const Arg *dummy)
+ 	term.numlock ^= 1;
+ }
+ 
++void
++swapcolors(const Arg *dummy)
++{
++	usealtcolors = !usealtcolors;
++	xloadcols();
++	redraw();
++}
++
+ char*
+ kmap(KeySym k, uint state)
+ {
+diff --git a/st.h b/st.h
+index 44d4938..c464dd3 100644
+--- a/st.h
++++ b/st.h
+_AT_@ -250,7 +250,9 @@ extern unsigned int cursorthickness;
+ extern unsigned int blinktimeout;
+ extern char termname[];
+ extern const char *colorname[];
++extern const char *altcolorname[];
+ extern size_t colornamelen;
++extern int usealtcolors;
+ extern unsigned int defaultfg;
+ extern unsigned int defaultbg;
+ extern unsigned int defaultcs;
+diff --git a/x.c b/x.c
+index fbfd350..886918b 100644
+--- a/x.c
++++ b/x.c
+_AT_@ -138,6 +138,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
+ /* Globals */
+ static DC dc;
+ static XWindow xw;
++
+ static XSelection xsel;
+ 
+ /* Font Ring Cache */
+_AT_@ -573,6 +574,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)
+ {
+_AT_@ -591,7 +597,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);
+_AT_@ -614,8 +620,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);
+ 		}
+_AT_@ -950,13 +956,13 @@ xinit(void)
+ 	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;
Received on Mon Jun 26 2017 - 18:36:37 CEST

This archive was generated by hypermail 2.3.0 : Mon Jun 26 2017 - 18:48:17 CEST