Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-12-23 11:29:01 +00:00
Code Issues Projects Releases Wiki Activity

Make --color attributes mergeable

Browse Source 
So you can override the colors and still have the text attributes

    # Default colors and attributes
    fzf

    export FZF_DEFAULT_OPTS='--color hl👎underline,hl+👎underline:reverse'

    # Default colors with underline+reverse attributes
    fzf

    # Different colors with underline+reverse attributes
    fzf --color hl:176,hl+:177

Related: https://github.com/junegunn/fzf.vim/issues/1197#issuecomment-739804363
This commit is contained in:
Junegunn Choi 2020-12-07 19:07:17 +09:00
parent 00a3610331
commit e0a22e76f8
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/options.go
View File

@ -644,71 +644,72 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) *tui.ColorTheme {
fail()
}
cattr := tui.NewColorAttr()
for _, component := range components[1:] {
switch component {
case "regular":
cattr.Attr = tui.AttrRegular
case "bold", "strong":
cattr.Attr |= tui.Bold
case "dim":
cattr.Attr |= tui.Dim
case "italic":
cattr.Attr |= tui.Italic
case "underline":
cattr.Attr |= tui.Underline
case "blink":
cattr.Attr |= tui.Blink
case "reverse":
cattr.Attr |= tui.Reverse
case "":
default:
if rrggbb.MatchString(component) {
cattr.Color = tui.HexToColor(component)
} else {
ansi32, err := strconv.Atoi(component)
if err != nil || ansi32 < -1 || ansi32 > 255 {
fail()
mergeAttr := func(cattr *tui.ColorAttr) {
for _, component := range components[1:] {
switch component {
case "regular":
cattr.Attr = tui.AttrRegular
case "bold", "strong":
cattr.Attr |= tui.Bold
case "dim":
cattr.Attr |= tui.Dim
case "italic":
cattr.Attr |= tui.Italic
case "underline":
cattr.Attr |= tui.Underline
case "blink":
cattr.Attr |= tui.Blink
case "reverse":
cattr.Attr |= tui.Reverse
case "":
default:
if rrggbb.MatchString(component) {
cattr.Color = tui.HexToColor(component)
} else {
ansi32, err := strconv.Atoi(component)
if err != nil || ansi32 < -1 || ansi32 > 255 {
fail()
}
cattr.Color = tui.Color(ansi32)
}
cattr.Color = tui.Color(ansi32)
}
}
}
switch components[0] {
case "input":
theme.Input = cattr
mergeAttr(&theme.Input)
case "fg":
theme.Fg = cattr
mergeAttr(&theme.Fg)
case "bg":
theme.Bg = cattr
mergeAttr(&theme.Bg)
case "preview-fg":
theme.PreviewFg = cattr
mergeAttr(&theme.PreviewFg)
case "preview-bg":
theme.PreviewBg = cattr
mergeAttr(&theme.PreviewBg)
case "fg+":
theme.Current = cattr
mergeAttr(&theme.Current)
case "bg+":
theme.DarkBg = cattr
mergeAttr(&theme.DarkBg)
case "gutter":
theme.Gutter = cattr
mergeAttr(&theme.Gutter)
case "hl":
theme.Match = cattr
mergeAttr(&theme.Match)
case "hl+":
theme.CurrentMatch = cattr
mergeAttr(&theme.CurrentMatch)
case "border":
theme.Border = cattr
mergeAttr(&theme.Border)
case "prompt":
theme.Prompt = cattr
mergeAttr(&theme.Prompt)
case "spinner":
theme.Spinner = cattr
mergeAttr(&theme.Spinner)
case "info":
theme.Info = cattr
mergeAttr(&theme.Info)
case "pointer":
theme.Cursor = cattr
mergeAttr(&theme.Cursor)
case "marker":
theme.Selected = cattr
mergeAttr(&theme.Selected)
case "header":
theme.Header = cattr
mergeAttr(&theme.Header)
default:
fail()
}