fixed unicode characters on last column

draw_buffer.go

@@ -1,30 +1,36 @@
 package tui
 
 import (
+	"git.milar.in/milarin/slices"
 	"github.com/gdamore/tcell"
+	"github.com/mattn/go-runewidth"
 )
 
 func drawBuffer(scr tcell.Screen, buf *ViewBuffer) {
-	// buf.ForEach(func(x, y int, rn Rune) {
-	// 	scr.SetContent(x, y, rn.Rn, nil, rn.Style)
-	// })
-
-	// TODO use runewidth.RuneWidth(rn)?
 	buf.ForEachLine(func(y int, content []Rune) {
 		for x := 0; x < buf.Width(); x++ {
 			rn := content[x]
-			if rn.Rn >= '─' && rn.Rn <= '╿' {
+
-				scr.SetContent(x, y, rn.Rn, []rune{content[x+1].Rn}, rn.Style)
+			extraRuneCount := runewidth.RuneWidth(rn.Rn) - 1
-				x++
+			var extraRunes []Rune
+			if x+1+extraRuneCount < len(content) {
+				extraRunes = content[x+1 : x+1+extraRuneCount]
 			} else {
-				scr.SetContent(x, y, rn.Rn, nil, rn.Style)
+				extraRunes = content[x+1 : x+1]
 			}
+
+			scr.SetContent(x, y, rn.Rn, slices.Map(extraRunes, getRune), rn.Style)
+			x += extraRuneCount
 		}
 	})
 
 	scr.Show()
 }
 
+func getRune(rn Rune) rune {
+	return rn.Rn
+}
+
 func truncateBuffer(buf *ViewBuffer, w, h int) *ViewBuffer {
 	if w < 0 {
 		w = buf.Width()

go.mod

@@ -7,6 +7,7 @@ require (
 	git.milar.in/milarin/buf2d v1.1.7
 	git.milar.in/milarin/ds v0.0.2
 	git.milar.in/milarin/gmath v0.0.3
+	git.milar.in/milarin/slices v0.0.8
 	github.com/gdamore/tcell v1.4.0
 	github.com/mattn/go-runewidth v0.0.7
 )

go.sum

@@ -6,6 +6,8 @@ git.milar.in/milarin/ds v0.0.2 h1:vCA3mDxZUNfvHpzrdz7SeBUKiPn74NTopo915IUG7I0=
 git.milar.in/milarin/ds v0.0.2/go.mod h1:HJK7QERcRvV9j7xzEocrKUtW+1q4JB1Ly4Bj54chfwI=
 git.milar.in/milarin/gmath v0.0.3 h1:ii6rKNItS55O/wtIFhD1cTN2BMwDZjTBmiOocKURvxM=
 git.milar.in/milarin/gmath v0.0.3/go.mod h1:HDLftG5RLpiNGKiIWh+O2G1PYkNzyLDADO8Cd/1abiE=
+git.milar.in/milarin/slices v0.0.8 h1:qN9TE3tkArdTixMKSnwvNPcApwAjxpLVwA5a9k1rm2s=
+git.milar.in/milarin/slices v0.0.8/go.mod h1:qMhdtMnfWswc1rHpwgNw33lB84aNEkdBn5BDiYA+G3k=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU=

layouts/layout_border.go

@@ -138,8 +138,12 @@ func (g *BorderLayout) Layout() (prefWidth, prefHeight int) {
 }
 
 func (g *BorderLayout) OnKeyPressed(event *tui.KeyEvent) (consumed bool) {
+	if g.KeyPressed != nil {
+		return g.KeyPressed(event)
+	}
+
 	for _, view := range g.Views() {
-		if view.OnKeyPressed(event) {
+		if consumed := view.OnKeyPressed(event); consumed {
 			return true
 		}
 	}
@@ -147,6 +151,10 @@ func (g *BorderLayout) OnKeyPressed(event *tui.KeyEvent) (consumed bool) {
 }
 
 func (g *BorderLayout) OnMouseEvent(event *tui.MouseEvent) (consumed bool) {
+	if g.MouseEvent != nil {
+		return g.MouseEvent(event)
+	}
+
 	for slot, dim := range g.viewDims {
 		if event.Position.In(dim) {
 			g.views[slot].OnMouseEvent(event)

layouts/layout_coord.go

@@ -41,6 +41,10 @@ func (v *CoordLayout) Layout() (prefWidth, prefHeight int) {
 }
 
 func (g *CoordLayout) OnKeyPressed(event *tui.KeyEvent) (consumed bool) {
+	if g.KeyPressed != nil {
+		return g.KeyPressed(event)
+	}
+
 	for _, view := range g.Views() {
 		if view.OnKeyPressed(event) {
 			return true

layouts/layout_flow.go

@@ -141,6 +141,10 @@ func (g *FlowLayout) Layout() (prefWidth, prefHeight int) {
 }
 
 func (g *FlowLayout) OnKeyPressed(event *tui.KeyEvent) (consumed bool) {
+	if g.KeyPressed != nil {
+		return g.KeyPressed(event)
+	}
+
 	for _, view := range g.Views() {
 		if view.OnKeyPressed(event) {
 			return true

layouts/layout_separator.go

@@ -102,11 +102,16 @@ func (g *SeperatorLayout) Layout() (prefWidth, prefHeight int) {
 }
 
 func (g *SeperatorLayout) OnKeyPressed(event *tui.KeyEvent) (consumed bool) {
+	if g.KeyPressed != nil {
+		return g.KeyPressed(event)
+	}
+
 	for _, view := range g.Views() {
 		if view.OnKeyPressed(event) {
 			return true
 		}
 	}
+
 	return false
 }
 

screen.go

@@ -23,6 +23,13 @@ type Screen struct {
 
 	// Root is the root view which is currently shown on screen
 	Root View
+
+	// Some unicode characters need more bytes than one. For these characters,
+	// an additional last column will be provided in the internal view buffer.
+	// That way, these characters can also be shown on the right most column.
+	//
+	// You should enable this flag if you have missing unicode characters in the last column.
+	UnicodeSupport bool
 }
 
 func NewScreen(root View) (*Screen, error) {
@@ -41,9 +48,6 @@ func NewScreen(root View) (*Screen, error) {
 
 	s.KeyPressed = CloseOnCtrlC(s)
 
-	go s.eventloop()
-	go s.drawloop()
-
 	return s, nil
 }
 
@@ -57,6 +61,10 @@ func (s *Screen) Start() error {
 	defer close(s.redrawCh)
 
 	s.scr.EnableMouse()
+
+	go s.eventloop()
+	go s.drawloop()
+
 	s.started = true
 	return <-s.stopCh
 }
@@ -141,13 +149,7 @@ func (s *Screen) drawloop() {
 	defer s.handlePanic("panicked while redrawing")
 
 	for range s.redrawCh {
-		w, h := s.scr.Size()
+		s.prepareViewBuffer()
-
-		if s.buf == nil || s.buf.Width() != w || s.buf.Height() != h {
-			s.buf = buf2d.NewBuffer(w, h, DefaultRune)
-		} else {
-			s.buf.Fill(DefaultRune)
-		}
 
 		// draw root view
 		rw, rh := s.Root.Layout()
@@ -165,6 +167,24 @@ func (s *Screen) drawloop() {
 	}
 }
 
+func (s *Screen) prepareViewBuffer() {
+	w, h := s.scr.Size()
+
+	if s.UnicodeSupport {
+		if s.buf == nil || s.buf.Width() != w-1 || s.buf.Height() != h {
+			s.buf = buf2d.NewBuffer(w, h, DefaultRune).Sub(0, 0, w-1, h)
+		} else {
+			s.buf.Fill(DefaultRune)
+		}
+	} else {
+		if s.buf == nil || s.buf.Width() != w || s.buf.Height() != h {
+			s.buf = buf2d.NewBuffer(w, h, DefaultRune)
+		} else {
+			s.buf.Fill(DefaultRune)
+		}
+	}
+}
+
 func (s *Screen) handlePanic(msg string) {
 	if err := recover(); err != nil {
 		if e, ok := err.(error); ok {

tests/screen_test.go

@@ -86,11 +86,11 @@ func TestScrollView(t *testing.T) {
 }
 
 func TestBorderView(t *testing.T) {
-	textView := views.NewTextView("hello world!")
+	textView := views.NewTextView("hello world! こんにちは！")
 	borderView := views.NewBorderView(textView)
 	//borderView2 := views.NewBorderView(borderView)
 
-	screen, err := tui.NewScreen(borderView)
+	screen, err := tui.NewScreen(views.NewGrowView(borderView))
 	if err != nil {
 		t.Error(err)
 		return

utils.go

@@ -3,6 +3,7 @@ package tui
 import (
 	"strings"
 
+	"git.milar.in/milarin/gmath"
 	"github.com/gdamore/tcell"
 	"github.com/mattn/go-runewidth"
 )
@@ -32,7 +33,7 @@ func WriteMultiLineString(b *ViewBuffer, str string, style Style, x, y int) (max
 			return
 		}
 		lineWidth := WriteString(b, line, style, x, y+dy)
-		maxLineWidth = max(maxLineWidth, lineWidth)
+		maxLineWidth = gmath.Max(maxLineWidth, lineWidth)
 	}
 	return maxLineWidth, len(lines)
 }
@@ -51,7 +52,7 @@ func MeasureMultiLineString(str string) (maxLineWidth, lineCount int) {
 	lines := strings.Split(str, "\n")
 	for _, line := range lines {
 		lineWidth := MeasureString(line)
-		maxLineWidth = max(maxLineWidth, lineWidth)
+		maxLineWidth = gmath.Max(maxLineWidth, lineWidth)
 	}
 	return maxLineWidth, len(lines)
 }
@@ -69,20 +70,6 @@ func runeWidth(r rune) int {
 	// }
 }
 
-func min(x, y int) int {
-	if x < y {
-		return x
-	}
-	return y
-}
-
-func max(x, y int) int {
-	if x > y {
-		return x
-	}
-	return y
-}
-
 func iff[T any](condition bool, trueValue, falseValue T) T {
 	if condition {
 		return trueValue
@@ -129,6 +116,11 @@ func CloseOnKeyPressed(screen *Screen, key tcell.Key) func(event *KeyEvent) (con
 			screen.Stop()
 			return true
 		}
+
+		if screen.Root != nil {
+			return screen.Root.OnKeyPressed(event)
+		}
+
 		return false
 	}
 }

views/view_border.go

@@ -101,9 +101,9 @@ func (v *BorderView) Layout() (prefWidth, prefHeight int) {
 
 	for side, border := range v.ShowBorder {
 		if border {
-			if side.Horizontal() {
+			if side.Horizontal() && w >= 0 {
 				w++
-			} else if side.Vertical() {
+			} else if side.Vertical() && h >= 0 {
 				h++
 			}
 		}