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)
-				x++
+
+			extraRuneCount := runewidth.RuneWidth(rn.Rn) - 1
+			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

@@ -1,10 +1,13 @@
-module git.tordarus.net/Tordarus/tui
+module git.milar.in/milarin/tui
 
 go 1.18
 
 require (
-	git.tordarus.net/Tordarus/adverr v0.2.0
-	git.tordarus.net/Tordarus/buf2d v1.1.4
+	git.milar.in/milarin/adverr v1.1.0
+	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

@@ -1,7 +1,13 @@
-git.tordarus.net/Tordarus/adverr v0.2.0 h1:kLYjR2/Vb2GHiSAMvAv+WPNaHR9BRphKanf8H/pCZdA=
-git.tordarus.net/Tordarus/adverr v0.2.0/go.mod h1:XRf0+7nhOkIEr0gi9DUG4RvV2KaOFB0fYPDaR1KLenw=
-git.tordarus.net/Tordarus/buf2d v1.1.4 h1:5R33Bq/no3uQIk7Tql6z55LI635DHeXQ7STNz0R7FQQ=
-git.tordarus.net/Tordarus/buf2d v1.1.4/go.mod h1:XXPpS8nQK0gUI0ki7ftV/qlprsGCRWFVSD4ybvDuUL8=
+git.milar.in/milarin/adverr v1.1.0 h1:jD9WnOvs40lfMhvqQ7cllOaRJNBMWr1f07/s9jAadp0=
+git.milar.in/milarin/adverr v1.1.0/go.mod h1:joU9sBb7ySyNv4SpTXB0Z4o1mjXsArBw4N27wjgzj9E=
+git.milar.in/milarin/buf2d v1.1.7 h1:c+YEM4jthzaLmifx9PfP1Gy4ozQxh9+0menyShj0qU0=
+git.milar.in/milarin/buf2d v1.1.7/go.mod h1:yiJgXMuUXTQ/Dzc/N3iIMa4riyL5y1aQgZOZfzNIWHo=
+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

@@ -1,7 +1,7 @@
-package views
+package layouts
 
 import (
-	"git.tordarus.net/Tordarus/tui"
+	"git.milar.in/milarin/tui"
 )
 
 // BorderLayout ia a tui.Layout which places its children onto a given tui.Side
@@ -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

@@ -1,6 +1,6 @@
-package views
+package layouts
 
-import "git.tordarus.net/Tordarus/tui"
+import "git.milar.in/milarin/tui"
 
 // CoordLayout is a tui.Layout which places its children on predefined coordinates
 type CoordLayout struct {
@@ -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

@@ -1,7 +1,7 @@
-package views
+package layouts
 
 import (
-	"git.tordarus.net/Tordarus/tui"
+	"git.milar.in/milarin/tui"
 )
 
 // FlowLayout ia a tui.Layout which places its children in a linear layout
@@ -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_grid.go

@@ -0,0 +1,3 @@
+package layouts
+
+// TODO

layouts/layout_separator.go

@@ -1,7 +1,7 @@
-package views
+package layouts
 
 import (
-	"git.tordarus.net/Tordarus/tui"
+	"git.milar.in/milarin/tui"
 )
 
 // SeperatorLayout ia a tui.Layout which separates its view into gravity-based portions
@@ -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
 }
 

layouts/utils.go

@@ -0,0 +1,73 @@
+package layouts
+
+import (
+	"math"
+
+	"git.milar.in/milarin/gmath"
+	"git.milar.in/milarin/tui"
+)
+
+func iff[T any](condition bool, trueValue, falseValue T) T {
+	if condition {
+		return trueValue
+	}
+	return falseValue
+}
+
+type LayoutResult struct {
+	Sizes map[tui.View]tui.Size
+
+	Sum  tui.Size
+	Min  tui.Size
+	Max  tui.Size
+	Pref tui.Size
+
+	Count int
+
+	VerticalNegativeCount   int
+	HorizontalNegativeCount int
+}
+
+func CalculateLayoutResult(views []tui.View) *LayoutResult {
+	result := &LayoutResult{
+		Sizes: map[tui.View]tui.Size{},
+
+		Sum: tui.Size{Width: 0, Height: 0},
+		Min: tui.Size{Width: math.MaxInt, Height: math.MaxInt},
+		Max: tui.Size{Width: -1, Height: -1},
+
+		Count: 0,
+
+		VerticalNegativeCount:   0,
+		HorizontalNegativeCount: 0,
+	}
+
+	for _, view := range views {
+		if view == nil {
+			continue
+		}
+
+		result.Count++
+
+		width, height := view.Layout()
+		result.Sizes[view] = tui.Size{Width: width, Height: height}
+
+		if width > 0 {
+			result.Sum.Width += width
+			result.Min.Width = gmath.Min(result.Min.Width, width)
+			result.Max.Width = gmath.Max(result.Max.Width, width)
+		} else if width < 0 {
+			result.HorizontalNegativeCount++
+		}
+
+		if height > 0 {
+			result.Sum.Height += height
+			result.Min.Height = gmath.Min(result.Min.Height, height)
+			result.Max.Height = gmath.Max(result.Max.Height, height)
+		} else if height < 0 {
+			result.VerticalNegativeCount++
+		}
+	}
+
+	return result
+}

modals/modal_info.go

@@ -0,0 +1,29 @@
+package modals
+
+import (
+	"git.milar.in/milarin/tui/views"
+)
+
+type InfoModal struct {
+	*views.FrameView
+}
+
+func NewInfoModal(message string) *InfoModal {
+	tv := views.NewTextView(message)
+	bv := views.NewBorderView(views.NewMarginView(tv, 0, 1, 0, 1))
+	fv := views.NewFrameView(bv)
+	fv.DontClearBuffer = true
+
+	m := &InfoModal{
+		FrameView: fv,
+	}
+
+	// m.KeyPressed = func(event *tui.KeyEvent) (consumed bool) {
+	// 	// if event.Key() == tcell.KeyEnter || event.Key() == tcell.KeyESC {
+
+	// 	// }
+	// 	return true
+	// }
+
+	return m
+}

screen.go

@@ -3,8 +3,9 @@ package tui
 import (
 	"fmt"
 
-	"git.tordarus.net/Tordarus/adverr"
-	"git.tordarus.net/Tordarus/buf2d"
+	"git.milar.in/milarin/adverr"
+	"git.milar.in/milarin/buf2d"
+	"git.milar.in/milarin/ds"
 	"github.com/gdamore/tcell"
 )
 
@@ -16,9 +17,19 @@ type Screen struct {
 
 	stopCh   chan error
 	redrawCh chan struct{}
+	started  bool
+
+	modals ds.Stack[View]
 
 	// 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) {
@@ -32,13 +43,11 @@ func NewScreen(root View) (*Screen, error) {
 		scr:      scr,
 		stopCh:   make(chan error, 1),
 		redrawCh: make(chan struct{}, 1),
+		modals:   ds.NewArrayStack[View](),
 	}
 
 	s.KeyPressed = CloseOnCtrlC(s)
 
-	go s.eventloop()
-	go s.drawloop()
-
 	return s, nil
 }
 
@@ -49,9 +58,14 @@ func (s *Screen) Start() error {
 	}
 
 	defer s.scr.Fini()
-	//defer close(s.redrawCh)
+	defer close(s.redrawCh)
 
 	s.scr.EnableMouse()
+
+	go s.eventloop()
+	go s.drawloop()
+
+	s.started = true
 	return <-s.stopCh
 }
 
