From 8bfe6f82f1b26fb02085868ea7809611984b9e7d Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Thu, 20 Jun 2019 02:26:48 -0700
Subject: [PATCH] Re-do the formatting for help on menu control keys
and add the non-configurable keys: space, return, and escape.
---
doc/fixes36.3 | 3 ++-
src/options.c | 51 +++++++++++++++++++++++++++++++++++----------------
2 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 11ac2c882..8ae1adaa5 100644
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.58 $ $NHDT-Date: 1561018485 2019/06/20 08:14:45 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.59 $ $NHDT-Date: 1561022792 2019/06/20 09:26:32 $
This fixes36.3 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -76,6 +76,7 @@ if hero knows the number of charges in a wand or magical horn and a monster
for wizard mode 'monpolycontrol', allow usually disallowed type 'chameleon',
'doppelganger', or 'sandestin' as answer to "change <monster> @ <x,y>
into what?" prompt when <monster> is really that type of creature
+add Space, Return, and Escape to '? k' (help for menu control keys)
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
diff --git a/src/options.c b/src/options.c
index c92c5ab35..20c82ba4e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 options.c $NHDT-Date: 1560789054 2019/06/17 16:30:54 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.364 $ */
+/* NetHack 3.6 options.c $NHDT-Date: 1561022792 2019/06/20 09:26:32 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.365 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */
@@ -4280,36 +4280,55 @@ boolean dolist;
putstr(win, 0, buf);
}
} else {
+ const char
+ fmt3[] = " %-12s %-2s %-2s %s",
+ fmt2[] = " %-12s %-2s %-2s",
+ fmt1[] = " %10s %-2s %s",
+ fmt0[] = " %14s %s";
+
putstr(win, 0, "");
- putstr(win, 0, " Page All items");
- Sprintf(buf, " Select %s %s",
+ putstr(win, 0, "Selection: On page Full menu");
+ Sprintf(buf, fmt2, "Select all",
visctrl(get_menu_cmd_key(MENU_SELECT_PAGE)),
visctrl(get_menu_cmd_key(MENU_SELECT_ALL)));
putstr(win, 0, buf);
- Sprintf(buf, "Deselect %s %s",
+ Sprintf(buf, fmt2, "Deselect all",
visctrl(get_menu_cmd_key(MENU_UNSELECT_PAGE)),
visctrl(get_menu_cmd_key(MENU_UNSELECT_ALL)));
putstr(win, 0, buf);
- Sprintf(buf, " Invert %s %s",
+ Sprintf(buf, fmt2, "Invert all",
visctrl(get_menu_cmd_key(MENU_INVERT_PAGE)),
visctrl(get_menu_cmd_key(MENU_INVERT_ALL)));
putstr(win, 0, buf);
+ Sprintf(buf, fmt3, "Text match", "",
+ visctrl(get_menu_cmd_key(MENU_SEARCH)),
+ "Search and toggle matching entries");
+ putstr(win, 0, buf);
putstr(win, 0, "");
- Sprintf(buf, " Go to %s Next page",
- visctrl(get_menu_cmd_key(MENU_NEXT_PAGE)));
+ putstr(win, 0, "Navigation:");
+ Sprintf(buf, fmt1, "Go to ",
+ visctrl(get_menu_cmd_key(MENU_NEXT_PAGE)),
+ "Next page");
putstr(win, 0, buf);
- Sprintf(buf, " %s Previous page",
- visctrl(get_menu_cmd_key(MENU_PREVIOUS_PAGE)));
+ Sprintf(buf, fmt1, "",
+ visctrl(get_menu_cmd_key(MENU_PREVIOUS_PAGE)),
+ "Previous page");
putstr(win, 0, buf);
- Sprintf(buf, " %s First page",
- visctrl(get_menu_cmd_key(MENU_FIRST_PAGE)));
+ Sprintf(buf, fmt1, "",
+ visctrl(get_menu_cmd_key(MENU_FIRST_PAGE)),
+ "First page");
putstr(win, 0, buf);
- Sprintf(buf, " %s Last page",
- visctrl(get_menu_cmd_key(MENU_LAST_PAGE)));
+ Sprintf(buf, fmt1, "",
+ visctrl(get_menu_cmd_key(MENU_LAST_PAGE)),
+ "Last page");
putstr(win, 0, buf);
- putstr(win, 0, "");
- Sprintf(buf, " %s Search and toggle matching entries",
- visctrl(get_menu_cmd_key(MENU_SEARCH)));
+ Sprintf(buf, fmt0, "SPACE", "Next page, if any, otherwise RETURN");
+ putstr(win, 0, buf);
+ Sprintf(buf, fmt0, "RETURN/ENTER",
+ "Finish menu with any selection(s) made");
+ putstr(win, 0, buf);
+ Sprintf(buf, fmt0, "ESCAPE",
+ "Cancel menu without selecting anything");
putstr(win, 0, buf);
}
}
--
2.40.0