milarin/tui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrated to milar.in

Browse Source
This commit is contained in:
milarin 2023-04-24 11:55:04 +02:00
parent 2dbd0cc15e
commit 109e2a9efd
19 changed files with 59 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
go.mod
View File

@ -1,11 +1,12 @@
module git.tordarus.net/Tordarus/tui module git.milar.in/milarin/tui
go 1.18 go 1.18
require ( require (
git.tordarus.net/Tordarus/adverr v0.2.0 git.milar.in/milarin/adverr v1.1.0
git.tordarus.net/Tordarus/buf2d v1.1.6 git.milar.in/milarin/buf2d v1.1.7
git.tordarus.net/Tordarus/dstruct v0.0.3 git.milar.in/milarin/ds v0.0.2
git.milar.in/milarin/gmath v0.0.3
github.com/gdamore/tcell v1.4.0 github.com/gdamore/tcell v1.4.0
github.com/mattn/go-runewidth v0.0.7 github.com/mattn/go-runewidth v0.0.7
) )

14
go.sum
View File

@ -1,9 +1,11 @@
git.tordarus.net/Tordarus/adverr v0.2.0 h1:kLYjR2/Vb2GHiSAMvAv+WPNaHR9BRphKanf8H/pCZdA= git.milar.in/milarin/adverr v1.1.0 h1:jD9WnOvs40lfMhvqQ7cllOaRJNBMWr1f07/s9jAadp0=
git.tordarus.net/Tordarus/adverr v0.2.0/go.mod h1:XRf0+7nhOkIEr0gi9DUG4RvV2KaOFB0fYPDaR1KLenw= git.milar.in/milarin/adverr v1.1.0/go.mod h1:joU9sBb7ySyNv4SpTXB0Z4o1mjXsArBw4N27wjgzj9E=
git.tordarus.net/Tordarus/buf2d v1.1.6 h1:qBLHSRj0eDxaG/IOUncJpWr1xwEKD4SCZReLo5r5eJw= git.milar.in/milarin/buf2d v1.1.7 h1:c+YEM4jthzaLmifx9PfP1Gy4ozQxh9+0menyShj0qU0=
git.tordarus.net/Tordarus/buf2d v1.1.6/go.mod h1:XXPpS8nQK0gUI0ki7ftV/qlprsGCRWFVSD4ybvDuUL8= git.milar.in/milarin/buf2d v1.1.7/go.mod h1:yiJgXMuUXTQ/Dzc/N3iIMa4riyL5y1aQgZOZfzNIWHo=
git.tordarus.net/Tordarus/dstruct v0.0.3 h1:cnUOM2rf96skIXGwBhSyzGMcT65ks8lFrOjpg6k23K8= git.milar.in/milarin/ds v0.0.2 h1:vCA3mDxZUNfvHpzrdz7SeBUKiPn74NTopo915IUG7I0=
git.tordarus.net/Tordarus/dstruct v0.0.3/go.mod h1:RvLL2G4lUCGzwr8KaBGQRi3qlMG0WTgGhcVN6iyZZuw= 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=
github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= 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/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU= github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU=

2
layouts/layout_border.go
View File

