From a49caf96b5419150989c2517fdb8f0aca7cfe92d Mon Sep 17 00:00:00 2001 From: Tim Culverhouse Date: Thu, 6 Oct 2022 11:46:43 -0500 Subject: [PATCH] terminal: use Invalidate and QueueRedraw The terminal widget uses it's own redraw logic to improve performance. With the addition of a main event loop, the redraw logic can happen in the main loop via the standard Invalidate logic. Use the Invalidate method to mark aerc invalid, and immediately trigger a redraw with ui.QueueRedraw. The follow up call to QueueRedraw is needed because the terminal update happens in a separate goroutine. This can result in the main event loop finishing it's process of the current event, redrawing the screen, and the terminal having additional updates to be drawn. This fixes race conditions by drawing and calling screen.Show in a separate goroutine. Signed-off-by: Tim Culverhouse Acked-by: Robin Jarry --- widgets/terminal.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/widgets/terminal.go b/widgets/terminal.go index 82954a7..39cd9f2 100644 --- a/widgets/terminal.go +++ b/widgets/terminal.go @@ -148,20 +148,8 @@ func (term *Terminal) HandleEvent(ev tcell.Event) bool { } switch ev := ev.(type) { case *views.EventWidgetContent: - if !term.focus { - return false - } - // Draw here for performance improvement. We call draw again in - // the main Draw, but tcell-term only draws dirty cells, so it - // won't be too much extra CPU there. Drawing there is needed - // for certain msgviews, particularly if the pager command - // exits. - term.draw() - // Perform a tcell screen.Show() to show our updates - // immediately - if term.ctx != nil { - term.ctx.Show() - } + term.Invalidate() + ui.QueueRedraw() return true case *tcellterm.EventTitle: if term.OnTitle != nil {