From b6e141ffca13909507657eddef42817cae907b71 Mon Sep 17 00:00:00 2001
From: Dmytro Maluka <dmitrymaluka@gmail.com>
Date: Sun, 14 Jul 2024 16:50:23 +0200
Subject: [PATCH] Fix termpane not closing automatically after terminal job
 finished

Fix regression caused by the fix 0de16334d384 ("micro: Don't forward
nil events into the sub event handler"): even if the terminal was
started with `wait` set to false, it is not closed immediately after
it finished its job, instead it shows "Press enter to close".

The reason is that since the commit b68461cf72cb ("Terminal plugin
callback support") the termpane code has been (slightly hackily) relying
on nil events as notifications to close the terminal after it finished
its job. So fix this by introducing a separate CloseTerms() function
for notifying termpanes about that, decoupled from HandleEvent() which
is for tcell events only.
---
 cmd/micro/micro.go          |  1 +
 internal/action/tab.go      | 11 +++++++++++
 internal/action/termpane.go |  9 +++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index f3c6acf1c8..7a3b21717d 100644
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -422,6 +422,7 @@ func DoEvent() {
 			b.AutoSave()
 		}
 	case <-shell.CloseTerms:
+		action.Tabs.CloseTerms()
 	case event = <-screen.Events:
 	case <-screen.DrawChan():
 		for len(screen.DrawChan()) > 0 {
diff --git a/internal/action/tab.go b/internal/action/tab.go
index f5ca7fa466..bde667a3a3 100644
--- a/internal/action/tab.go
+++ b/internal/action/tab.go
@@ -188,6 +188,17 @@ func (t *TabList) ResetMouse() {
 	}
 }
 
+// CloseTerms notifies term panes that a terminal job has finished.
+func (t *TabList) CloseTerms() {
+	for _, tab := range t.List {
+		for _, p := range tab.Panes {
+			if tp, ok := p.(*TermPane); ok {
+				tp.HandleTermClose()
+			}
+		}
+	}
+}
+
 // Tabs is the global tab list
 var Tabs *TabList
 
diff --git a/internal/action/termpane.go b/internal/action/termpane.go
index 46d14d91f0..6656a2cfdd 100644
--- a/internal/action/termpane.go
+++ b/internal/action/termpane.go
@@ -159,9 +159,9 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 		if t.Status != shell.TTDone {
 			t.WriteString(event.EscSeq())
 		}
-	} else if e, ok := event.(*tcell.EventMouse); e != nil && (!ok || t.State.Mode(terminal.ModeMouseMask)) {
+	} else if e, ok := event.(*tcell.EventMouse); !ok || t.State.Mode(terminal.ModeMouseMask) {
 		// t.WriteString(event.EscSeq())
-	} else if e != nil {
+	} else {
 		x, y := e.Position()
 		v := t.GetView()
 		x -= v.X
@@ -188,7 +188,12 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 			t.mouseReleased = true
 		}
 	}
+}
 
+// HandleTermClose is called when a terminal has finished its job
+// and should be closed. If that terminal is this termpane's terminal,
+// HandleTermClose will close the terminal and the termpane itself.
+func (t *TermPane) HandleTermClose() {
 	if t.Status == shell.TTClose {
 		t.Quit()
 	}