aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/aerc.go
diff options
context:
space:
mode:
authorTim Culverhouse <tim@timculverhouse.com>2022-09-28 13:17:21 -0500
committerRobin Jarry <robin@jarry.cc>2022-09-29 16:42:10 +0200
commit055c6dc6604f7f5ae7de060a36c81dc77801dca3 (patch)
tree06235c64c677f3a63ac020d6ef15940ba247d60b /widgets/aerc.go
parent75fc42e270b319efb322bd7eb2c1163a936e4516 (diff)
downloadaerc-055c6dc6604f7f5ae7de060a36c81dc77801dca3.tar.gz
exline: don't draw completions for keybinds
The exline widget works by matching actual keystrokes to a map of keybinds, and if a match is found sending simulated keystrokes through aerc. This has the effect of aerc thinking we are actually typing in the expanded command, and aerc attempts to draw the completions. This results in even basic navigation having two screen draws: For example, pressing 'j' to select the next message (:next), draws once for the initial key event and state change, and again after the completion debounce timer. Disable tab completion while aerc is simulating keystrokes. If the exline still has focus after simulating keystrokes, restore tab completion. Signed-off-by: Tim Culverhouse <tim@timculverhouse.com> Acked-by: Koni Marti <koni.marti@gmail.com>
Diffstat (limited to 'widgets/aerc.go')
-rw-r--r--widgets/aerc.go19
1 files changed, 16 insertions, 3 deletions
diff --git a/widgets/aerc.go b/widgets/aerc.go
index 4cd96a83..7209b2d8 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -274,6 +274,12 @@ func (aerc *Aerc) simulate(strokes []config.KeyStroke) {
aerc.Event(simulated)
}
aerc.simulating -= 1
+ // If we are still focused on the exline, turn on tab complete
+ if exline, ok := aerc.focused.(*ExLine); ok {
+ exline.TabComplete(func(cmd string) ([]string, string) {
+ return aerc.complete(cmd), ""
+ })
+ }
}
func (aerc *Aerc) Event(event tcell.Event) bool {
@@ -571,6 +577,15 @@ func (aerc *Aerc) focus(item ui.Interactive) {
func (aerc *Aerc) BeginExCommand(cmd string) {
previous := aerc.focused
+ var tabComplete func(string) ([]string, string)
+ if aerc.simulating != 0 {
+ // Don't try to draw completions for simulated events
+ tabComplete = nil
+ } else {
+ tabComplete = func(cmd string) ([]string, string) {
+ return aerc.complete(cmd), ""
+ }
+ }
exline := NewExLine(aerc.conf, cmd, func(cmd string) {
parts, err := shlex.Split(cmd)
if err != nil {
@@ -588,9 +603,7 @@ func (aerc *Aerc) BeginExCommand(cmd string) {
}, func() {
aerc.statusbar.Pop()
aerc.focus(previous)
- }, func(cmd string) ([]string, string) {
- return aerc.complete(cmd), ""
- }, aerc.cmdHistory)
+ }, tabComplete, aerc.cmdHistory)
aerc.statusbar.Push(exline)
aerc.focus(exline)
}