@ -1,7 +1,7 @@
package layouts package layouts
import ( 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 // BorderLayout ia a tui.Layout which places its children onto a given tui.Side

2
layouts/layout_coord.go
View File

@ -1,6 +1,6 @@
package layouts 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 // CoordLayout is a tui.Layout which places its children on predefined coordinates
type CoordLayout struct { type CoordLayout struct {

2
layouts/layout_flow.go
View File

@ -1,7 +1,7 @@
package layouts package layouts
import ( import (
"git.tordarus.net/Tordarus/tui" "git.milar.in/milarin/tui"
) )
// FlowLayout ia a tui.Layout which places its children in a linear layout // FlowLayout ia a tui.Layout which places its children in a linear layout

2
layouts/layout_separator.go
View File

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

29
layouts/utils.go
View File

@ -3,27 +3,10 @@ package layouts
import ( import (
"math" "math"
"git.tordarus.net/Tordarus/tui" "git.milar.in/milarin/gmath"
"git.milar.in/milarin/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 { func iff[T any](condition bool, trueValue, falseValue T) T {
if condition { if condition {
return trueValue return trueValue
@ -71,16 +54,16 @@ func CalculateLayoutResult(views []tui.View) *LayoutResult {
if width > 0 { if width > 0 {
result.Sum.Width += width result.Sum.Width += width
result.Min.Width = min(result.Min.Width, width) result.Min.Width = gmath.Min(result.Min.Width, width)
result.Max.Width = max(result.Max.Width, width) result.Max.Width = gmath.Max(result.Max.Width, width)
} else if width < 0 { } else if width < 0 {
result.HorizontalNegativeCount++ result.HorizontalNegativeCount++
} }
if height > 0 { if height > 0 {
result.Sum.Height += height result.Sum.Height += height
result.Min.Height = min(result.Min.Height, height) result.Min.Height = gmath.Min(result.Min.Height, height)
result.Max.Height = max(result.Max.Height, height) result.Max.Height = gmath.Max(result.Max.Height, height)
} else if height < 0 { } else if height < 0 {
result.VerticalNegativeCount++ result.VerticalNegativeCount++
} }

14
modals/modal_info.go
View File

@ -1,9 +1,7 @@
package modals package modals
import ( import (
"git.tordarus.net/Tordarus/tui" "git.milar.in/milarin/tui/views"
"git.tordarus.net/Tordarus/tui/views"
"github.com/gdamore/tcell"
) )
type InfoModal struct { type InfoModal struct {
@ -20,12 +18,12 @@ func NewInfoModal(message string) *InfoModal {
FrameView: fv, FrameView: fv,
} }
m.KeyPressed = func(event *tui.KeyEvent) (consumed bool) { // m.KeyPressed = func(event *tui.KeyEvent) (consumed bool) {
if event.Key() == tcell.KeyEnter || event.Key() == tcell.KeyESC { // // if event.Key() == tcell.KeyEnter || event.Key() == tcell.KeyESC {
} // // }
return true // return true
} // }
return m return m
} }

10
screen.go
View File

@ -3,9 +3,9 @@ package tui
import ( import (
"fmt" "fmt"
"git.tordarus.net/Tordarus/adverr" "git.milar.in/milarin/adverr"
"git.tordarus.net/Tordarus/buf2d" "git.milar.in/milarin/buf2d"
"git.tordarus.net/Tordarus/dstruct" "git.milar.in/milarin/ds"
"github.com/gdamore/tcell" "github.com/gdamore/tcell"
) )
@ -19,7 +19,7 @@ type Screen struct {
redrawCh chan struct{} redrawCh chan struct{}
started bool started bool
modals *dstruct.Stack[View] modals ds.Stack[View]
// Root is the root view which is currently shown on screen // Root is the root view which is currently shown on screen
Root View Root View
@ -36,7 +36,7 @@ func NewScreen(root View) (*Screen, error) {
scr: scr, scr: scr,
stopCh: make(chan error, 1), stopCh: make(chan error, 1),
redrawCh: make(chan struct{}, 1), redrawCh: make(chan struct{}, 1),
modals: dstruct.NewStack[View](), modals: ds.NewArrayStack[View](),
} }
s.KeyPressed = CloseOnCtrlC(s) s.KeyPressed = CloseOnCtrlC(s)

14
tests/screen_test.go
View File

@ -8,11 +8,12 @@ import (
"os" "os"
"strconv" "strconv"
"testing" "testing"
"time"
"git.tordarus.net/Tordarus/tui" "git.milar.in/milarin/tui"
"git.tordarus.net/Tordarus/tui/layouts" "git.milar.in/milarin/tui/layouts"
"git.tordarus.net/Tordarus/tui/modals" "git.milar.in/milarin/tui/modals"
"git.tordarus.net/Tordarus/tui/views" "git.milar.in/milarin/tui/views"
"github.com/gdamore/tcell" "github.com/gdamore/tcell"
) )
@ -133,6 +134,11 @@ func TestMousePosition(t *testing.T) {
modal := modals.NewInfoModal("Programm wird geschlossen") modal := modals.NewInfoModal("Programm wird geschlossen")
screen.OpenModal(modal) screen.OpenModal(modal)
go func() {
time.Sleep(3 * time.Second)
screen.Stop()
}()
if err := screen.Start(); err != nil { if err := screen.Start(); err != nil {
fmt.Println(err) fmt.Println(err)
} }

2
types.go
View File

@ -3,7 +3,7 @@ package tui
import ( import (
"fmt" "fmt"
"git.tordarus.net/Tordarus/buf2d" "git.milar.in/milarin/buf2d"
"github.com/gdamore/tcell" "github.com/gdamore/tcell"
) )

18
views/utils.go
View File

@ -1,23 +1,5 @@
package views package views
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 { func iff[T any](condition bool, trueValue, falseValue T) T {
if condition { if condition {
return trueValue return trueValue

2
views/view_border.go
View File

@ -1,6 +1,6 @@
package views 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. // 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. // Be aware that box drawing characters must share the same tui.Style with the next character.

7
views/view_constrain.go
View File

@ -1,7 +1,8 @@
package views package views
import ( 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 // 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() vw, vh := v.View().Layout()
prefWidth = iff(vw >= 0, min(vw, v.MaxWidth), v.MaxWidth) prefWidth = iff(vw >= 0, gmath.Min(vw, v.MaxWidth), v.MaxWidth)
prefHeight = iff(vh >= 0, min(vh, v.MaxHeight), v.MaxHeight) prefHeight = iff(vh >= 0, gmath.Min(vh, v.MaxHeight), v.MaxHeight)
return return
} }

2
views/view_frame.go
View File

@ -1,6 +1,6 @@
package views 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 // FrameView is a tui.Wrapper which draws its view preferably with preferred size on its tui.Anchor point
type FrameView struct { type FrameView struct {

2
views/view_grow.go
View File

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

2
views/view_margin.go
View File

@ -1,6 +1,6 @@
package views 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 // MarginView is a tui.Wrapper which applies margin around its view
type MarginView struct { type MarginView struct {

9
views/view_scroll.go
View File

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

2
views/view_text.go
View File

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