From 40424f1bb85667e90f33d1dd43ed5e7467a9adce Mon Sep 17 00:00:00 2001
From: Lifepillar <github@lifepillar.com>
Date: Mon, 16 May 2016 20:16:39 +0200
Subject: [PATCH] Update statusline colors for flat variants.

---
 colors/solarized8_dark_flat.vim  | 15 ++++-----
 colors/solarized8_light_flat.vim | 15 ++++-----
 src/solarized8.vim               | 54 +++++++++++++++++++++-----------
 3 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim
index adc1634..13a78a5 100644
--- a/colors/solarized8_dark_flat.vim
+++ b/colors/solarized8_dark_flat.vim
@@ -22,11 +22,10 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
 hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
 hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
 hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
-hi! NormalMode ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+hi! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse
+hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse
+hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse
+hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=0 guifg=#073642 cterm=NONE,reverse gui=NONE,reverse
 if get(g:, "solarized_visibility", "") == "high"
   hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
@@ -41,9 +40,11 @@ else
   hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642
 endif
 if get(g:, "solarized_statusline", "") == "low"
-  hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 else
-  hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
+  hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 endif
 hi! StatusLineNC ctermfg=0 guifg=#073642 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=10 guifg=#586e75 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim
index 5d9e07a..c851974 100644
--- a/colors/solarized8_light_flat.vim
+++ b/colors/solarized8_light_flat.vim
@@ -22,11 +22,10 @@ hi! Underlined cterm=NONE gui=NONE ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=N
 hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE
 hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
 hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE
-hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! ReplaceMode ctermfg=9 guifg=#cb4b16 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! VisualMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! CommandMode ctermfg=5 guifg=#d33682 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+hi! InsertMode ctermbg=6 guibg=#2aa198 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+hi! ReplaceMode ctermbg=9 guibg=#cb4b16 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+hi! VisualMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+hi! CommandMode ctermbg=5 guibg=#d33682 ctermfg=7 guifg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 if get(g:, "solarized_visibility", "") == "high"
   hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
@@ -41,9 +40,11 @@ else
   hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5
 endif
 if get(g:, "solarized_statusline", "") == "low"
-  hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+  hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
 else
-  hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 endif
 hi! StatusLineNC ctermfg=7 guifg=#eee8d5 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
diff --git a/src/solarized8.vim b/src/solarized8.vim
index a395b16..c8c73c4 100644
--- a/src/solarized8.vim
+++ b/src/solarized8.vim
@@ -224,18 +224,26 @@ call s:put("hi! Todo"           .s:fmt_bold   .s:fg_magenta.s:bg_none)
 "
 "}}}
 " Lifepillar's mode highlighting {{{
-if g:solarized_background == "dark"
-  call s:put("hi! NormalMode" . s:fg_base0  .s:bg_base3. s:fmt_revbb)
-  call s:put("hi! InsertMode" . s:fg_cyan   .s:bg_base3. s:fmt_revbb)
-  call s:put("hi! ReplaceMode". s:fg_orange .s:bg_base3. s:fmt_revbb)
-  call s:put("hi! VisualMode" . s:fg_magenta.s:bg_base3. s:fmt_revbb)
-  call s:put("hi! CommandMode". s:fg_magenta.s:bg_base3. s:fmt_revbb)
+if g:solarized_contrast == "flat"
+  " NormalMode set together with StatusLine (see below)
+  call s:put("hi! InsertMode" . s:bg_cyan   .s:fg_base02. s:fmt_revbb)
+  call s:put("hi! ReplaceMode". s:bg_orange .s:fg_base02. s:fmt_revbb)
+  call s:put("hi! VisualMode" . s:bg_magenta.s:fg_base02. s:fmt_revbb)
+  call s:put("hi! CommandMode". s:bg_magenta.s:fg_base02. s:fmt_revbb)
 else
