nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

duplicate options parsing for menu keys

Browse Source 
I'm sure that this could be improved but it is better than before....
This commit is contained in:
PatR
2021-03-10 13:17:19 -08:00
parent d8bef90009
commit fd8529b12a
2 changed files with 78 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/invent.c
View File

@@ -5,10 +5,6 @@
#include "hack.h"
#ifndef C /* same as cmd.c */
#define C(c) (0x1f & (c))
#endif
#define NOINVSYM '#'
#define CONTAINED_SYM '>' /* designator for inside a container */
#define HANDS_SYM '-'

304
src/options.c
View File

@@ -241,7 +241,8 @@ static void complain_about_duplicate(int);
static int length_without_val(const char *, int len);
static void determine_ambiguities(void);
static int check_misc_menu_command(char *, char *);
int spcfn_misc_menu_cmd(int, int, boolean, char *, char *);
static int shared_menu_optfn(int, int, boolean, char *, char *);
static int spcfn_misc_menu_cmd(int, int, boolean, char *, char *);
static const char *attr2attrname(int);
static void basic_menu_colors(boolean);
@@ -1459,9 +1460,11 @@ optfn_map_mode(int optidx, int req, boolean negated, char *opts, char *op)
return optn_ok;
}
/* all the key assignment options for menu_* commands are identical
but optlist.h treats them as distinct rather than sharing one */
static int
optfn_menu_deselect_all(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
shared_menu_optfn(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op)
{
if (req == do_init) {
return optn_ok;
@@ -1483,51 +1486,84 @@ optfn_menu_deselect_all(int optidx UNUSED, int req, boolean negated UNUSED,
}
static int
optfn_menu_deselect_page(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
optfn_menu_deselect_all(int optidx, int req, boolean negated,
char *opts, char *op)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_first_page(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
optfn_menu_deselect_page(int optidx, int req, boolean negated,
char *opts, char *op)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_first_page(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_invert_all(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_invert_page(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_last_page(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_next_page(int optidx , int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_previous_page(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_search(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_select_all(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
static int
optfn_menu_select_page(int optidx, int req, boolean negated,
char *opts, char *op)
{
return shared_menu_optfn(optidx, req, negated, opts, op);
}
/* end of shared key assignments for menu commands */
static int
optfn_menu_headings(int optidx, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
@@ -1560,190 +1596,6 @@ optfn_menu_headings(int optidx, int req, boolean negated UNUSED,
return optn_ok;
}
static int
optfn_menu_invert_all(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menu_invert_page(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menu_last_page(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menu_next_page(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menu_previous_page(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menu_search(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menu_select_all(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menu_select_page(int optidx UNUSED, int req, boolean negated UNUSED,
char *opts, char *op UNUSED)
{
if (req == do_init) {
return optn_ok;
}
if (req == do_set) {
int res = check_misc_menu_command(opts, op);
if (res < 0)
return optn_err;
return spcfn_misc_menu_cmd(res, req, negated, opts, op);
}
if (req == get_val) {
if (!opts)
return optn_err;
Sprintf(opts, "%s", to_be_done);
return optn_ok;
}
return optn_ok;
}
static int
optfn_menuinvertmode(int optidx, int req, boolean negated UNUSED,
char *opts, char *op)
@@ -4296,7 +4148,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op)
return optn_ok;
}
int
static int
spcfn_misc_menu_cmd(int midx, int req, boolean negated, char *opts, char *op)
{
if (req == do_init) {