diff options
author | Christopher Vittal <christopher.vittal@gmail.com> | 2019-08-19 21:56:12 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-08-26 09:48:39 +0900 |
commit | ecd803aae4ea1ba23d291325d52a53c19216e64b (patch) | |
tree | a560d5a88b332a39c0519a21ae05f5dc309545a3 /widgets/aerc.go | |
parent | ea4fe713607e40cf19df37cdd0699cacba7313a3 (diff) | |
download | aerc-ecd803aae4ea1ba23d291325d52a53c19216e64b.tar.gz |
Add :prompt command
Usage:
:prompt <prompt> <command...>
Displays the prompt on the status bar, waits for user input, then
appends that input as the last argument to the command and executes it.
The input is passed as one argument to the command, unless it is empty,
in which case no extra argument is added.
Diffstat (limited to 'widgets/aerc.go')
-rw-r--r-- | widgets/aerc.go | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/widgets/aerc.go b/widgets/aerc.go index 5a7914a0..345f3ea4 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -30,6 +30,7 @@ type Aerc struct { statusbar *libui.Stack statusline *StatusLine pendingKeys []config.KeyStroke + prompts *libui.Stack tabs *libui.Tabs beep func() error } @@ -65,6 +66,7 @@ func NewAerc(conf *config.AercConfig, logger *log.Logger, logger: logger, statusbar: statusbar, statusline: statusline, + prompts: libui.NewStack(), tabs: tabs, } @@ -105,6 +107,20 @@ func (aerc *Aerc) Tick() bool { for _, acct := range aerc.accounts { more = acct.Tick() || more } + + if len(aerc.prompts.Children()) > 0 { + more = true + previous := aerc.focused + prompt := aerc.prompts.Pop().(*ExLine) + prompt.finish = func() { + aerc.statusbar.Pop() + aerc.focus(previous) + } + + aerc.statusbar.Push(prompt) + aerc.focus(prompt) + } + return more } @@ -358,8 +374,6 @@ func (aerc *Aerc) BeginExCommand() { if aerc.simulating == 0 { aerc.cmdHistory.Add(cmd) } - aerc.statusbar.Pop() - aerc.focus(previous) }, func() { aerc.statusbar.Pop() aerc.focus(previous) @@ -370,6 +384,22 @@ func (aerc *Aerc) BeginExCommand() { aerc.focus(exline) } +func (aerc *Aerc) RegisterPrompt(prompt string, cmd []string) { + p := NewPrompt(prompt, func(text string) { + if text != "" { + cmd = append(cmd, text) + } + err := aerc.cmd(cmd) + if err != nil { + aerc.PushStatus(" "+err.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }, func(cmd string) []string { + return nil // TODO: completions + }) + aerc.prompts.Push(p) +} + func (aerc *Aerc) Mailto(addr *url.URL) error { acct := aerc.SelectedAccount() if acct == nil { |