GTK: SIGTERM/SIGHUP always terminates the program and dumps recovery files

* SIGTERM used to insert the ^KCLOSE key macro.
  However with the default ^KCLOSE macro, which inserts `EX`,
  this may fail to terminate the editor if buffers are modified.
  If the process is consequently killed by a non-ignorable signal,
  we may still loose data.
* SIGTERM is used to gracefully shut down, so we now always terminate.
  Since we have recovery files, they are now dumped before terminating.
  This makes sure that recovery files are more up-to-date during
  unexpected but gracefull terminations.
* The same functionality is planned on Curses, but requires more fundamental
  changes (TODO).

1 files changed, 26 insertions, 20 deletions

diff --git a/src/interface-gtk/interface.c b/src/interface-gtk/interface.c
index 1540245..a31790f 100644
--- a/src/interface-gtk/interface.c
+++ b/src/interface-gtk/interface.c
@@ -78,7 +78,7 @@ static void teco_interface_popup_clicked_cb(GtkWidget *popup, gchar *str, gulong
                                             gpointer user_data);
 static gboolean teco_interface_window_delete_cb(GtkWidget *widget, GdkEventAny *event,
                                                 gpointer user_data);
-static gboolean teco_interface_sigterm_handler(gpointer user_data) G_GNUC_UNUSED;
+static gboolean teco_interface_termination_handler(gpointer user_data) G_GNUC_UNUSED;
 static gchar teco_interface_get_ansi_key(GdkEventKey *event);
 
 #define TECO_UNNAMED_FILE	"(Unnamed)"
@@ -477,7 +477,7 @@ teco_interface_getch_process_event(GdkEvent *event, teco_int_t *cp)
 			*cp = TECO_CTL_KEY(g_ascii_toupper(*cp));
 			switch (*cp) {
 			case TECO_CTL_KEY('C'):
-				teco_interrupted = TRUE;
+				teco_interrupted = TECO_INTERRUPTED;
 				/* fall through */
 			case TECO_CTL_KEY('D'):
 				/* emulates EOF on stdin */
@@ -823,7 +823,7 @@ teco_interface_is_interrupted(void)
 {
 	if (!gtk_main_level())
 		/* batch mode */
-		return teco_interrupted != FALSE;
+		return teco_interrupted == TECO_INTERRUPTED;
 
 	/*
 	 * By polling only every TECO_POLL_INTERVAL microseconds
@@ -833,11 +833,11 @@ teco_interface_is_interrupted(void)
 	guint64 now_ts = g_get_monotonic_time();
 
 	if (G_LIKELY(last_poll_ts+TECO_POLL_INTERVAL > now_ts))
-		return teco_interrupted != FALSE;
+		return teco_interrupted == TECO_INTERRUPTED;
 	last_poll_ts = now_ts;
 
 	gtk_main_iteration_do(FALSE);
-	return teco_interrupted != FALSE;
+	return teco_interrupted == TECO_INTERRUPTED;
 }
 
 void
@@ -1298,13 +1298,12 @@ teco_interface_event_loop(GError **error)
 #endif
 
 	/*
-	 * SIGTERM emulates the "Close" key just like when
-	 * closing the window if supported by this version of glib.
-	 * Note that this replaces SciTECO's default SIGTERM handler
-	 * so it will additionally raise(SIGINT).
+	 * SIGTERM and SIGHUP terminate the program, but will
+	 * dump recovery files first (if enabled).
 	 */
 #ifdef G_OS_UNIX
-	g_unix_signal_add(SIGTERM, teco_interface_sigterm_handler, NULL);
+	g_unix_signal_add(SIGTERM, teco_interface_termination_handler, NULL);
+	g_unix_signal_add(SIGHUP, teco_interface_termination_handler, NULL);
 #endif
 
 	/* the interval might have been changed in the profile */
@@ -1428,7 +1427,7 @@ teco_interface_input_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 			 * If the execution thread is currently blocking,
 			 * the key is delivered like an ordinary key press.
 			 */
-			teco_interrupted = TRUE;
+			teco_interrupted = TECO_INTERRUPTED;
 		else
 			g_queue_push_tail(teco_interface.event_queue,
 			                  gdk_event_copy(event));
@@ -1469,7 +1468,7 @@ teco_interface_input_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 		const teco_view_t *last_view = teco_interface_current_view;
 		sptr_t last_vpos = teco_interface_ssm(SCI_GETFIRSTVISIBLELINE, 0, 0);
 
-		teco_interrupted = FALSE;
+		teco_interrupted = TECO_NORMAL;
 		switch (event->type) {
 		case GDK_KEY_PRESS:
 			teco_interface_handle_key_press(&event->key, &error);
@@ -1486,7 +1485,7 @@ teco_interface_input_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 		default:
 			g_assert_not_reached();
 		}
-		teco_interrupted = FALSE;
+		teco_interrupted = TECO_NORMAL;
 
 		teco_interface_update(teco_interface_current_view != last_view);
 		/* always expand folds, even after mouse clicks */
@@ -1596,16 +1595,23 @@ teco_interface_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer
 }
 
 static gboolean
-teco_interface_sigterm_handler(gpointer user_data)
+teco_interface_termination_handler(gpointer user_data)
 {
+	teco_interface_msg(TECO_MSG_WARNING, "Received termination signal - dumping recovery files");
+	teco_interrupted = TECO_TERMINATED;
+
 	/*
-	 * Similar to window deletion - emulate "close" key press.
+	 * This may be an emergency shutdown or another kind of
+	 * termination that we cannot ignore, so better dump
+	 * recovery files before terminating.
 	 */
-	GtkWidget *widget = teco_interface.window;
+	if (teco_ring_recovery_interval != 0)
+		teco_ring_dump_recovery();
 
-	g_autoptr(GdkEvent) close_event = gdk_event_new(GDK_KEY_PRESS);
-	close_event->key.window = gtk_widget_get_parent_window(widget);
-	close_event->key.keyval = GDK_KEY_Close;
+	/*
+	 * Otherwise we terminate and clean up as if by `-EX`.
+	 */
+	gtk_main_quit();
 
-	return teco_interface_input_cb(widget, close_event, NULL);
+	return G_SOURCE_REMOVE;
 }