Added a couple more fixes for missing grey tones.

3 files changed, 29 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d959c53a0e2..911e3796c24c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = htop-solarized
 	pkgdesc = Interactive process viewer with solarized patch
 	pkgver = 3.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://htop.dev/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index dbc4ea1b01c1..e0af07db562f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _pkgname=htop
 pkgname=$_pkgname-solarized
 _tag='a8637afe0398f0be0131f73563b55ef9315ca351' # git rev-parse ${pkgver}
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive process viewer with solarized patch"
 arch=('i686' 'x86_64' 'armv7h')
 url='https://htop.dev/'
diff --git a/htop-solarized.patch b/htop-solarized.patch
index 65c397a11b78..433a743272bd 100644
--- a/htop-solarized.patch
+++ b/htop-solarized.patch
@@ -2,6 +2,15 @@ diff --git a/CRT.c b/CRT.c
 index 2533f613..c549a0e4 100644
 --- a/CRT.c
 +++ b/CRT.c
+@@ -120,7 +120,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+       [UPTIME] = A_BOLD | ColorPair(Cyan, Black),
+       [BATTERY] = A_BOLD | ColorPair(Cyan, Black),
+       [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Black),
+-      [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
++      [METER_SHADOW] = A_BOLD | ColorPair(Green,Black), // Solarized
+       [METER_TEXT] = ColorPair(Cyan, Black),
+       [METER_VALUE] = A_BOLD | ColorPair(Cyan, Black),
+       [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, Black),
 @@ -132,7 +132,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [LED_COLOR] = ColorPair(Green, Black),
        [TASKS_RUNNING] = A_BOLD | ColorPair(Green, Black),
@@ -20,7 +29,7 @@ index 2533f613..c549a0e4 100644
        [SWAP] = ColorPair(Red, Black),
        [SWAP_CACHE] = ColorPair(Yellow, Black),
        [GRAPH_1] = A_BOLD | ColorPair(Cyan, Black),
-@@ -163,7 +163,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -163,12 +163,12 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [HUGEPAGE_2] = ColorPair(Yellow, Black),
        [HUGEPAGE_3] = ColorPair(Red, Black),
        [HUGEPAGE_4] = ColorPair(Blue, Black),
@@ -29,6 +38,12 @@ index 2533f613..c549a0e4 100644
        [LOAD_AVERAGE_FIVE] = A_BOLD | ColorPair(Cyan, Black),
        [LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(White, Black),
        [LOAD] = A_BOLD,
+       [HELP_BOLD] = A_BOLD | ColorPair(Cyan, Black),
+-      [HELP_SHADOW] = A_BOLD | ColorPairGrayBlack,
++      [HELP_SHADOW] = A_BOLD | ColorPair(Green,Black), // Solarized
+       [CLOCK] = A_BOLD,
+       [DATE] = A_BOLD,
+       [DATETIME] = A_BOLD,
 @@ -180,7 +180,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
        [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue, Black),
        [CPU_NORMAL] = ColorPair(Green, Black),
@@ -38,3 +53,14 @@ index 2533f613..c549a0e4 100644
        [CPU_IRQ] = ColorPair(Yellow, Black),
        [CPU_SOFTIRQ] = ColorPair(Magenta, Black),
        [CPU_STEAL] = ColorPair(Cyan, Black),
+@@ -196,8 +196,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+       [ZFS_COMPRESSED] = ColorPair(Blue, Black),
+       [ZFS_RATIO] = ColorPair(Magenta, Black),
+       [ZRAM] = ColorPair(Yellow, Black),
+-      [DYNAMIC_GRAY] = ColorPairGrayBlack,
+-      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
++      [DYNAMIC_GRAY] = ColorPair(Green,Black), // Solarized
++      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPair(Green,Black), // Solarized
+       [DYNAMIC_RED] = ColorPair(Red, Black),
+       [DYNAMIC_GREEN] = ColorPair(Green, Black),
+       [DYNAMIC_BLUE] = ColorPair(Blue, Black),