Make it possible to define themes as TOML + add 256color support

Author: xyproto

v2/cmenu.go

@@ -376,9 +376,9 @@ func (e *Editor) CommandMenu(c *vt.Canvas, tty *vt.TTY, status *StatusBar, undo
 				"Amber Mono     (O_THEME=ambermono)",
 				"Green Mono     (O_THEME=greenmono)",
 				"Blue Mono      (O_THEME=bluemono)"}
-			//if vt.Has256Colors() {
-			  //menuChoices = append(menuChoices, "Xoria 256      (O_THEME=xoria)")
-			//}
+			if vt.Has256Colors() {
+				menuChoices = append(menuChoices, "Xoria 256      (O_THEME=xoria)")
+			}
 			menuChoices = append(menuChoices, "No colors      (NO_COLOR=1)")
 			useMenuIndex := 0
 			for i, menuChoiceText := range menuChoices {
@@ -465,10 +465,10 @@ func (e *Editor) CommandMenu(c *vt.Canvas, tty *vt.TTY, status *StatusBar, undo
 				envNoColor = false
 				e.setBlueTheme()
 				e.syntaxHighlight = false
-//			case "xoria":
-				//envNoColor = false
-				//e.SetTheme(NewXoriaTheme())
-//				e.syntaxHighlight = true
+			case "xoria":
+				envNoColor = false
+				e.SetTheme(NewXoriaTheme())
+				e.syntaxHighlight = true
 			case "nocolor":
 				envNoColor = true
 				e.setNoColorTheme()

v2/neweditor.go

@@ -457,6 +457,9 @@ func NewEditor(tty *vt.TTY, c *vt.Canvas, fnord FilenameOrData, lineNumber LineN
 		e.setBlueTheme()
 		e.syntaxHighlight = false
 		themeWasSet = true
+	case "xoria":
+		e.SetTheme(NewXoriaTheme(), assumeLightBackground)
+		themeWasSet = true
 	case "default":
 		themeWasSet = true
 	}

v2/themes.go

@@ -1,9 +1,10 @@
 package main
 
-import "github.com/xyproto/vt"
+import (
+	_ "embed"
 
-// TODO: Restructure how themes are stored, so that it's easier to list all themes that
-// works with a dark background or all that works with a light background, ref. initialLightBackground
+	"github.com/xyproto/vt"
+)
 
 var initialLightBackground *bool
 
@@ -382,99 +383,6 @@ func NewPinetreeTheme() Theme {
 	}
 }
 
-// NewZuluTheme creates a unique semantic Theme with nature-inspired colors
-func NewZuluTheme() Theme {
-	return Theme{
-		Name:                        "Zulu",
-		Light:                       false,
-		Foreground:                  vt.Default,
-		Background:                  vt.BackgroundDefault,
-		StatusForeground:            vt.White,
-		StatusBackground:            vt.BackgroundBlack,
-		TopRightForeground:          vt.White,
-		TopRightBackground:          vt.BackgroundDefault,
-		StatusErrorForeground:       vt.LightRed,
-		StatusErrorBackground:       vt.BackgroundDefault,
-		SearchHighlight:             vt.Yellow,
-		MultiLineComment:            vt.Gray,
-		MultiLineString:             vt.LightYellow,
-		HighlightForeground:         vt.LightCyan,
-		HighlightBackground:         vt.BackgroundDefault,
-		Git:                         vt.LightGreen,
-		String:                      "lightyellow",
-		Keyword:                     "lightgreen",
-		Comment:                     "gray",
-		Type:                        "lightcyan",
-		Literal:                     "lightmagenta",
-		Punctuation:                 "lightgray",
-		Plaintext:                   "lightgray",
-		Tag:                         "lightcyan",
-		TextTag:                     "lightcyan",
-		TextAttrName:                "lightcyan",
-		TextAttrValue:               "lightyellow",
-		Decimal:                     "lightmagenta",
-		AndOr:                       "lightgreen",
-		AngleBracket:                "lightgreen",
-		Dollar:                      "lightmagenta",
-		Star:                        "lightyellow",
-		Static:                      "lightgreen",
-		Self:                        "white",
-		Class:                       "lightcyan",
-		Private:                     "darkyellow",
-		Protected:                   "yellow",
-		Public:                      "lightgreen",
-		Whitespace:                  "",
-		AssemblyEnd:                 "lightcyan",
-		Mut:                         "lightgreen",
-		RainbowParenColors:          []vt.AttributeColor{vt.LightYellow, vt.LightGreen, vt.LightCyan, vt.LightMagenta, vt.White},
-		MarkdownTextColor:           vt.LightGray,
-		HeaderBulletColor:           vt.Gray,
-		HeaderTextColor:             vt.LightCyan,
-		ListBulletColor:             vt.LightMagenta,
-		ListTextColor:               vt.LightGray,
-		ListCodeColor:               vt.LightYellow,
-		CodeColor:                   vt.LightYellow,
-		CodeBlockColor:              vt.BackgroundDefault,
-		ImageColor:                  vt.LightMagenta,
-		LinkColor:                   vt.LightCyan,
-		QuoteColor:                  vt.Yellow,
-		QuoteTextColor:              vt.LightGray,
-		HTMLColor:                   vt.LightCyan,
-		CommentColor:                vt.Gray,
-		BoldColor:                   vt.White,
-		ItalicsColor:                vt.LightCyan,
-		StrikeColor:                 vt.Gray,
-		TableColor:                  vt.LightCyan,
-		CheckboxColor:               vt.LightGray,
-		XColor:                      vt.LightMagenta,
-		TableBackground:             vt.BackgroundDefault,
-		UnmatchedParenColor:         vt.LightRed,
-		MenuTitleColor:              vt.LightCyan,
-		MenuArrowColor:              vt.LightGreen,
-		MenuTextColor:               vt.Default,
-		MenuHighlightColor:          vt.LightYellow,
-		MenuSelectedColor:           vt.White,
-		ManSectionColor:             vt.LightMagenta,
-		ManSynopsisColor:            vt.LightCyan,
-		BoxTextColor:                vt.White,
-		BoxBackground:               vt.BackgroundBlack,
-		ProgressIndicatorBackground: vt.BackgroundGray,
-		BoxHighlight:                vt.LightYellow,
-		DebugRunningBackground:      vt.BackgroundGreen,
-		DebugStoppedBackground:      vt.BackgroundMagenta,
-		DebugRegistersBackground:    vt.BackgroundCyan,
-		DebugOutputBackground:       vt.BackgroundYellow,
-		DebugLineIndicator:          vt.LightCyan,
-		DebugInstructionsForeground: vt.LightYellow,
-		DebugInstructionsBackground: vt.BackgroundBlack,
-		BoxUpperEdge:                vt.LightGray,
-		JumpToLetterColor:           vt.LightMagenta,
-		NanoHelpForeground:          vt.Black,
-		NanoHelpBackground:          vt.BackgroundGray,
-		MultiCursorBackground:       vt.BackgroundYellow,
-	}
-}
-
 // NewLitmusTheme creates a new default Theme struct
 func NewLitmusTheme() Theme {
 	return Theme{