feat: export MakeRenderer

charmbracelet · Jan 8, 2024 · bf2f028 · bf2f028
1 parent 6bdc541
commit bf2f028
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 31 deletions.
diff --git a/bubbletea/tea_other.go b/bubbletea/tea_other.go
@@ -5,9 +5,18 @@ package bubbletea
 
 import (
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/ssh"
+	"github.com/muesli/termenv"
 )
 
+// MakeRenderer returns a new lipgloss.Renderer for the given ssh.Session.
+// It will use the pty if one is available, otherwise it will use the session
+// writer.
+func MakeRenderer(s ssh.Session) *lipgloss.Renderer {
+	return lipgloss.NewRenderer(s, termenv.WithUnsafe(), termenv.WithColorCache(true))
+}
+
 func makeIOOpts(s ssh.Session) []tea.ProgramOption {
 	return []tea.ProgramOption{
 		tea.WithInput(s),

diff --git a/bubbletea/tea_unix.go b/bubbletea/tea_unix.go
@@ -4,10 +4,26 @@
 package bubbletea
 
 import (
+	"io"
+
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/ssh"
+	"github.com/muesli/termenv"
 )
 
+// MakeRenderer returns a new lipgloss.Renderer for the given ssh.Session.
+// It will use the pty if one is available, otherwise it will use the session
+// writer.
+func MakeRenderer(s ssh.Session) *lipgloss.Renderer {
+	var f io.Writer = s
+	pty, _, ok := s.Pty()
+	if ok {
+		f = pty.Slave
+	}
+	return lipgloss.NewRenderer(f, termenv.WithColorCache(true))
+}
+
 func makeIOOpts(s ssh.Session) []tea.ProgramOption {
 	pty, _, ok := s.Pty()
 	if !ok || s.EmulatedPty() {

diff --git a/examples/wish-exec/main.go b/examples/wish-exec/main.go
@@ -60,7 +60,7 @@ func main() {
 }
 
 func teaHandler(s ssh.Session) (tea.Model, []tea.ProgramOption) {
-	renderer := newRenderer(s)
+	renderer := bm.MakeRenderer(s)
 	m := model{
 		sess:     s,
 		style:    renderer.NewStyle().Foreground(lipgloss.Color("8")),

diff --git a/examples/wish-exec/other.go b/examples/wish-exec/other.go
diff --git a/examples/wish-exec/unix.go b/examples/wish-exec/unix.go