@@ -64,6 +78,11 @@ func (s *Screen) StopWithError(err error) {
 }
 
 func (s *Screen) onKeyPressed(event *KeyEvent) {
+	if !s.modals.Empty() {
+		s.modals.Peek().OnKeyPressed(event)
+		return
+	}
+
 	if s.KeyPressed == nil || !s.KeyPressed(event) {
 		s.Root.OnKeyPressed(event)
 	}
@@ -71,12 +90,20 @@ func (s *Screen) onKeyPressed(event *KeyEvent) {
 }
 
 func (s *Screen) onMouseEvent(event *MouseEvent) {
-	if s.MouseEvent == nil || !s.MouseEvent(event) {
-		s.Root.OnMouseEvent(event)
-	}
 	if event.Button != MouseButtonNone {
-		s.Redraw()
+		defer s.Redraw()
 	}
+
+	if !s.modals.Empty() {
+		s.modals.Peek().OnMouseEvent(event)
+		return
+	}
+
+	if s.MouseEvent != nil && s.MouseEvent(event) {
+		return
+	}
+
+	s.Root.OnMouseEvent(event)
 }
 
 func convertMouseEvent(original *tcell.EventMouse) *MouseEvent {
@@ -89,7 +116,9 @@ func convertMouseEvent(original *tcell.EventMouse) *MouseEvent {
 }
 
 func (s *Screen) Redraw() {
-	s.redrawCh <- struct{}{}
+	if s.started {
+		s.redrawCh <- struct{}{}
+	}
 }
 
 func (s *Screen) eventloop() {
@@ -120,17 +149,39 @@ func (s *Screen) drawloop() {
 	defer s.handlePanic("panicked while redrawing")
 
 	for range s.redrawCh {
-		w, h := s.scr.Size()
+		s.prepareViewBuffer()
 
+		// draw root view
+		rw, rh := s.Root.Layout()
+		s.Root.Draw(truncateBuffer(s.buf, rw, rh))
+
+		// draw modals
+		for i := 0; i < s.modals.Size(); i++ {
+			v := s.modals.PeekAt(i)
+			mw, mh := v.Layout()
+			v.Draw(s.buf.Sub(0, 0, iff(mw >= 0, mw, s.buf.Width()), iff(mh >= 0, mh, s.buf.Height())))
+		}
+
+		// draw buffer onto screen
+		drawBuffer(s.scr, s.buf)
+	}
+}
+
+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)
 		}
-
-		rw, rh := s.Root.Layout()
-		s.Root.Draw(truncateBuffer(s.buf, rw, rh))
-		drawBuffer(s.scr, s.buf)
 	}
 }
 
