3 files changed, 58 insertions, 1 deletions
diff --git a/widgets/aerc.go b/widgets/aerc.go
index 49a61bd0..af2d0dff 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -122,6 +122,11 @@ func (aerc *Aerc) Event(event tcell.Event) bool {
 				aerc.BeginExCommand()
 				return true
 			}
+			interactive, ok := aerc.tabs.Tabs[aerc.tabs.Selected].Content.(ui.Interactive)
+			if ok {
+				return interactive.Event(event)
+			}
+			return false
 		}
 	}
 	return false
diff --git a/widgets/termhost.go b/widgets/termhost.go
new file mode 100644
index 00000000..7898b44c
--- /dev/null
+++ b/widgets/termhost.go
@@ -0,0 +1,52 @@
+package widgets
+
+import (
+	"github.com/gdamore/tcell"
+
+	"git.sr.ht/~sircmpwn/aerc2/config"
+	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
+)
+
+type TermHost struct {
+	grid *ui.Grid
+	term *Terminal
+}
+
+// Thin wrapper around terminal which puts it in a grid and passes through
+// input events. A bit of a hack tbh
+func NewTermHost(term *Terminal, conf *config.AercConfig) *TermHost {
+	grid := ui.NewGrid().Rows([]ui.GridSpec{
+		{ui.SIZE_WEIGHT, 1},
+	}).Columns([]ui.GridSpec{
+		{ui.SIZE_EXACT, conf.Ui.SidebarWidth},
+		{ui.SIZE_WEIGHT, 1},
+	})
+	grid.AddChild(term).At(0, 1)
+	return &TermHost{grid, term}
+}
+
+func (th *TermHost) Draw(ctx *ui.Context) {
+	th.grid.Draw(ctx)
+}
+
+func (th TermHost) Invalidate() {
+	th.grid.Invalidate()
+}
+
+func (th *TermHost) OnInvalidate(fn func(d ui.Drawable)) {
+	th.grid.OnInvalidate(func(_ ui.Drawable) {
+		fn(th)
+	})
+}
+
+func (th *TermHost) Event(event tcell.Event) bool {
+	return th.term.Event(event)
+}
+
+func (th *TermHost) Focus(focus bool) {
+	th.term.Focus(focus)
+}
+
+func (th *TermHost) Terminal() *Terminal {
+	return th.term
+}
diff --git a/widgets/terminal.go b/widgets/terminal.go
index 7726273b..098543fc 100644
--- a/widgets/terminal.go
+++ b/widgets/terminal.go
@@ -1,6 +1,7 @@
 package widgets
 
 import (
+	"fmt"
 	gocolor "image/color"
 	"os"
 	"os/exec"
@@ -188,7 +189,6 @@ func (term *Terminal) Focus(focus bool) {
 }
 
 func (term *Terminal) Event(event tcell.Event) bool {
-	// TODO
 	return false
 }