Add terminal command context

aerc.go

@@ -12,6 +12,7 @@ import (
 	"git.sr.ht/~sircmpwn/aerc2/config"
 	"git.sr.ht/~sircmpwn/aerc2/commands"
 	"git.sr.ht/~sircmpwn/aerc2/commands/account"
+	"git.sr.ht/~sircmpwn/aerc2/commands/terminal"
 	libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
 	"git.sr.ht/~sircmpwn/aerc2/widgets"
 )
@@ -20,8 +21,13 @@ func getCommands(selected libui.Drawable) []*commands.Commands {
 	switch selected.(type) {
 	case *widgets.AccountView:
 		return []*commands.Commands{
-			commands.GlobalCommands,
 			account.AccountCommands,
+			commands.GlobalCommands,
+		}
+	case *widgets.TermHost:
+		return []*commands.Commands{
+			terminal.TerminalCommands,
+			commands.GlobalCommands,
 		}
 	default:
 		return []*commands.Commands{commands.GlobalCommands}

commands/terminal/close.go

@@ -1,4 +1,4 @@
-package commands
+package terminal
 
 import (
 	"errors"
@@ -7,11 +7,10 @@ import (
 )
 
 func init() {
-	// TODO: Move this command into a terminal-specific command set
+	register("close", CommandClose)
-	register("close", TermClose)
 }
 
-func TermClose(aerc *widgets.Aerc, args []string) error {
+func CommandClose(aerc *widgets.Aerc, args []string) error {
 	if len(args) != 1 {
 		return errors.New("Usage: close")
 	}

commands/terminal/terminal.go

@@ -0,0 +1,16 @@
+package terminal
+
+import (
+	"git.sr.ht/~sircmpwn/aerc2/commands"
+)
+
+var (
+	TerminalCommands *commands.Commands
+)
+
+func register(name string, cmd commands.AercCommand) {
+	if TerminalCommands == nil {
+		TerminalCommands = commands.NewCommands()
+	}
+	TerminalCommands.Register(name, cmd)
+}