@@ -143,3 +194,13 @@ func (s *Screen) handlePanic(msg string) {
 		}
 	}
 }
+
+func (s *Screen) OpenModal(v View) {
+	s.modals.Push(v)
+	s.Redraw()
+}
+
+func (s *Screen) CloseModal() {
+	s.modals.Pop()
+	s.Redraw()
+}

tests/screen_test.go

@@ -8,9 +8,12 @@ import (
 	"os"
 	"strconv"
 	"testing"
+	"time"
 
-	"git.tordarus.net/Tordarus/tui"
-	"git.tordarus.net/Tordarus/tui/views"
+	"git.milar.in/milarin/tui"
+	"git.milar.in/milarin/tui/layouts"
+	"git.milar.in/milarin/tui/modals"
+	"git.milar.in/milarin/tui/views"
 	"github.com/gdamore/tcell"
 )
 
@@ -38,7 +41,7 @@ func TestScrollView(t *testing.T) {
 		textViews[i].SetStyle(textViews[i].Style().Foreground(tcell.ColorBlack).Background(tcell.Color(rand.Intn(int(tcell.ColorYellowGreen)))))
 	}
 
-	flowLayout := views.NewFlowLayout(tui.Vertical)
+	flowLayout := layouts.NewFlowLayout(tui.Vertical)
 	flowLayout.AppendViews(textViews...)
 
 	scrollView := views.NewScrollView(flowLayout)
@@ -83,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
@@ -128,6 +131,14 @@ func TestMousePosition(t *testing.T) {
 		return true
 	}
 
+	modal := modals.NewInfoModal("Programm wird geschlossen")
+	screen.OpenModal(modal)
+
+	go func() {
+		time.Sleep(3 * time.Second)
+		screen.Stop()
+	}()
+
 	if err := screen.Start(); err != nil {
 		fmt.Println(err)
 	}
