Skip to content

Made color style configurable through env #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotmpe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Made color style configurable through env #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 42 additions & 9 deletions up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/spf13/pflag"
)

const version = "0.4 (2020-10-29)"
const version = "0.5-dev (2022-06-04)"

// TODO: in case of error, show it in red (bg?), then below show again initial normal output (see also #4)
// TODO: F1 should display help, and it should be multi-line, and scrolling licensing credits
Expand Down Expand Up @@ -115,6 +115,12 @@ OPTIONS
`)
pflag.PrintDefaults()
fmt.Fprint(os.Stderr, `
STYLE

Colors can be configured through environment variables UP_BG1, UP_BG2 and
UP_FG1, UP_FG2 for background and foreground. Valid values are 24-bit
hexadecimal and Xterm color names.

HOMEPAGE: https://github.com/akavel/up
VERSION: `+version+`
`)
Expand Down Expand Up @@ -173,6 +179,8 @@ func main() {
}
log.Println("found shell:", shell)

var styles = getStyles()

stdin := io.Reader(os.Stdin)
if *noinput {
stdin = bytes.NewReader(nil)
Expand Down Expand Up @@ -234,15 +242,15 @@ func main() {

// Draw UI
w, h := tui.Size()
style := whiteOnBlue
style := styles.activeCommand
if command == lastCommand {
style = whiteOnDBlue
style = styles.previousCommand
}
stdinCapture.DrawStatus(TuiRegion(tui, 0, 0, 1, 1), style)
commandEditor.DrawTo(TuiRegion(tui, 1, 0, w-1, 1), style,
func(x, y int) { tui.ShowCursor(x+1, 0) })
commandOutput.DrawTo(TuiRegion(tui, 0, 1, w, h-1))
drawText(TuiRegion(tui, 0, h-1, w, 1), whiteOnBlue, message)
drawText(TuiRegion(tui, 0, h-1, w, 1), styles.activeCommand, message)
tui.Show()

// Handle UI events
Expand Down Expand Up @@ -880,13 +888,38 @@ func TuiRegion(tui tcell.Screen, x, y, w, h int) Region {
}
}

var (
whiteOnBlue = tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorBlue)
whiteOnDBlue = tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorNavy)
)

func drawText(region Region, style tcell.Style, text string) {
for x, ch := range text {
region.SetCell(x, 0, style, ch)
}
}

type UpStyles struct {
activeCommand,
previousCommand tcell.Style
}

func getEnv(key, fallback string) string {
value := os.Getenv(key)
if len(value) == 0 {
return fallback
}
return value
}

// Return Color for Xterm color name or hex string.
func getColorEnv(key string, fallback string) tcell.Color {
value := getEnv(key, fallback)
return tcell.GetColor(value)
}

func getStyles () UpStyles {
return UpStyles {
activeCommand: tcell.StyleDefault.
Foreground(getColorEnv("UP_FG1", "white")).
Background(getColorEnv("UP_BG1", "blue")),
previousCommand: tcell.StyleDefault.
Foreground(getColorEnv("UP_FG2", "white")).
Background(getColorEnv("UP_BG2", "navy")),
}
}