Fix colorscheme, by adopting different upstream - and as bonus also support light.

1 files changed, 82 insertions, 20 deletions

diff --git a/X11/Xresources/local-color-solarized b/X11/Xresources/local-color-solarized
index 4c8f04c..65502e6 100644
--- a/X11/Xresources/local-color-solarized
+++ b/X11/Xresources/local-color-solarized
@@ -1,26 +1,88 @@
 !! Solarized colorscheme for Xresources
-!! Origin: https://github.com/seletskiy/dotfiles
+!! Origin: http://unix.stackexchange.com/questions/58528/xresources-color-settings
+!! Origin of origin: https://github.com/solarized/xresources
 
-*color0:  #424242
-*color1:  #ba3b38
-*color10: #79ab87
-*color11: #e8a410
-*color12: #98c6ef
-*color13: #e499b2
-*color14: #579e9a
-*color15: #f4f2eb
-*color2:  #5d865f
-*color3:  #a8814a
-*color4:  #88afd4
-*color5:  #cc5985
-*color6:  #376360
-*color7:  #d0cfca
-*color8:  #5d5d5d
-*color9:  #e9605f
+!! use dark theme by default
+!! To choose between light/dark bakground:
+!! - Define the choice in ``.Xresources`` by hardcoding
+!!   #define SOLARIZED_LIGHT
+!!   or
+!!   #define SOLARIZED_DARK
+!! - Define the symbol when loading ``.Xresources`` with ``xrdb``:
+!!   $ xrdb -DSOLARIZED_LIGHT -merge ~/.Xresources
+#if !defined(SOLARIZED_LIGHT) && !defined(SOLARIZED_DARK)
+#define SOLARIZED_DARK
+#elif defined(SOLARIZED_LIGHT) && defined(SOLARIZED_DARK)
+#undef SOLARIZED_LIGHT
+#endif
 
-*background:  #1c1c1c
-*foreground:  #d8d8d8
-*cursorColor: #ffffff
+#define S_base03    #002b36
+#define S_base02    #073642
+#define S_base01    #586e75
+#define S_base00    #657b83
+#define S_base0     #839496
+#define S_base1     #93a1a1
+#define S_base2     #eee8d5
+#define S_base3     #fdf6e3
+
+#define S_yellow    #b58900
+#define S_orange    #cb4b16
+#define S_red       #dc322f
+#define S_magenta   #d33682
+#define S_violet    #6c71c4
+#define S_blue      #268bd2
+#define S_cyan      #2aa198
+#define S_green     #859900
+
+#ifdef SOLARIZED_LIGHT
+#define S_emph      S_base01
+#define S_primary   S_base00
+#define S_secondary S_base1
+#define S_bgrnd_hi  S_base2
+#define S_bgrnd     S_base3
+#endif
+#ifdef SOLARIZED_DARK
+#define S_emph      S_base1
+#define S_primary   S_base0
+#define S_secondary S_base01
+#define S_bgrnd_hi  S_base02
+#define S_bgrnd     S_base03
+#endif
+
+!! black dark/light
+*color0:                S_base02
+*color8:                S_base03
+!! red dark/light
+*color1:                S_red
+*color9:                S_orange
+!! green dark/light
+*color2:                S_green
+*color10:               S_base01
+!! yellow dark/light
+*color3:                S_yellow
+*color11:               S_base00
+!! blue dark/light
+*color4:                S_blue
+*color12:               S_base0
+!! magenta dark/light
+*color5:                S_magenta
+*color13:               S_violet
+!! cyan dark/light
+*color6:                S_cyan
+*color14:               S_base1
+!! white dark/light
+*color7:                S_base2
+*color15:               S_base3
+
+*foreground:                S_primary
+*background:                S_bgrnd
+*Foreground:                S_primary
+*Background:                S_bgrnd
+*cursorColor:               S_emph
+*pointerColorForeground:    S_emph
+*pointerColorBackground:    S_secondary
+*fading:                    40
+*fadeColor:                 S_bgrnd
 
 !! No, do *not* suppress high intensity colors
 !! Details: https://github.com/seebi/dircolors-solarized/blob/master/README.md