diff options
| -rw-r--r-- | aerc.go | 6 | ||||
| -rw-r--r-- | commands/msgview/close.go | 21 | ||||
| -rw-r--r-- | commands/msgview/msgview.go | 16 | ||||
| -rw-r--r-- | commands/terminal/close.go | 5 | ||||
| -rw-r--r-- | config/binds.conf | 2 | ||||
| -rw-r--r-- | widgets/aerc.go | 2 |
6 files changed, 47 insertions, 5 deletions
diff --git a/aerc.go b/aerc.go index ebf5068..25a8de6 100644 --- a/aerc.go +++ b/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/msgview" "git.sr.ht/~sircmpwn/aerc2/commands/terminal" libui "git.sr.ht/~sircmpwn/aerc2/lib/ui" "git.sr.ht/~sircmpwn/aerc2/widgets" @@ -24,6 +25,11 @@ func getCommands(selected libui.Drawable) []*commands.Commands { account.AccountCommands, commands.GlobalCommands, } + case *widgets.MessageViewer: + return []*commands.Commands{ + msgview.MessageViewCommands, + commands.GlobalCommands, + } case *widgets.Terminal: return []*commands.Commands{ terminal.TerminalCommands, diff --git a/commands/msgview/close.go b/commands/msgview/close.go new file mode 100644 index 0000000..404bb1c --- /dev/null +++ b/commands/msgview/close.go @@ -0,0 +1,21 @@ +package msgview + +import ( + "errors" + + "git.sr.ht/~sircmpwn/aerc2/widgets" +) + +func init() { + register("close", CommandClose) +} + +func CommandClose(aerc *widgets.Aerc, args []string) error { + if len(args) != 1 { + return errors.New("Usage: close") + } + mv, _ := aerc.SelectedTab().(*widgets.MessageViewer) + aerc.RemoveTab(mv) + return nil +} + diff --git a/commands/msgview/msgview.go b/commands/msgview/msgview.go new file mode 100644 index 0000000..e3db828 --- /dev/null +++ b/commands/msgview/msgview.go @@ -0,0 +1,16 @@ +package msgview + +import ( + "git.sr.ht/~sircmpwn/aerc2/commands" +) + +var ( + MessageViewCommands *commands.Commands +) + +func register(name string, cmd commands.AercCommand) { + if MessageViewCommands == nil { + MessageViewCommands = commands.NewCommands() + } + MessageViewCommands.Register(name, cmd) +} diff --git a/commands/terminal/close.go b/commands/terminal/close.go index 0a9d100..aee7f3e 100644 --- a/commands/terminal/close.go +++ b/commands/terminal/close.go @@ -14,10 +14,7 @@ func CommandClose(aerc *widgets.Aerc, args []string) error { if len(args) != 1 { return errors.New("Usage: close") } - term, ok := aerc.SelectedTab().(*widgets.Terminal) - if !ok { - return errors.New("Error: not a terminal") - } + term, _ := aerc.SelectedTab().(*widgets.Terminal) term.Close(nil) aerc.RemoveTab(term) return nil diff --git a/config/binds.conf b/config/binds.conf index 2037cec..520c731 100644 --- a/config/binds.conf +++ b/config/binds.conf @@ -32,7 +32,7 @@ c = :cf<space> $ = :term<space> | = :pipe<space> -[msgview] +[view] q = :close<Enter> | = :pipe<space> r = :reply<Enter> diff --git a/widgets/aerc.go b/widgets/aerc.go index a36db23..781cb2b 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -93,6 +93,8 @@ func (aerc *Aerc) getBindings() *config.KeyBindings { switch aerc.SelectedTab().(type) { case *AccountView: return aerc.conf.Bindings.MessageList + case *MessageViewer: + return aerc.conf.Bindings.MessageView case *Terminal: return aerc.conf.Bindings.Terminal default: |