X11: selectsaved

Implement the 'selectsaved' option for X11.  Requires that
SELECTSAVED be defined at compile time.

Behaves the same as for tty and curses except that if you
choose 'quit', the intended "until next time..." message doesn't
get delivered anywhere.

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index e19dddaf2c3a2ca6a604675dc48d1d352efa733c..2509c6bce7c12ab9577da1f725aa68489b46e25c 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -1,4 +1,4 @@
-NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.429 $ $NHDT-Date: 1610665839 2021/01/14 23:10:39 $
+NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.430 $ $NHDT-Date: 1611104371 2021/01/20 00:59:31 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -760,7 +760,7 @@ user_sounds: provide an experimental mechanism for terminal-side sounds similar
        requires compile-time definition of TTY_SOUND_ESCCODES (also requires
        terminal-side code external to NetHack to recognize the sequence and
        act on it)
-curses: implement save file selection menu
+curses: implement 'selectsaved', restore via menu of saved games
 Qt: the "paper doll" inventory subset can be controlled via the "Qt Settings"
        dialog box ("Preferences..." on OSX)
 Qt: draw a border around each tile in the paper doll inventory; when BUC is
@@ -784,6 +784,7 @@ tiles: male and female variations in monsters.txt; tested only with tile2bmp
        generate tile.c
 Unix: can define NOSUSPEND in config.h or src/Makefile's CFLAGS to prevent
        unixconf.h from enabling SUSPEND without need to modify unixconf.h
+X11: implement 'selectsaved', restore via menu of saved games
 
 
 NetHack Community Patches (or Variation) Included

diff --git a/win/X11/winX.c b/win/X11/winX.c
index 1a7a2297ae81d6e98a1abee1f76146c3a9202497..90a6c62eae8cae49a5ba1c02490f38a26d8bbddd 100644 (file)
--- a/win/X11/winX.c
+++ b/win/X11/winX.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 winX.c  $NHDT-Date: 1596498377 2020/08/03 23:46:17 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.87 $ */
+/* NetHack 3.7 winX.c  $NHDT-Date: 1611104371 2021/01/20 00:59:31 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.89 $ */
 /* Copyright (c) Dean Luick, 1992                                 */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -101,7 +101,7 @@ struct window_procs X11_procs = {
     ( WC_COLOR | WC_INVERSE | WC_HILITE_PET | WC_ASCII_MAP | WC_TILED_MAP
      | WC_PLAYER_SELECTION | WC_PERM_INVENT | WC_MOUSE_SUPPORT ),
     /* status requires VIA_WINDOWPORT(); WC2_FLUSH_STATUS ensures that */
-    ( WC2_FLUSH_STATUS
+    ( WC2_FLUSH_STATUS | WC2_SELECTSAVED
 #ifdef STATUS_HILITES
       | WC2_RESET_STATUS | WC2_HILITE_STATUS
 #endif
@@ -158,6 +158,7 @@ static void FDECL(X11_sig_cb, (XtPointer, XtSignalId *));
 #endif
 static void FDECL(d_timeout, (XtPointer, XtIntervalId *));
 static void FDECL(X11_hangup, (Widget, XEvent *, String *, Cardinal *));
+static void FDECL(X11_bail, (const char *));
 static void FDECL(askname_delete, (Widget, XEvent *, String *, Cardinal *));
 static void FDECL(askname_done, (Widget, XtPointer, XtPointer));
 static void FDECL(done_button, (Widget, XtPointer, XtPointer));
@@ -1709,6 +1710,19 @@ Cardinal *num_params;
     exit_x_event = TRUE;
 }
 
+/* X11_bail --------------------------------------------------------------- */
+/* clean up and quit */
+static void
+X11_bail(mesg)
+const char *mesg;
+{
+    g.program_state.something_worth_saving = 0;
+    clearlocks();
+    X11_exit_nhwindows(mesg);
+    nh_terminate(EXIT_SUCCESS);
+    /*NOTREACHED*/
+}
+
 /* askname ---------------------------------------------------------------- */
 /* ARGSUSED */
 static void
@@ -1770,6 +1784,19 @@ X11_askname()
     Widget popup, dialog;
     Arg args[1];
 
+#ifdef SELECTSAVED
+    if (iflags.wc2_selectsaved && !iflags.renameinprogress)
+        switch (restore_menu(WIN_MAP)) {
+        case -1: /* quit */
+            X11_bail("Until next time then...");
+            /*NOTREACHED*/
+        case 0: /* no game chosen; start new game */
+            break;
+        case 1: /* save game selected, plname[] has been set */
+            return;
+        }
+#endif /* SELECTSAVED */
+
     if (iflags.wc_player_selection == VIA_DIALOG) {
         /* X11_player_selection_dialog() handles name query */
         plsel_ask_name = TRUE;
@@ -1798,6 +1825,11 @@ X11_askname()
     /* The callback will enable the event loop exit. */
     (void) x_event(EXIT_ON_EXIT);
 
+    /* tty's character selection uses this; we might someday;
+       since we let user pick an arbitrary name now, he/she can
+       pick another one during role selection */
+    iflags.renameallowed = TRUE;
+
     XtDestroyWidget(dialog);
     XtDestroyWidget(popup);
 }