From 231b0d03fed93ccc4b5f953f503763966341ec48 Mon Sep 17 00:00:00 2001
From: "Sean E. Russell" <ser@ser1.net>
Date: Fri, 28 Feb 2020 10:03:41 -0600
Subject: Extensions.

---
 colorschemes/default.go           | 3 +--
 colorschemes/default.json         | 3 +--
 colorschemes/default_dark.go      | 3 +--
 colorschemes/monokai.go           | 3 +--
 colorschemes/nord.go              | 3 +--
 colorschemes/solarized.go         | 3 +--
 colorschemes/solarized16_dark.go  | 3 +--
 colorschemes/solarized16_light.go | 3 +--
 colorschemes/template.go          | 3 +--
 colorschemes/vice.go              | 3 +--
 10 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'colorschemes')

diff --git a/colorschemes/default.go b/colorschemes/default.go
index dc6c6b2..90ac3fa 100644
--- a/colorschemes/default.go
+++ b/colorschemes/default.go
@@ -12,8 +12,7 @@ func init() {
 
 		BattLines: []int{4, 3, 2, 1, 5, 6, 7, 8},
 
-		MainMem: 5,
-		SwapMem: 11,
+		MemLines: []int{5, 11, 4, 3, 2, 1, 6, 7, 8},
 
 		ProcCursor: 4,
 
diff --git a/colorschemes/default.json b/colorschemes/default.json
index 12cab1b..d6b3dc5 100644
--- a/colorschemes/default.json
+++ b/colorschemes/default.json
@@ -11,8 +11,7 @@
 
 	"BattLines": [4, 3, 2, 1, 5, 6, 7, 8],
 
-	"MainMem": 5,
-	"SwapMem": 11,
+	"MemLines": [5, 11, 4, 3, 2, 1, 6, 7, 8],
 
 	"ProcCursor": 4,
 
diff --git a/colorschemes/default_dark.go b/colorschemes/default_dark.go
index 849f85b..7f7911c 100644
--- a/colorschemes/default_dark.go
+++ b/colorschemes/default_dark.go
@@ -12,8 +12,7 @@ func init() {
 
 		BattLines: []int{4, 3, 2, 1, 5, 6, 7, 8},
 
-		MainMem: 5,
-		SwapMem: 3,
+		MemLines: []int{5, 3, 4, 2, 1, 6, 7, 8, 11},
 
 		ProcCursor: 33,
 
diff --git a/colorschemes/monokai.go b/colorschemes/monokai.go
index cd0471c..d09f3c9 100644
--- a/colorschemes/monokai.go
+++ b/colorschemes/monokai.go
@@ -12,8 +12,7 @@ func init() {
 
 		BattLines: []int{81, 70, 208, 197, 249, 141, 221, 186},
 
-		MainMem: 208,
-		SwapMem: 186,
+		MemLines: []int{208, 186, 81, 70, 208, 197, 249, 141, 221, 186},
 
 		ProcCursor: 197,
 
diff --git a/colorschemes/nord.go b/colorschemes/nord.go
index b6d4b50..028057e 100644
--- a/colorschemes/nord.go
+++ b/colorschemes/nord.go
@@ -25,8 +25,7 @@ func init() {
 
 		BattLines: []int{4, 3, 2, 1, 5, 6, 7, 8},
 
-		MainMem: 172, // Orange
-		SwapMem: 221, // yellow
+		MemLines: []int{172, 221, 4, 3, 2, 1, 5, 6, 7, 8},
 
 		ProcCursor: 31, // blue (nord9)
 
diff --git a/colorschemes/solarized.go b/colorschemes/solarized.go
index 48d67b0..4649d93 100644
--- a/colorschemes/solarized.go
+++ b/colorschemes/solarized.go
@@ -15,8 +15,7 @@ func init() {
 
 		BattLines: []int{61, 33, 37, 64, 125, 160, 166, 136},
 
-		MainMem: 125,
-		SwapMem: 166,
+		MemLines: []int{125, 166, 61, 33, 37, 64, 125, 160, 166, 136},
 
 		ProcCursor: 136,
 
diff --git a/colorschemes/solarized16_dark.go b/colorschemes/solarized16_dark.go
index 354991b..00c7eb6 100644
--- a/colorschemes/solarized16_dark.go
+++ b/colorschemes/solarized16_dark.go
@@ -14,8 +14,7 @@ func init() {
 
 		BattLines: []int{13, 4, 6, 2, 5, 1, 9, 3},
 
-		MainMem: 5,
-		SwapMem: 9,
+		MemLines: []int{5, 9, 13, 4, 6, 2, 1, 3},
 
 		ProcCursor: 4,
 
diff --git a/colorschemes/solarized16_light.go b/colorschemes/solarized16_light.go
index 0fae397..b4157d9 100644
--- a/colorschemes/solarized16_light.go
+++ b/colorschemes/solarized16_light.go
@@ -14,8 +14,7 @@ func init() {
 
 		BattLines: []int{13, 4, 6, 2, 5, 1, 9, 3},
 
-		MainMem: 5,
-		SwapMem: 9,
+		MemLines: []int{5, 9, 13, 4, 6, 2, 1, 3},
 
 		ProcCursor: 4,
 
diff --git a/colorschemes/template.go b/colorschemes/template.go
index 9b7ac79..af4b792 100644
--- a/colorschemes/template.go
+++ b/colorschemes/template.go
@@ -32,8 +32,7 @@ type Colorscheme struct {
 
 	BattLines []int
 
-	MainMem int
-	SwapMem int
+	MemLines []int
 
 	ProcCursor int
 
diff --git a/colorschemes/vice.go b/colorschemes/vice.go
index 8bd2545..d0dbb03 100644
--- a/colorschemes/vice.go
+++ b/colorschemes/vice.go
@@ -12,8 +12,7 @@ func init() {
 
 		BattLines: []int{212, 218, 123, 159, 229, 158, 183, 146},
 
-		MainMem: 201,
-		SwapMem: 97,
+		MemLines: []int{201, 97, 212, 218, 123, 159, 229, 158, 183, 146},
 
 		ProcCursor: 159,
 
-- 
cgit v1.2.3