aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd/aerc/main.go44
-rw-r--r--lib/ui/borders.go (renamed from ui/borders.go)0
-rw-r--r--lib/ui/context.go (renamed from ui/context.go)0
-rw-r--r--lib/ui/drawable.go (renamed from ui/drawable.go)0
-rw-r--r--lib/ui/grid.go (renamed from ui/grid.go)0
-rw-r--r--lib/ui/interactive.go (renamed from ui/interactive.go)5
-rw-r--r--lib/ui/tab.go (renamed from ui/tab.go)0
-rw-r--r--lib/ui/text.go (renamed from ui/text.go)0
-rw-r--r--lib/ui/ui.go (renamed from ui/ui.go)0
-rw-r--r--widgets/account.go.old (renamed from ui/account.go.old)0
-rw-r--r--widgets/exline.go (renamed from ui/exline.go)10
11 files changed, 34 insertions, 25 deletions
diff --git a/cmd/aerc/main.go b/cmd/aerc/main.go
index 3ba9d1ad..2985e035 100644
--- a/cmd/aerc/main.go
+++ b/cmd/aerc/main.go
@@ -11,12 +11,13 @@ import (
tb "github.com/nsf/termbox-go"
"git.sr.ht/~sircmpwn/aerc2/config"
- "git.sr.ht/~sircmpwn/aerc2/ui"
+ libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
+ "git.sr.ht/~sircmpwn/aerc2/widgets"
)
type fill rune
-func (f fill) Draw(ctx *ui.Context) {
+func (f fill) Draw(ctx *libui.Context) {
for x := 0; x < ctx.Width(); x += 1 {
for y := 0; y < ctx.Height(); y += 1 {
ctx.SetCell(x, y, rune(f), tb.ColorDefault, tb.ColorDefault)
@@ -24,7 +25,7 @@ func (f fill) Draw(ctx *ui.Context) {
}
}
-func (f fill) OnInvalidate(callback func(d ui.Drawable)) {
+func (f fill) OnInvalidate(callback func(d libui.Drawable)) {
// no-op
}
@@ -48,38 +49,39 @@ func main() {
panic(err)
}
- tabs := ui.NewTabs()
+ tabs := libui.NewTabs()
tabs.Add(fill('★'), "白い星")
tabs.Add(fill('☆'), "empty stars")
- grid := ui.NewGrid().Rows([]ui.GridSpec{
- ui.GridSpec{ui.SIZE_EXACT, 1},
- ui.GridSpec{ui.SIZE_WEIGHT, 1},
- ui.GridSpec{ui.SIZE_EXACT, 1},
- }).Columns([]ui.GridSpec{
- ui.GridSpec{ui.SIZE_EXACT, 20},
- ui.GridSpec{ui.SIZE_WEIGHT, 1},
+ grid := libui.NewGrid().Rows([]libui.GridSpec{
+ libui.GridSpec{libui.SIZE_EXACT, 1},
+ libui.GridSpec{libui.SIZE_WEIGHT, 1},
+ libui.GridSpec{libui.SIZE_EXACT, 1},
+ }).Columns([]libui.GridSpec{
+ libui.GridSpec{libui.SIZE_EXACT, 20},
+ libui.GridSpec{libui.SIZE_WEIGHT, 1},
})
// TODO: move sidebar into tab content, probably
- grid.AddChild(ui.NewText("aerc").
- Strategy(ui.TEXT_CENTER).
+ grid.AddChild(libui.NewText("aerc").
+ Strategy(libui.TEXT_CENTER).
Color(tb.ColorBlack, tb.ColorWhite))
// sidebar placeholder:
- grid.AddChild(ui.NewBordered(
- fill('.'), ui.BORDER_RIGHT)).At(1, 0).Span(2, 1)
+ grid.AddChild(libui.NewBordered(
+ fill('.'), libui.BORDER_RIGHT)).At(1, 0).Span(2, 1)
grid.AddChild(tabs.TabStrip).At(0, 1)
grid.AddChild(tabs.TabContent).At(1, 1)
- exline := ui.NewExLine()
+ exline := widgets.NewExLine()
grid.AddChild(exline).At(2, 1)
- _ui, err := ui.Initialize(conf, grid)
+ ui, err := libui.Initialize(conf, grid)
if err != nil {
panic(err)
}
- defer _ui.Close()
+ defer ui.Close()
- _ui.AddInteractive(exline)
+ // TODO: this should be a stack
+ ui.AddInteractive(exline)
go (func() {
for {
@@ -88,8 +90,8 @@ func main() {
}
})()
- for !_ui.Exit {
- if !_ui.Tick() {
+ for !ui.Exit {
+ if !ui.Tick() {
// ~60 FPS
time.Sleep(16 * time.Millisecond)
}
diff --git a/ui/borders.go b/lib/ui/borders.go
index 08071ad0..08071ad0 100644
--- a/ui/borders.go
+++ b/lib/ui/borders.go
diff --git a/ui/context.go b/lib/ui/context.go
index ca3f4522..ca3f4522 100644
--- a/ui/context.go
+++ b/lib/ui/context.go
diff --git a/ui/drawable.go b/lib/ui/drawable.go
index ef094519..ef094519 100644
--- a/ui/drawable.go
+++ b/lib/ui/drawable.go
diff --git a/ui/grid.go b/lib/ui/grid.go
index ede7d0ca..ede7d0ca 100644
--- a/ui/grid.go
+++ b/lib/ui/grid.go
diff --git a/ui/interactive.go b/lib/ui/interactive.go
index 5dd5feff..8bdf592c 100644
--- a/ui/interactive.go
+++ b/lib/ui/interactive.go
@@ -8,3 +8,8 @@ type Interactive interface {
// Returns true if the event was handled by this component
Event(event tb.Event) bool
}
+
+type Simulator interface {
+ // Queues up the given input events for simulation
+ Simulate(events []tb.Event)
+}
diff --git a/ui/tab.go b/lib/ui/tab.go
index e6a8aa5f..e6a8aa5f 100644
--- a/ui/tab.go
+++ b/lib/ui/tab.go
diff --git a/ui/text.go b/lib/ui/text.go
index 61648374..61648374 100644
--- a/ui/text.go
+++ b/lib/ui/text.go
diff --git a/ui/ui.go b/lib/ui/ui.go
index 9ea037c3..9ea037c3 100644
--- a/ui/ui.go
+++ b/lib/ui/ui.go
diff --git a/ui/account.go.old b/widgets/account.go.old
index 393a47af..393a47af 100644
--- a/ui/account.go.old
+++ b/widgets/account.go.old
diff --git a/ui/exline.go b/widgets/exline.go
index a377cd71..092d6eb9 100644
--- a/ui/exline.go
+++ b/widgets/exline.go
@@ -1,7 +1,9 @@
-package ui
+package widgets
import (
tb "github.com/nsf/termbox-go"
+
+ "git.sr.ht/~sircmpwn/aerc2/lib/ui"
)
// TODO: history
@@ -16,7 +18,7 @@ type ExLine struct {
index int
scroll int
- onInvalidate func(d Drawable)
+ onInvalidate func(d ui.Drawable)
}
func NewExLine() *ExLine {
@@ -24,7 +26,7 @@ func NewExLine() *ExLine {
return &ExLine{command: &cmd}
}
-func (ex *ExLine) OnInvalidate(onInvalidate func(d Drawable)) {
+func (ex *ExLine) OnInvalidate(onInvalidate func(d ui.Drawable)) {
ex.onInvalidate = onInvalidate
}
@@ -34,7 +36,7 @@ func (ex *ExLine) Invalidate() {
}
}
-func (ex *ExLine) Draw(ctx *Context) {
+func (ex *ExLine) Draw(ctx *ui.Context) {
cell := tb.Cell{
Fg: tb.ColorDefault,
Bg: tb.ColorDefault,