-  call s:put("hi! NormalMode"  .s:fg_base1  .s:bg_base03. s:fmt_revbb)
-  call s:put("hi! InsertMode"  .s:fg_cyan   .s:bg_base03. s:fmt_revbb)
-  call s:put("hi! ReplaceMode" .s:fg_orange .s:bg_base03. s:fmt_revbb)
-  call s:put("hi! VisualMode"  .s:fg_magenta.s:bg_base03. s:fmt_revbb)
-  call s:put("hi! CommandMode" .s:fg_magenta.s:bg_base03. s:fmt_revbb)
+  if g:solarized_background == "dark"
+    call s:put("hi! NormalMode" . s:fg_base0  .s:bg_base3. s:fmt_revbb)
+    call s:put("hi! InsertMode" . s:fg_cyan   .s:bg_base3. s:fmt_revbb)
+    call s:put("hi! ReplaceMode". s:fg_orange .s:bg_base3. s:fmt_revbb)
+    call s:put("hi! VisualMode" . s:fg_magenta.s:bg_base3. s:fmt_revbb)
+    call s:put("hi! CommandMode". s:fg_magenta.s:bg_base3. s:fmt_revbb)
+  else
+    call s:put("hi! NormalMode"  .s:fg_base1  .s:bg_base03. s:fmt_revbb)
+    call s:put("hi! InsertMode"  .s:fg_cyan   .s:bg_base03. s:fmt_revbb)
+    call s:put("hi! ReplaceMode" .s:fg_orange .s:bg_base03. s:fmt_revbb)
+    call s:put("hi! VisualMode"  .s:fg_magenta.s:bg_base03. s:fmt_revbb)
+    call s:put("hi! CommandMode" .s:fg_magenta.s:bg_base03. s:fmt_revbb)
+  endif
 endif
 " }}}
 " Extended highlighting "{{{
@@ -254,17 +262,27 @@ call s:put("  hi! NonText"    .s:fmt_bold   .s:fg_base00 .s:bg_none)
 call s:put("  hi! CursorLineNr"   .s:fmt_bold   .s:fg_base0 .s:bg_base02)
 call s:put('endif')
 call s:put('if get(g:, "solarized_statusline", "") == "low"')
-if g:solarized_background == "dark"
-  call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=7 guibg=#eee8d5" .s:fmt_revbb)
+if g:solarized_contrast == "flat"
+  call s:put("  hi! NormalMode"     .s:fg_base02  .s:bg_base1 .s:fmt_revbb)
+  call s:put("  hi! StatusLine"     .s:fg_base02  .s:bg_base1 .s:fmt_revbb)
 else
-  call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb)
+  if g:solarized_background == "dark"
+    call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=7 guibg=#eee8d5" .s:fmt_revbb)
+  else
+    call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb)
+  endif
 endif
 call s:put('else')
-if g:solarized_background == "dark"
-  " Changed by Lifepillar: slightly darker status line, light foreground
-  call s:put("  hi! StatusLine"     .s:fg_base0  .s:bg_base02.s:fmt_revbb)
+if g:solarized_contrast == "flat"
+  call s:put("  hi! NormalMode"     .s:fg_base02 .s:bg_base2 . s:fmt_revbb)
+  call s:put("  hi! StatusLine"     .s:fg_base02 .s:bg_base2 .s:fmt_revbb)
 else
-  call s:put("  hi! StatusLine"     .s:fg_base1 .s:bg_base02.s:fmt_revbb)
+  if g:solarized_background == "dark"
+    " Changed by Lifepillar: slightly darker status line, light foreground
+    call s:put("  hi! StatusLine"     .s:fg_base0  .s:bg_base02.s:fmt_revbb)
+  else
+    call s:put("  hi! StatusLine"     .s:fg_base1 .s:bg_base02.s:fmt_revbb)
+  endif
 endif
 call s:put('endif')
 if g:solarized_contrast == "flat"