Merge pull request #264 from dyc3/more-font-attrs

add remaining font modifiers: strikethrough, inverse, blink

Author: mum4k

cell/cell.go

@@ -29,6 +29,8 @@ type Options struct {
 	Italic        bool
 	Underline     bool
 	Strikethrough bool
+	Inverse       bool
+	Blink         bool
 }
 
 // Set allows existing options to be passed as an option.
@@ -88,9 +90,23 @@ func Underline() Option {
 	})
 }
 
-// Strikethrough strikes through the cell's text. Currently a no-op until tcell is updated to >= v2.0.0
+// Strikethrough strikes through the cell's text. Only works when using the tcell backend.
 func Strikethrough() Option {
 	return option(func(co *Options) {
 		co.Strikethrough = true
 	})
 }
+
+// Inverse inverts the colors of the cell's text.
+func Inverse() Option {
+	return option(func(co *Options) {
+		co.Inverse = true
+	})
+}
+
+// Blink makes the cell's text blink. Only works when using the tcell backend.
+func Blink() Option {
+	return option(func(co *Options) {
+		co.Blink = true
+	})
+}

cell/cell_test.go

@@ -80,12 +80,16 @@ func TestNewOptions(t *testing.T) {
 				Italic(),
 				Underline(),
 				Strikethrough(),
+				Inverse(),
+				Blink(),
 			},
 			want: &Options{
 				Bold:          true,
 				Italic:        true,
 				Underline:     true,
 				Strikethrough: true,
+				Inverse:       true,
+				Blink:         true,
 			},
 		},
 	}

terminal/tcell/cell_options.go

@@ -63,7 +63,13 @@ func cellOptsToStyle(opts *cell.Options, colorMode terminalapi.ColorMode) tcell.
 	fg := cellColor(colorToMode(opts.FgColor, colorMode))
 	bg := cellColor(colorToMode(opts.BgColor, colorMode))
 
-	// FIXME: tcell doesn't have a strikethrough style option until #254 is resolved.
-	st = st.Foreground(fg).Background(bg).Bold(opts.Bold).Italic(opts.Italic).Underline(opts.Underline)
+	st = st.Foreground(fg).
+		Background(bg).
+		Bold(opts.Bold).
+		Italic(opts.Italic).
+		Underline(opts.Underline).
+		StrikeThrough(opts.Strikethrough).
+		Reverse(opts.Inverse).
+		Blink(opts.Blink)
 	return st
 }

terminal/tcell/cell_options_test.go

@@ -310,6 +310,21 @@ func TestCellOptsToStyle(t *testing.T) {
 			opts:      cell.Options{Underline: true},
 			want:      tcell.StyleDefault.Underline(true),
 		},
+		{
+			colorMode: terminalapi.ColorModeNormal,
+			opts:      cell.Options{Strikethrough: true},
+			want:      tcell.StyleDefault.StrikeThrough(true),
+		},
+		{
+			colorMode: terminalapi.ColorModeNormal,
+			opts:      cell.Options{Inverse: true},
+			want:      tcell.StyleDefault.Reverse(true),
+		},
+		{
+			colorMode: terminalapi.ColorModeNormal,
+			opts:      cell.Options{Blink: true},
+			want:      tcell.StyleDefault.Blink(true),
+		},
 	}
 
 	for _, tc := range tests {

terminal/termbox/cell_options.go

@@ -49,17 +49,24 @@ func cellOptsToFg(opts *cell.Options) (tbx.Attribute, error) {
 	if opts.Bold {
 		a |= tbx.AttrBold
 	}
-	// FIXME: Termbox doesn't have an italics attribute
+	// Termbox doesn't have an italics attribute
 	if opts.Italic {
 		return 0, errors.New("Termbox: Unsupported attribute: Italic")
 	}
 	if opts.Underline {
 		a |= tbx.AttrUnderline
 	}
-	// FIXME: Termbox doesn't have a strikethrough attribute
+	// Termbox doesn't have a strikethrough attribute
 	if opts.Strikethrough {
 		return 0, errors.New("Termbox: Unsupported attribute: Strikethrough")
 	}
+	if opts.Inverse {
+		a |= tbx.AttrReverse
+	}
+	// Termbox doesn't have a blink attribute
+	if opts.Blink {
+		return 0, errors.New("Termbox: Unsupported attribute: Blink")
+	}
 	return a, nil
 }
 

terminal/termbox/cell_options_test.go

@@ -60,6 +60,8 @@ func TestCellFontModifier(t *testing.T) {
 		{cell.Options{Underline: true}, tbx.AttrUnderline, false},
 		{cell.Options{Italic: true}, 0, true},
 		{cell.Options{Strikethrough: true}, 0, true},
+		{cell.Options{Inverse: true}, tbx.AttrReverse, false},
+		{cell.Options{Blink: true}, 0, true},
 	}
 
 	for _, tc := range tests {