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

change program_state.getting_a_command

Browse Source 
to program_state.input_state

Rename program_state.getting_a_command and give it an int value
instead of treating it as boolean.  Start using to it for Qt to
suppress commands initiated from the drop down menus in the title bar
if nethack isn't expecting to get a command from the user.  Those menu
choices inject extended command text into the input stream and should
be avoided when entering text or waiting for a menu to be dismissed.

These menus would be better if they grayed out unavailable choices
when pulled down instead of accepting any choice and then treating
that no good.  I'm not going to try to figure out to do that with Qt.
And this workaround for the menus doesn't have any affect on the
toolbar buttons below the title bar.  Those execute core commands
directly and when I tried to use jacket routines instead, the tool bar
stopped showing up so I've given up.

This won't fix the reported problem of getting stuck in a loop.
This commit is contained in:
PatR
2023-04-06 01:56:08 -07:00
parent 4927527493
commit 0d31bb8c88
6 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/hack.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 hack.h $NHDT-Date: 1664837602 2022/10/03 22:53:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.196 $ */
/* NetHack 3.7 hack.h $NHDT-Date: 1680771353 2023/04/06 08:55:53 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.215 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2017. */
/* NetHack may be freely redistributed. See license for details. */
@@ -749,10 +749,21 @@ struct sinfo {
int in_paniclog; /* writing a panicloc entry */
#endif
int wizkit_wishing; /* starting wizard mode game w/ WIZKIT file */
/* getting_a_command: only used for ALTMETA config to process ESC, but
present and updated unconditionally; set by parse() when requesting
next command keystroke, reset by readchar() as it returns a key */
int getting_a_command; /* next key pressed will be entering a cmnd */
/* input_state: used in the core for the 'altmeta' option to process ESC;
used in the curses interface to avoid arrow keys when user is doing
something other than entering a command or direction and in the Qt
interface to suppress menu commands in similar conditions;
readchar() alrways resets it to 'otherInp' prior to returning */
int input_state; /* whether next key pressed will be entering a command */
};
/* value of program_state.input_state, significant during readchar();
get_count() expects digits then a command so sets it to commandInp */
enum InputState {
otherInp = 0, /* 'other' */
commandInp = 1, /* readchar() */
getposInp = 2, /* getpos() */
getdirInp = 3, /* getdir() */
};
/* sortloot() return type; needed before extern.h */