Add bold and underline

Author: mgazza

cmd/fyneterm/font/NotoSansMono/NotoSansMono-Bold.ttf

@@ -0,0 +1,26 @@
+package notosansmono
+
+import (
+	// go embed.
+	_ "embed"
+
+	"fyne.io/fyne/v2"
+)
+
+//go:embed NotoSansMono-Regular.ttf
+var regular []byte
+
+// Regular is the regular font resource.
+var Regular = &fyne.StaticResource{
+	StaticName:    "NotoSansMono-Regular.ttf",
+	StaticContent: regular,
+}
+
+//go:embed NotoSansMono-Bold.ttf
+var bold []byte
+
+// Bold is the bold font resource.
+var Bold = &fyne.StaticResource{
+	StaticName:    "NotoSansMono-Bold.ttf",
+	StaticContent: bold,
+}

cmd/fyneterm/font/NotoSansMono/NotoSansMono-Regular.ttf

@@ -5,6 +5,7 @@ import (
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/theme"
+	notosansmono "github.com/fyne-io/terminal/cmd/fyneterm/font/NotoSansMono"
 )
 
 type termTheme struct {
@@ -41,3 +42,12 @@ func (t *termTheme) Size(n fyne.ThemeSizeName) float32 {
 
 	return t.Theme.Size(n)
 }
+
+func (t *termTheme) Font(style fyne.TextStyle) fyne.Resource {
+	switch {
+	case style.Bold:
+		return notosansmono.Bold
+	default:
+		return notosansmono.Regular
+	}
+}

cmd/fyneterm/font/NotoSansMono/notosansmono.go

@@ -46,6 +46,7 @@ func (t *Terminal) handleColorEscape(message string) {
 		t.currentBG = nil
 		t.currentFG = nil
 		t.bold = false
+		t.underlined = false
 		t.blinking = false
 		return
 	}
@@ -82,10 +83,14 @@ func (t *Terminal) handleColorMode(modeStr string) {
 	case 0:
 		t.currentBG, t.currentFG = nil, nil
 		t.bold = false
+		t.underlined = false
 		t.blinking = false
 	case 1:
 		t.bold = true
-	case 4, 24: //italic
+	case 4:
+		t.underlined = true
+	case 24:
+		t.underlined = false
 	case 5:
 		t.blinking = true
 	case 7: // reverse

cmd/fyneterm/theme.go

@@ -40,13 +40,23 @@ func testColor(t *testing.T, tests map[string]struct {
 
 func TestHandleOutput_Text(t *testing.T) {
 	tests := map[string]struct {
-		inputSeq   string
-		expectBold bool
+		inputSeq        string
+		expectBold      bool
+		expectUnderline bool
 	}{
 		"bold": {
 			inputSeq:   esc("[1m"),
 			expectBold: true,
 		},
+		"underline": {
+			inputSeq:        esc("[4m"),
+			expectUnderline: true,
+		},
+		"bold and underline": {
+			inputSeq:        esc("[1m") + esc("[4m"),
+			expectBold:      true,
+			expectUnderline: true,
+		},
 	}
 
 	// Iterate through the test cases
@@ -55,6 +65,11 @@ func TestHandleOutput_Text(t *testing.T) {
 			terminal := New()
 			terminal.handleOutput([]byte(test.inputSeq))
 
+			// Verify the actual results match the expected results
+			if terminal.underlined != test.expectUnderline {
+				t.Errorf("Bold flag mismatch. Got %v, expected %v", terminal.underlined, test.expectUnderline)
+			}
+
 			if terminal.bold != test.expectBold {
 				t.Errorf("Bold flag mismatch. Got %v, expected %v", terminal.bold, test.expectBold)
 			}

color.go

@@ -14,9 +14,9 @@ func HighlightRange(t *widget.TextGrid, blockMode bool, startRow, startCol, endR
 		// Check if already highlighted
 		if h, ok := cell.Style.(*TermTextGridStyle); !ok {
 			if cell.Style != nil {
-				cell.Style = NewTermTextGridStyle(cell.Style.TextColor(), cell.Style.BackgroundColor(), bitmask, false)
+				cell.Style = NewTermTextGridStyle(cell.Style.TextColor(), cell.Style.BackgroundColor(), bitmask, false, false, false)
 			} else {
-				cell.Style = NewTermTextGridStyle(nil, nil, bitmask, false)
+				cell.Style = NewTermTextGridStyle(nil, nil, bitmask, false, false, false)
 			}
 			cell.Style.(*TermTextGridStyle).Highlighted = true
 
@@ -173,6 +173,8 @@ type TermTextGridStyle struct {
 	Highlighted             bool
 	BlinkEnabled            bool
 	Blink                   bool
+	IsBold                  bool
+	IsUnderlined            bool
 }
 
 // TextColor returns the color of the text, depending on whether it is highlighted.
@@ -197,6 +199,16 @@ func (h *TermTextGridStyle) BackgroundColor() color.Color {
 	return h.OriginalBackgroundColor
 }
 
+// Bold is the text bold or not.
+func (h *TermTextGridStyle) Bold() bool {
+	return h.IsBold
+}
+
+// Underlined is the text underlined or not.
+func (h *TermTextGridStyle) Underlined() bool {
+	return h.IsUnderlined
+}
+
 // HighlightOption defines a function type that can modify a TermTextGridStyle.
 type HighlightOption func(h *TermTextGridStyle)
 
@@ -214,7 +226,7 @@ type HighlightOption func(h *TermTextGridStyle)
 // Returns:
 //
 //	A pointer to a TermTextGridStyle initialized with the provided colors and inversion settings.
-func NewTermTextGridStyle(fg, bg color.Color, bitmask byte, blinkEnabled bool) widget.TextGridStyle {
+func NewTermTextGridStyle(fg, bg color.Color, bitmask byte, blinkEnabled, bold, underlined bool) widget.TextGridStyle {
 	// calculate the inverted colors
 	var invertedFg, invertedBg color.Color
 	if fg == nil {
@@ -236,6 +248,8 @@ func NewTermTextGridStyle(fg, bg color.Color, bitmask byte, blinkEnabled bool) w
 		Highlighted:             false,
 		BlinkEnabled:            blinkEnabled,
 		Blink:                   false,
+		IsBold:                  bold,
+		IsUnderlined:            underlined,
 	}
 }
 

color_test.go

@@ -190,18 +190,15 @@ func (t *Terminal) handleOutputChar(r rune) {
 		t.content.Rows = append(t.content.Rows, widget.TextGridRow{})
 	}
 
-	var cellStyle widget.TextGridStyle
-	cellStyle = &widget.CustomTextGridStyle{FGColor: t.currentFG, BGColor: t.currentBG}
+	cellStyle := widget2.NewTermTextGridStyle(t.currentFG, t.currentBG, t.highlightBitMask, t.blinking, t.bold, t.underlined)
 	for len(t.content.Rows[t.cursorRow].Cells)-1 < t.cursorCol {
 		newCell := widget.TextGridCell{
 			Rune:  ' ',
 			Style: cellStyle,
 		}
 		t.content.Rows[t.cursorRow].Cells = append(t.content.Rows[t.cursorRow].Cells, newCell)
 	}
-	if t.blinking {
-		cellStyle = widget2.NewTermTextGridStyle(t.currentFG, t.currentBG, t.highlightBitMask, t.blinking)
-	}
+
 	t.content.SetCell(t.cursorRow, t.cursorCol, widget.TextGridCell{Rune: r, Style: cellStyle})
 	t.cursorCol++
 }

internal/widget/textgrid.go

@@ -79,6 +79,7 @@ type Terminal struct {
 	newLineMode        bool // new line mode or line feed mode
 	bracketedPasteMode bool
 	blinking           bool
+	underlined         bool
 }
 
 // Cursor is used for displaying a specific cursor.