From 60b351b78c930110716b0c9db2227e13704f826d Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 17 Feb 2018 16:35:36 -0500
Subject: Polish up grid and add new rendering loop

---
 cmd/aerc/main.go | 50 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 11 deletions(-)

(limited to 'cmd')

diff --git a/cmd/aerc/main.go b/cmd/aerc/main.go
index 4219978..1d11c5d 100644
--- a/cmd/aerc/main.go
+++ b/cmd/aerc/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
@@ -9,11 +8,30 @@ import (
 	"time"
 
 	"github.com/mattn/go-isatty"
+	tb "github.com/nsf/termbox-go"
 
 	"git.sr.ht/~sircmpwn/aerc2/config"
 	"git.sr.ht/~sircmpwn/aerc2/ui"
 )
 
+type fill rune
+
+func (f fill) Draw(ctx *ui.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)
+		}
+	}
+}
+
+func (f fill) OnInvalidate(callback func(d ui.Drawable)) {
+	// no-op
+}
+
+func (f fill) Invalidate() {
+	// no-op
+}
+
 func main() {
 	var logOut io.Writer
 	var logger *log.Logger
@@ -29,20 +47,30 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	_ui, err := ui.Initialize(conf)
+
+	grid := ui.NewGrid()
+	grid.Rows = []ui.DimSpec{
+		ui.DimSpec{ui.SIZE_EXACT, 4},
+		ui.DimSpec{ui.SIZE_WEIGHT, 1},
+		ui.DimSpec{ui.SIZE_WEIGHT, 1},
+		ui.DimSpec{ui.SIZE_EXACT, 1},
+	}
+	grid.Columns = []ui.DimSpec{
+		ui.DimSpec{ui.SIZE_WEIGHT, 3},
+		ui.DimSpec{ui.SIZE_WEIGHT, 2},
+	}
+	grid.AddChild(fill('★')).At(0, 0).Span(1, 2)
+	grid.AddChild(fill('☆')).At(1, 0).Span(1, 2)
+	grid.AddChild(fill('.')).At(2, 0).Span(1, 2)
+	grid.AddChild(fill('•')).At(2, 1).Span(1, 1)
+	grid.AddChild(fill('+')).At(3, 0).Span(1, 2)
+
+	_ui, err := ui.Initialize(conf, grid)
 	if err != nil {
 		panic(err)
 	}
 	defer _ui.Close()
-	for _, account := range conf.Accounts {
-		logger.Printf("Initializing account %s\n", account.Name)
-		tab, err := ui.NewAccountTab(&account, log.New(
-			logOut, fmt.Sprintf("[%s] ", account.Name), log.LstdFlags))
-		if err != nil {
-			panic(err)
-		}
-		_ui.AddTab(tab)
-	}
+
 	for !_ui.Exit {
 		if !_ui.Tick() {
 			time.Sleep(100 * time.Millisecond)
-- 
cgit v1.2.3