confirm dialog for Reset triggered by menu or Alt+F8 (#1173),

user-definable function reset-noask
mintty · Oct 16, 2022 · 7c90db2 · 7c90db2
1 parent 5933cdd
commit 7c90db2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/docs/mintty.1 b/docs/mintty.1
@@ -892,7 +892,7 @@ Once keyboard selecting mode is entered, the following keys are applied:
 .br
 \(en \fBAlt+F4\fP: Close
 .br
-\(en \fBAlt+F8\fP: Reset
+\(en \fBAlt+F8\fP: Reset (with confirm dialog)
 .br
 \(en \fBAlt+F10\fP: Default terminal size (rows/columns)
 .br
@@ -974,7 +974,7 @@ Keys pane of the Options dialog.
 .br
 \(en \fBCtrl+Shift+W\fP: Close
 .br
-\(en \fBCtrl+Shift+R\fP: Reset
+\(en \fBCtrl+Shift+R\fP: Reset (without confirm dialog)
 .br
 \(en \fBCtrl+Shift+D\fP: Default terminal size (rows/columns)
 .br
@@ -2989,7 +2989,9 @@ Supported actions are described as follows:
 .br
 \(en \fBlock-title\fP: locks the window title from being changed
 .br
-\(en \fBreset\fP: resets the terminal
+\(en \fBreset\fP: resets the terminal (with confirm dialog)
+.br
+\(en \fBreset-noask\fP: resets the terminal (no confirm dialog)
 .br
 \(en \fBtek-reset\fP: Tek mode RESET
 .br

diff --git a/src/winids.h b/src/winids.h
@@ -28,6 +28,7 @@
 #define IDM_TEKPAGE         0x0260
 #define IDM_TEKCOPY         0x0360
 #define IDM_SAVEIMG         0x0460
+#define IDM_RESET_NOASK     0x0560
 #define IDM_DEFSIZE         0x0070
 #define IDM_DEFSIZE_ZOOM    0x0170
 #define IDM_SCROLLBAR       0x0280

diff --git a/src/wininput.c b/src/wininput.c
@@ -1720,6 +1720,7 @@ static struct function_def cmd_defs[] = {
   {"lock-title", {.fct = lock_title}, mflags_lock_title},
   {"clear-title", {.fct = clear_title}, 0},
   {"reset", {IDM_RESET}, 0},
+  {"reset-noask", {IDM_RESET_NOASK}, 0},
   {"tek-reset", {IDM_TEKRESET}, mflags_tek_mode},
   {"tek-page", {IDM_TEKPAGE}, mflags_tek_mode},
   {"tek-copy", {IDM_TEKCOPY}, mflags_tek_mode},
@@ -2822,7 +2823,7 @@ static LONG last_key_time = 0;
         when 'I': open_popup_menu(true, "ls", mods);
         when 'N': send_syscommand(IDM_TAB);  // deprecated default assignment
         when 'W': send_syscommand(SC_CLOSE);
-        when 'R': send_syscommand(IDM_RESET);
+        when 'R': send_syscommand(IDM_RESET_NOASK);
         when 'D': send_syscommand(IDM_DEFSIZE);
         when 'F': send_syscommand(cfg.zoom_font_with_window ? IDM_FULLSCREEN_ZOOM : IDM_FULLSCREEN);
         when 'S': send_syscommand(IDM_FLIPSCREEN);

diff --git a/src/winmain.c b/src/winmain.c
@@ -3090,6 +3090,19 @@ confirm_exit(void)
   return !ret || ret == IDOK;
 }
 
+static bool
+confirm_reset(void)
+{
+  int ret = message_box_w(
+              wnd, _W("Reset terminal?"),
+              W(APPNAME), MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2,
+              null
+            );
+
+  // Treat failure to show the dialog as confirmation.
+  return !ret || ret == IDOK;
+}
+
 void
 win_close(void)
 {
@@ -3577,9 +3590,14 @@ static struct {
         when IDM_TOGVT220KB: toggle_vt220();
         when IDM_PASTE: win_paste();
         when IDM_SELALL: term_select_all(); win_update(false);
-        when IDM_RESET: winimgs_clear(); term_reset(true); win_update(false);
-          if (tek_mode)
-            tek_reset();
+        when IDM_RESET or IDM_RESET_NOASK:
+          if ((wp & ~0xF) == IDM_RESET_NOASK || confirm_reset()) {
+            winimgs_clear();
+            term_reset(true);
+            win_update(false);
+            if (tek_mode)
+              tek_reset();
+          }
         when IDM_TEKRESET:
           if (tek_mode)
             tek_reset();

diff --git a/wiki/Changelog.md b/wiki/Changelog.md
@@ -20,9 +20,11 @@ Initialisation
 Configuration
   * Option OldKeyFunctionsKeypad (~#1161, not listed in manual).
   * Option LinkMod (#1169).
+  * New user-definable function reset-noask.
 
 Other
   * Fixed crash condition on user-defined commands (#1174).
+  * Add confirm dialog to Reset triggered by menu or Alt+F8 (#1173).
 
 ### 3.6.1 (24 April 2022) ###