@@ -137,7 +148,10 @@ func TestFlowLayout(t *testing.T) {
 	textView := views.NewTextView("hello world!")
 	textView.SetStyle(tui.StyleDefault.Background(tcell.ColorRed).Foreground(tcell.ColorBlack))
 
-	marginView := views.NewMarginView(textView, 3, 1, 1, 0)
+	textView.MouseEvent = func(event *tui.MouseEvent) (consumed bool) {
+		textView.Text = "hi"
+		return true
+	}
 
 	//borderView := views.NewBorderView(textView)
 
@@ -150,28 +164,15 @@ func TestFlowLayout(t *testing.T) {
 	growView2 := views.NewGrowView(nil)
 	growView2.SetStyle(tui.StyleDefault.Background(tcell.ColorYellow))
 
-	flowLayout := views.NewFlowLayout(tui.Vertical)
-	flowLayout.AppendViews(marginView, growView, textView2)
+	flowLayout := layouts.NewFlowLayout(tui.Vertical)
+	flowLayout.AppendViews(textView, growView, textView2)
 
-	constrainView := views.NewConstrainView(flowLayout, -1, -1)
-	constrainView.SetStyle(tui.StyleDefault.Background(tcell.ColorPurple))
-
-	screen, err := tui.NewScreen(constrainView)
+	screen, err := tui.NewScreen(flowLayout)
 	if err != nil {
 		t.Error(err)
 		return
 	}
 
-	screen.KeyPressed = func(event *tui.KeyEvent) (consumed bool) {
-		textView.Text = event.When().String()
-
-		if event.Key() == tcell.KeyCtrlC {
-			screen.StopWithError(errors.New(fmt.Sprintf("key: %#v | rune: %s", event.Key(), string(event.Rune()))))
-		}
-
-		return true
-	}
-
 	err = screen.Start()
 	fmt.Println(err)
 }
@@ -191,7 +192,7 @@ func TestSeparatorLayout(t *testing.T) {
 	growView2 := views.NewGrowView(nil)
 	growView2.SetStyle(tui.StyleDefault.Background(tcell.ColorYellow))
 
-	separatorLayout := views.NewSeparatorLayout(tui.Vertical)
+	separatorLayout := layouts.NewSeparatorLayout(tui.Vertical)
 	separatorLayout.AppendView(frameView, 1)
 	separatorLayout.AppendView(growView, 1)
 	separatorLayout.AppendView(textView2, 1)
@@ -270,13 +271,13 @@ func TestBorderLayout(t *testing.T) {
 		return false
 	}
 
-	borderLayout := views.NewBorderLayout()
+	borderLayout := layouts.NewBorderLayout()
 	borderLayout.SetStyle(tui.StyleDefault.Background(tcell.ColorPurple))
-	borderLayout.SetView(topView, views.Top)
-	borderLayout.SetView(bottomView, views.Bottom)
-	borderLayout.SetView(leftView, views.Left)
-	borderLayout.SetView(rightView, views.Right)
-	borderLayout.SetView(centerView, views.Center)
+	borderLayout.SetView(topView, layouts.Top)
+	borderLayout.SetView(bottomView, layouts.Bottom)
+	borderLayout.SetView(leftView, layouts.Left)
+	borderLayout.SetView(rightView, layouts.Right)
+	borderLayout.SetView(centerView, layouts.Center)
 
 	screen, err := tui.NewScreen(borderLayout)
 	if err != nil {

tmpl_modal.go

@@ -0,0 +1,21 @@
+package tui
+
+type ModalTmpl[T any] struct {
+	WrapperTmpl
+
+	resultCh chan T
+	screen   *Screen
+}
+
+var _ Modal[int] = &ModalTmpl[int]{}
+
+func (m *ModalTmpl[T]) Open(s *Screen) <-chan T {
+	m.resultCh = make(chan T)
+	m.screen = s
+	return m.resultCh
+}
+
+func (m *ModalTmpl[T]) Close(result T) {
+	m.resultCh <- result
+	m.screen.CloseModal() // TODO which modal
+}

types.go

@@ -3,7 +3,7 @@ package tui
 import (
 	"fmt"
 
-	"git.tordarus.net/Tordarus/buf2d"
+	"git.milar.in/milarin/buf2d"
 	"github.com/gdamore/tcell"
 )
 
@@ -23,7 +23,7 @@ func P(x, y int) Point {
 }
 
 func (p Point) In(d Dimension) bool {
-	return p.X > d.X && p.X < d.X+d.Width && p.Y > d.Y && p.Y < d.Y+d.Height
+	return p.X >= d.X && p.X < d.X+d.Width && p.Y >= d.Y && p.Y < d.Y+d.Height
 }
 
 func (p Point) String() string {

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
@@ -127,8 +114,13 @@ func CloseOnKeyPressed(screen *Screen, key tcell.Key) func(event *KeyEvent) (con
 	return func(event *KeyEvent) (consumed bool) {
 		if event.Key() == key {
 			screen.Stop()
-			return false
+			return true
 		}
-		return true
+
+		if screen.Root != nil {
+			return screen.Root.OnKeyPressed(event)
+		}
+
+		return false
 	}
 }

view.go

@@ -38,3 +38,13 @@ type Wrapper interface {
 	SetView(View)
 	View() View
 }
+
+// Modal defines the behavior of a Wrapper which captures
+// all screen space and all events when opened and can return results.
+// It can be used to make dialogs, alert boxes and context menus
+type Modal[T any] interface {
+	Wrapper
+
+	Open(s *Screen) <-chan T
+	Close(result T)
+}

views/layout_grid.go

@@ -1,3 +0,0 @@
-package views
-
-// TODO

views/utils.go

@@ -1,90 +1,8 @@
 package views
 
-import (
-	"math"
-
-	"git.tordarus.net/Tordarus/tui"
-)
-
-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 limit(v, minv, maxv int) int {
-	return min(max(v, minv), maxv)
-}
-
 func iff[T any](condition bool, trueValue, falseValue T) T {
 	if condition {
 		return trueValue
 	}
 	return falseValue
 }
-
-type LayoutResult struct {
-	Sizes map[tui.View]tui.Size
-
-	Sum  tui.Size
-	Min  tui.Size
-	Max  tui.Size
-	Pref tui.Size
-
-	Count int
-
-	VerticalNegativeCount   int
-	HorizontalNegativeCount int
-}
-
-func CalculateLayoutResult(views []tui.View) *LayoutResult {
-	result := &LayoutResult{
-		Sizes: map[tui.View]tui.Size{},
-
-		Sum: tui.Size{Width: 0, Height: 0},
-		Min: tui.Size{Width: math.MaxInt, Height: math.MaxInt},
-		Max: tui.Size{Width: -1, Height: -1},
-
-		Count: 0,
-
-		VerticalNegativeCount:   0,
-		HorizontalNegativeCount: 0,
-	}
-
-	for _, view := range views {
-		if view == nil {
-			continue
-		}
-
-		result.Count++
-
-		width, height := view.Layout()
-		result.Sizes[view] = tui.Size{Width: width, Height: height}
-
-		if width > 0 {
-			result.Sum.Width += width
-			result.Min.Width = min(result.Min.Width, width)
-			result.Max.Width = max(result.Max.Width, width)
-		} else if width < 0 {
-			result.HorizontalNegativeCount++
-		}
-
-		if height > 0 {
-			result.Sum.Height += height
-			result.Min.Height = min(result.Min.Height, height)
-			result.Max.Height = max(result.Max.Height, height)
-		} else if height < 0 {
-			result.VerticalNegativeCount++
-		}
-	}
-
-	return result
-}

views/view_border.go

@@ -1,6 +1,6 @@
 package views
 
-import "git.tordarus.net/Tordarus/tui"
+import "git.milar.in/milarin/tui"
 
 // BorderView is a tui.Wrapper which draws an ASCII border around its view.
 // Be aware that box drawing characters must share the same tui.Style with the next character.
@@ -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++
 			}
 		}

views/view_constrain.go

@@ -1,7 +1,8 @@
 package views
 
 import (
-	"git.tordarus.net/Tordarus/tui"
+	"git.milar.in/milarin/gmath"
+	"git.milar.in/milarin/tui"
 )
 
 // ConstrainView is a tui.Wrapper which constrains the dimensions of its View
@@ -30,7 +31,7 @@ func (v *ConstrainView) Layout() (prefWidth, prefHeight int) {
 	}
 
 	vw, vh := v.View().Layout()
-	prefWidth = iff(vw >= 0, min(vw, v.MaxWidth), v.MaxWidth)
-	prefHeight = iff(vh >= 0, min(vh, v.MaxHeight), v.MaxHeight)
+	prefWidth = iff(vw >= 0, gmath.Min(vw, v.MaxWidth), v.MaxWidth)
+	prefHeight = iff(vh >= 0, gmath.Min(vh, v.MaxHeight), v.MaxHeight)
 	return
 }

views/view_frame.go

@@ -1,11 +1,13 @@
 package views
 
-import "git.tordarus.net/Tordarus/tui"
+import "git.milar.in/milarin/tui"
 
 // FrameView is a tui.Wrapper which draws its view preferably with preferred size on its tui.Anchor point
 type FrameView struct {
 	tui.WrapperTmpl
 	Anchor tui.Anchor
+
+	DontClearBuffer bool
 }
 
 var _ tui.Wrapper = &FrameView{}
@@ -18,7 +20,9 @@ func NewFrameView(view tui.View) *FrameView {
 }
 
 func (g *FrameView) Draw(buf *tui.ViewBuffer) {
-	g.ViewTmpl.Draw(buf)
+	if !g.DontClearBuffer {
+		g.ViewTmpl.Draw(buf)
+	}
 
 	w, h := g.View().Layout()
 	w = iff(w >= 0, w, buf.Width())

views/view_grow.go

@@ -1,7 +1,7 @@
 package views
 
 import (
-	"git.tordarus.net/Tordarus/tui"
+	"git.milar.in/milarin/tui"
 )
 
 // GrowView is a tui.Wrapper which always demands all available space

views/view_margin.go

@@ -1,6 +1,6 @@
 package views
 
-import "git.tordarus.net/Tordarus/tui"
+import "git.milar.in/milarin/tui"
 
 // MarginView is a tui.Wrapper which applies margin around its view
 type MarginView struct {

views/view_scroll.go

@@ -3,8 +3,9 @@ package views
 import (
 	"math"
 
-	"git.tordarus.net/Tordarus/buf2d"
-	"git.tordarus.net/Tordarus/tui"
+	"git.milar.in/milarin/buf2d"
+	"git.milar.in/milarin/gmath"
+	"git.milar.in/milarin/tui"
 	"github.com/gdamore/tcell"
 )
 
@@ -115,8 +116,8 @@ func (v *ScrollView) Layout() (prefWidth, prefHeight int) {
 
 func (v *ScrollView) Scroll(verticalOffset, horizontalOffset int) {
 	if v.buf != nil {
-		v.verticalScrollOffset = limit(v.verticalScrollOffset+verticalOffset, 0, max(v.buf.Height()-v.height, 0))
-		v.horizontalScrollOffset = limit(v.horizontalScrollOffset+horizontalOffset, 0, max(v.buf.Width()-v.width, 0))
+		v.verticalScrollOffset = gmath.Clamp(v.verticalScrollOffset+verticalOffset, 0, gmath.Max(v.buf.Height()-v.height, 0))
+		v.horizontalScrollOffset = gmath.Clamp(v.horizontalScrollOffset+horizontalOffset, 0, gmath.Max(v.buf.Width()-v.width, 0))
 	} else {
 		v.verticalScrollOffset = v.verticalScrollOffset + verticalOffset
 		v.horizontalScrollOffset = v.horizontalScrollOffset + horizontalOffset

views/view_text.go

@@ -1,7 +1,7 @@
 package views
 
 import (
-	"git.tordarus.net/Tordarus/tui"
+	"git.milar.in/milarin/tui"
 )
 
 // TextView is a tui.View which prints text