From 467bb78bb1cedc1709216ef38424ecb3928263ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Mon, 3 Apr 2023 20:30:20 +0200
Subject: ZramMeter: update bar mode

Show both compressed and uncompressed bars.

Closes: #1216
---
 CRT.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'CRT.c')

diff --git a/CRT.c b/CRT.c
index 2bc9d13f..85a38115 100644
--- a/CRT.c
+++ b/CRT.c
@@ -213,7 +213,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [ZFS_OTHER] = ColorPair(Magenta, Black),
       [ZFS_COMPRESSED] = A_BOLD | ColorPair(Blue, Black),
       [ZFS_RATIO] = ColorPair(Magenta, Black),
-      [ZRAM] = ColorPair(Yellow, Black),
+      [ZRAM_COMPRESSED] = ColorPair(Blue, Black),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Black),
       [DYNAMIC_GRAY] = ColorPairGrayBlack,
       [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
       [DYNAMIC_RED] = ColorPair(Red, Black),
@@ -323,7 +324,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [ZFS_OTHER] = A_DIM,
       [ZFS_COMPRESSED] = A_BOLD,
       [ZFS_RATIO] = A_BOLD,
-      [ZRAM] = A_NORMAL,
+      [ZRAM_COMPRESSED] = A_NORMAL,
+      [ZRAM_UNCOMPRESSED] = A_NORMAL,
       [DYNAMIC_GRAY] = A_DIM,
       [DYNAMIC_DARKGRAY] = A_DIM,
       [DYNAMIC_RED] = A_BOLD,
@@ -433,7 +435,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [ZFS_OTHER] = ColorPair(Magenta, White),
       [ZFS_COMPRESSED] = ColorPair(Cyan, White),
       [ZFS_RATIO] = ColorPair(Magenta, White),
-      [ZRAM] = ColorPair(Yellow, White),
+      [ZRAM_COMPRESSED] = ColorPair(Cyan, White),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, White),
       [DYNAMIC_GRAY] = ColorPair(Black, White),
       [DYNAMIC_DARKGRAY] = A_BOLD | ColorPair(Black, White),
       [DYNAMIC_RED] = ColorPair(Red, White),
@@ -543,7 +546,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [ZFS_OTHER] = A_BOLD | ColorPair(Magenta, Black),
       [ZFS_COMPRESSED] = ColorPair(Cyan, Black),
       [ZFS_RATIO] = A_BOLD | ColorPair(Magenta, Black),
-      [ZRAM] = ColorPair(Yellow, Black),
+      [ZRAM_COMPRESSED] = ColorPair(Cyan, Black),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Black),
       [DYNAMIC_GRAY] = ColorPairGrayBlack,
       [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
       [DYNAMIC_RED] = ColorPair(Red, Black),
@@ -653,7 +657,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [ZFS_OTHER] = A_BOLD | ColorPair(Magenta, Blue),
       [ZFS_COMPRESSED] = A_BOLD | ColorPair(White, Blue),
       [ZFS_RATIO] = A_BOLD | ColorPair(Magenta, Blue),
-      [ZRAM] = A_BOLD | ColorPair(Yellow, Blue),
+      [ZRAM_COMPRESSED] = ColorPair(Cyan, Blue),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Blue),
       [DYNAMIC_GRAY] = ColorPairGrayBlack,
       [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
       [DYNAMIC_RED] = ColorPair(Red, Blue),
@@ -761,7 +766,8 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [ZFS_OTHER] = ColorPair(Magenta, Black),
       [ZFS_COMPRESSED] = ColorPair(Blue, Black),
       [ZFS_RATIO] = ColorPair(Magenta, Black),
-      [ZRAM] = ColorPair(Yellow, Black),
+      [ZRAM_COMPRESSED] = ColorPair(Blue, Black),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Black),
       [DYNAMIC_GRAY] = ColorPairGrayBlack,
       [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
       [DYNAMIC_RED] = ColorPair(Red, Black),
-- 
cgit v1.2.3