From f77d7c2c3d578ae5a724e1e8b91656304dde75d0 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Tue, 14 May 2019 14:27:28 -0400
Subject: Add distinct keybindings for each compose view

---
 widgets/aerc.go    | 11 +++++++++--
 widgets/compose.go | 10 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'widgets')

diff --git a/widgets/aerc.go b/widgets/aerc.go
index fb109d4..61d4645 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -88,11 +88,18 @@ func (aerc *Aerc) Draw(ctx *libui.Context) {
 }
 
 func (aerc *Aerc) getBindings() *config.KeyBindings {
-	switch aerc.SelectedTab().(type) {
+	switch view := aerc.SelectedTab().(type) {
 	case *AccountView:
 		return aerc.conf.Bindings.MessageList
 	case *Composer:
-		return aerc.conf.Bindings.Compose
+		switch view.Bindings() {
+		case "compose::editor":
+			return aerc.conf.Bindings.ComposeEditor
+		case "compose::review":
+			return aerc.conf.Bindings.ComposeReview
+		default:
+			return aerc.conf.Bindings.Compose
+		}
 	case *MessageViewer:
 		return aerc.conf.Bindings.MessageView
 	case *Terminal:
diff --git a/widgets/compose.go b/widgets/compose.go
index 38c33fc..2daa29c 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -120,6 +120,16 @@ func (c *Composer) Close() {
 	}
 }
 
+func (c *Composer) Bindings() string {
+	if c.editor == nil {
+		return "compose::review"
+	} else if c.editor == c.focusable[c.focused] {
+		return "compose::editor"
+	} else {
+		return "compose"
+	}
+}
+
 func (c *Composer) Event(event tcell.Event) bool {
 	return c.focusable[c.focused].Event(event)
 }
-- 
cgit v1.2.3