feat(color): add support to xterm 256 colors.

MrMarble · Mar 10, 2022 · a70eeab · a70eeab
1 parent adb9048
commit a70eeab
Show file tree

Hide file tree

Showing 3 changed files with 383 additions and 26 deletions.
diff --git a/pkg/color/color.go b/pkg/color/color.go
@@ -4,38 +4,19 @@ import (
 	"github.com/hinshun/vt10x"
 )
 
-//nolint
-var ansiColors = []string{
-	"#000000", // Black
-	"#800000", // Red
-	"#008000", // Green
-	"#808000", // Yellow
-	"#000080", // Blue
-	"#800080", // Magent
-	"#008080", // Cyan
-	"#c0c0c0", // Grey
-
-	"#808080", // Dark Grey
-	"#ff0000", // Light Red
-	"#00ff00", // Light Green
-	"#ffff00", // Light Yellow
-	"#0000ff", // Light Blue
-	"#ff00ff", // Light Magent
-	"#00ffff", // Light Cyan
-	"#ffffff", // White
-}
-
-func ansiToColor(ansi uint32) string {
-	return ansiColors[ansi]
-}
+//go:generate go run colorsgen.go
 
 func GetColor(c vt10x.Color) string {
 	var colorStr string
 
+	if c == vt10x.DefaultFG {
+		return ansiColors[int(vt10x.LightGrey)]
+	}
+
 	if c.ANSI() {
-		colorStr = ansiToColor(uint32(c))
+		colorStr = ansiColors[int(c)]
 	} else {
-		colorStr = ansiToColor(uint32(vt10x.LightGrey))
+		colorStr = xtermColors[int(c)]
 	}
 
 	return colorStr

diff --git a/pkg/color/colors.go b/pkg/color/colors.go