stonewareslord/fzf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix --color=bw on tcell build

Browse Source
This commit is contained in:
Junegunn Choi 2016-11-09 01:45:06 +09:00
parent 3dfc020fac
commit f87d382ec8
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/tui/tcell.go
View File

@ -140,6 +140,8 @@ func Init(theme *ColorTheme, black bool, mouse bool) {
_color = theme != nil _color = theme != nil
if _color { if _color {
InitTheme(theme, black) InitTheme(theme, black)
} else {
theme = DefaultTheme()
} }
ColNormal = ColorPair{theme.Fg, theme.Bg} ColNormal = ColorPair{theme.Fg, theme.Bg}
ColPrompt = ColorPair{theme.Prompt, theme.Bg} ColPrompt = ColorPair{theme.Prompt, theme.Bg}
@ -439,13 +441,20 @@ func (w *Window) PrintString(text string, pair ColorPair, a Attr) {
t := text t := text
lx := 0 lx := 0
// TODO respect attr var style tcell.Style
style := pair.style(). if _color {
Blink(a&Attr(tcell.AttrBlink) != 0). style = pair.style().
Bold(a&Attr(tcell.AttrBold) != 0).
Dim(a&Attr(tcell.AttrDim) != 0).
Reverse(a&Attr(tcell.AttrReverse) != 0). Reverse(a&Attr(tcell.AttrReverse) != 0).
Underline(a&Attr(tcell.AttrUnderline) != 0) Underline(a&Attr(tcell.AttrUnderline) != 0)
} else {
style = ColDefault.style().
Reverse(a&Attr(tcell.AttrReverse) != 0 || pair == ColCurrent || pair == ColCurrentMatch).
Underline(a&Attr(tcell.AttrUnderline) != 0 || pair == ColMatch || pair == ColCurrentMatch)
}
style = style.
Blink(a&Attr(tcell.AttrBlink) != 0).
Bold(a&Attr(tcell.AttrBold) != 0).
Dim(a&Attr(tcell.AttrDim) != 0)
for { for {
if len(t) == 0 { if len(t) == 0 {
@ -485,8 +494,13 @@ func (w *Window) CPrint(pair ColorPair, a Attr, text string) {
func (w *Window) FillString(text string, pair ColorPair, a Attr) bool { func (w *Window) FillString(text string, pair ColorPair, a Attr) bool {
lx := 0 lx := 0
//TODO: respect attr var style tcell.Style
style := pair.style(). if _color {
style = pair.style()
} else {
style = ColDefault.style()
}
style = style.
Blink(a&Attr(tcell.AttrBlink) != 0). Blink(a&Attr(tcell.AttrBlink) != 0).
Bold(a&Attr(tcell.AttrBold) != 0). Bold(a&Attr(tcell.AttrBold) != 0).
Dim(a&Attr(tcell.AttrDim) != 0). Dim(a&Attr(tcell.AttrDim) != 0).
@ -537,7 +551,12 @@ func (w *Window) DrawBorder() {
top := w.Top top := w.Top
bot := top + w.Height bot := top + w.Height
style := ColBorder.style() var style tcell.Style
if _color {
style = ColBorder.style()
} else {
style = ColDefault.style()
}
for x := left; x < right; x++ { for x := left; x < right; x++ {
_screen.SetContent(x, top, tcell.RuneHLine, nil, style) _screen.SetContent(x, top, tcell.RuneHLine, nil, style)