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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2018-12-15 19:41:59 -05:00
parent f80f20074e 718c029994
commit 08567ea6c0
12 changed files with 293 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/fixes36.2
View File

@@ -297,6 +297,8 @@ fix bit-use collision between WC2_TERM_SIZE and WC2_RESET_STATUS in
include/winprocs.h following a recent merge include/winprocs.h following a recent merge
fix foxen pluralization again after underflow remedy reintroduced the problem fix foxen pluralization again after underflow remedy reintroduced the problem
fix "placing monster over another?" warning for vault guards fix "placing monster over another?" warning for vault guards
status highlighting classified gold, time, and experience-points as data type
'long' but when selecting hilite rule to use treated them as 'int'
tty: turn off an optimization that is the suspected cause of Windows reported tty: turn off an optimization that is the suspected cause of Windows reported
partial status lines following level changes partial status lines following level changes
tty: ensure that current status fields are always copied to prior status tty: ensure that current status fields are always copied to prior status
@@ -352,6 +354,8 @@ tty: significant optimizations for performance and per field rendering
tty: use WC2_FLUSH_STATUS to buffer changes until BL_FLUSH is received tty: use WC2_FLUSH_STATUS to buffer changes until BL_FLUSH is received
tty: support BL_RESET in status_update to force an update to all status fields tty: support BL_RESET in status_update to force an update to all status fields
tty: stop hitpointbar from jumping to 100% health at zero hit points tty: stop hitpointbar from jumping to 100% health at zero hit points
tty: try harder to prevent a disconnected terminal (SIGHUP) from running amok
and using up all available CPU time
MacOSX: add curses window port MacOSX: add curses window port
MacOSX: add Xcode project to sys/unixNetHack.xcodeproj MacOSX: add Xcode project to sys/unixNetHack.xcodeproj
MacOSX: add Xcode supporting files README.xcode and XCode.xcconfig MacOSX: add Xcode supporting files README.xcode and XCode.xcconfig

1
include/extern.h
View File

@@ -175,6 +175,7 @@ E boolean NDECL(status_hilite_menu);
E char NDECL(randomkey); E char NDECL(randomkey);
E void FDECL(random_response, (char *, int)); E void FDECL(random_response, (char *, int));
E int NDECL(rnd_extcmd_idx);
E int NDECL(doconduct); E int NDECL(doconduct);
E int NDECL(domonability); E int NDECL(domonability);
E char FDECL(cmd_from_func, (int NDECL((*)))); E char FDECL(cmd_from_func, (int NDECL((*))));

137
src/botl.c
View File

@@ -1,10 +1,12 @@
/* NetHack 3.6 botl.c $NHDT-Date: 1544229439 2018/12/08 00:37:19 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.129 $ */ /* NetHack 3.6 botl.c $NHDT-Date: 1544917592 2018/12/15 23:46:32 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.131 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#include "hack.h" #include "hack.h"
#ifndef LONG_MAX
#include <limits.h> #include <limits.h>
#endif
extern const char *hu_stat[]; /* defined in eat.c */ extern const char *hu_stat[]; /* defined in eat.c */
@@ -1394,13 +1396,10 @@ int newcolor;
/* /*
* get_hilite_color * get_hilite_color
* *
* Figures out, based on the value and the * Figures out, based on the value and the direction it is moving,
* direction it is moving, the color that the field * the color that the field should be displayed in.
* should be displayed in.
* *
* * Provide get_hilite_color() with the following to work with:
* Provide get_hilite_color() with the following
* to work with:
* actual value vp * actual value vp
* useful for BL_TH_VAL_ABSOLUTE * useful for BL_TH_VAL_ABSOLUTE
* indicator of down, up, or the same (-1, 1, 0) chg * indicator of down, up, or the same (-1, 1, 0) chg
@@ -1416,7 +1415,6 @@ int newcolor;
* color = 0x00FF * color = 0x00FF
* attrib= 0xFF00 * attrib= 0xFF00
*/ */
STATIC_OVL void STATIC_OVL void
get_hilite_color(idx, fldidx, vp, chg, pc, colorptr) get_hilite_color(idx, fldidx, vp, chg, pc, colorptr)
int idx, fldidx, chg, pc; int idx, fldidx, chg, pc;
@@ -1432,14 +1430,21 @@ int *colorptr;
return; return;
if (blstats[idx][fldidx].thresholds) { if (blstats[idx][fldidx].thresholds) {
int dt;
/* there are hilites set here */ /* there are hilites set here */
int max_pc = -1, min_pc = 101; int max_pc = -1, min_pc = 101;
int max_val = -LARGEST_INT, min_val = LARGEST_INT; /* LARGEST_INT isn't INT_MAX; it fits within 16 bits, but that
value is big enough to handle all 'int' status fields */
int max_ival = -LARGEST_INT, min_ival = LARGEST_INT;
/* LONG_MAX comes from <limits.h> which might not be available for
ancient configurations; we don't need LONG_MIN */
long max_lval = -LONG_MAX, min_lval = LONG_MAX;
boolean exactmatch = FALSE, updown = FALSE, changed = FALSE, boolean exactmatch = FALSE, updown = FALSE, changed = FALSE,
perc_or_abs = FALSE; perc_or_abs = FALSE;
/* min_/max_ are used to track best fit */ /* min_/max_ are used to track best fit */
for (hl = blstats[idx][fldidx].thresholds; hl; hl = hl->next) { for (hl = blstats[idx][fldidx].thresholds; hl; hl = hl->next) {
dt = initblstats[fldidx].anytype; /* only needed for 'absolute' */
/* if we've already matched a temporary highlight, it takes /* if we've already matched a temporary highlight, it takes
precedence over all persistent ones; we still process precedence over all persistent ones; we still process
updown rules to get the last one which qualifies */ updown rules to get the last one which qualifies */
@@ -1451,7 +1456,7 @@ int *colorptr;
continue; continue;
switch (hl->behavior) { switch (hl->behavior) {
case BL_TH_VAL_PERCENTAGE: case BL_TH_VAL_PERCENTAGE: /* percent values are always ANY_INT */
if (hl->rel == EQ_VALUE && pc == hl->value.a_int) { if (hl->rel == EQ_VALUE && pc == hl->value.a_int) {
merge_bestcolor(&bestcolor, hl->coloridx); merge_bestcolor(&bestcolor, hl->coloridx);
min_pc = max_pc = hl->value.a_int; min_pc = max_pc = hl->value.a_int;
@@ -1484,7 +1489,7 @@ int *colorptr;
perc_or_abs = TRUE; perc_or_abs = TRUE;
} }
break; break;
case BL_TH_UPDOWN: case BL_TH_UPDOWN: /* uses 'chg' (set by caller), not 'dt' */
/* specific 'up' or 'down' takes precedence over general /* specific 'up' or 'down' takes precedence over general
'changed' regardless of their order in the rule set */ 'changed' regardless of their order in the rule set */
if (chg < 0 && hl->rel == LT_VALUE) { if (chg < 0 && hl->rel == LT_VALUE) {
@@ -1498,45 +1503,81 @@ int *colorptr;
changed = TRUE; changed = TRUE;
} }
break; break;
case BL_TH_VAL_ABSOLUTE: case BL_TH_VAL_ABSOLUTE: /* either ANY_INT or ANY_LONG */
/* /*
* TODO: * The int and long variations here are identical aside from
* This covers data type ANY_INT. We need to handle ANY_LONG * union field and min_/max_ variable names. If you change
* separately using a_long and new min_lval, max_lval. * one, be sure to make a corresponding change in the other.
*/ */
if (hl->rel == EQ_VALUE && hl->value.a_int == value->a_int) { if (dt == ANY_INT) {
merge_bestcolor(&bestcolor, hl->coloridx); if (hl->rel == EQ_VALUE
min_val = max_val = hl->value.a_int; && hl->value.a_int == value->a_int) {
exactmatch = perc_or_abs = TRUE; merge_bestcolor(&bestcolor, hl->coloridx);
} else if (exactmatch) { min_ival = max_ival = hl->value.a_int;
; /* already found best fit, skip lt,ge,&c */ exactmatch = perc_or_abs = TRUE;
} else if (hl->rel == LT_VALUE } else if (exactmatch) {
&& (value->a_int < hl->value.a_int) ; /* already found best fit, skip lt,ge,&c */
&& (hl->value.a_int <= min_val)) { } else if (hl->rel == LT_VALUE
merge_bestcolor(&bestcolor, hl->coloridx); && (value->a_int < hl->value.a_int)
min_val = hl->value.a_int; && (hl->value.a_int <= min_ival)) {
perc_or_abs = TRUE; merge_bestcolor(&bestcolor, hl->coloridx);
} else if (hl->rel == LE_VALUE min_ival = hl->value.a_int;
&& (value->a_int <= hl->value.a_int) perc_or_abs = TRUE;
&& (hl->value.a_int <= min_val)) { } else if (hl->rel == LE_VALUE
merge_bestcolor(&bestcolor, hl->coloridx); && (value->a_int <= hl->value.a_int)
min_val = hl->value.a_int; && (hl->value.a_int <= min_ival)) {
perc_or_abs = TRUE; merge_bestcolor(&bestcolor, hl->coloridx);
} else if (hl->rel == GT_VALUE min_ival = hl->value.a_int;
&& (value->a_int > hl->value.a_int) perc_or_abs = TRUE;
&& (hl->value.a_int >= max_val)) { } else if (hl->rel == GT_VALUE
merge_bestcolor(&bestcolor, hl->coloridx); && (value->a_int > hl->value.a_int)
max_val = hl->value.a_int; && (hl->value.a_int >= max_ival)) {
perc_or_abs = TRUE; merge_bestcolor(&bestcolor, hl->coloridx);
} else if (hl->rel == GE_VALUE max_ival = hl->value.a_int;
&& (value->a_int >= hl->value.a_int) perc_or_abs = TRUE;
&& (hl->value.a_int >= max_val)) { } else if (hl->rel == GE_VALUE
merge_bestcolor(&bestcolor, hl->coloridx); && (value->a_int >= hl->value.a_int)
max_val = hl->value.a_int; && (hl->value.a_int >= max_ival)) {
perc_or_abs = TRUE; merge_bestcolor(&bestcolor, hl->coloridx);
max_ival = hl->value.a_int;
perc_or_abs = TRUE;
}
} else { /* ANY_LONG */
if (hl->rel == EQ_VALUE
&& hl->value.a_long == value->a_long) {
merge_bestcolor(&bestcolor, hl->coloridx);
min_lval = max_lval = hl->value.a_long;
exactmatch = perc_or_abs = TRUE;
} else if (exactmatch) {
; /* already found best fit, skip lt,ge,&c */
} else if (hl->rel == LT_VALUE
&& (value->a_long < hl->value.a_long)
&& (hl->value.a_long <= min_lval)) {
merge_bestcolor(&bestcolor, hl->coloridx);
min_lval = hl->value.a_long;
perc_or_abs = TRUE;
} else if (hl->rel == LE_VALUE
&& (value->a_long <= hl->value.a_long)
&& (hl->value.a_long <= min_lval)) {
merge_bestcolor(&bestcolor, hl->coloridx);
min_lval = hl->value.a_long;
perc_or_abs = TRUE;
} else if (hl->rel == GT_VALUE
&& (value->a_long > hl->value.a_long)
&& (hl->value.a_long >= max_lval)) {
merge_bestcolor(&bestcolor, hl->coloridx);
max_lval = hl->value.a_long;
perc_or_abs = TRUE;
} else if (hl->rel == GE_VALUE
&& (value->a_long >= hl->value.a_long)
&& (hl->value.a_long >= max_lval)) {
merge_bestcolor(&bestcolor, hl->coloridx);
max_lval = hl->value.a_long;
perc_or_abs = TRUE;
}
} }
break; break;
case BL_TH_TEXTMATCH: case BL_TH_TEXTMATCH: /* ANY_STR */
txtstr = blstats[idx][fldidx].val; txtstr = blstats[idx][fldidx].val;
if (fldidx == BL_TITLE) if (fldidx == BL_TITLE)
/* "<name> the <rank-title>", skip past "<name> the " */ /* "<name> the <rank-title>", skip past "<name> the " */

10
src/cmd.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 cmd.c $NHDT-Date: 1544748881 2018/12/14 00:54:41 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.319 $ */ /* NetHack 3.6 cmd.c $NHDT-Date: 1544920233 2018/12/16 00:30:33 $ $NHDT-Branch: win-minor $:$NHDT-Revision: 1.321 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -3406,6 +3406,8 @@ struct ext_func_tab extcmdlist[] = {
{ '\0', (char *) 0, (char *) 0, donull, 0, (char *) 0 } /* sentinel */ { '\0', (char *) 0, (char *) 0, donull, 0, (char *) 0 } /* sentinel */
}; };
int extcmdlist_length = SIZE(extcmdlist) - 1;
const char * const char *
key2extcmddesc(key) key2extcmddesc(key)
uchar key; uchar key;
@@ -4459,6 +4461,12 @@ int sz;
buf[count] = '\0'; buf[count] = '\0';
} }
int
rnd_extcmd_idx(VOID_ARGS)
{
return rn2(extcmdlist_length + 1) - 1;
}
int int
ch2spkeys(c, start, end) ch2spkeys(c, start, end)
char c; char c;

4
src/end.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 end.c $NHDT-Date: 1544666123 2018/12/13 01:55:23 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.157 $ */ /* NetHack 3.6 end.c $NHDT-Date: 1544917598 2018/12/15 23:46:38 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.158 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -11,7 +11,9 @@
#include <signal.h> #include <signal.h>
#endif #endif
#include <ctype.h> #include <ctype.h>
#ifndef LONG_MAX
#include <limits.h> #include <limits.h>
#endif
#include "dlb.h" #include "dlb.h"
/* add b to long a, convert wraparound to max value */ /* add b to long a, convert wraparound to max value */

4
src/exper.c
View File

@@ -1,10 +1,12 @@
/* NetHack 3.6 exper.c $NHDT-Date: 1541145516 2018/11/02 07:58:36 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.30 $ */ /* NetHack 3.6 exper.c $NHDT-Date: 1544917599 2018/12/15 23:46:39 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.31 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2007. */ /*-Copyright (c) Robert Patrick Rankin, 2007. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#include "hack.h" #include "hack.h"
#ifndef LONG_MAX
#include <limits.h> #include <limits.h>
#endif
STATIC_DCL int FDECL(enermod, (int)); STATIC_DCL int FDECL(enermod, (int));

69
win/tty/wintty.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 wintty.c $NHDT-Date: 1544842261 2018/12/15 02:51:01 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.188 $ */ /* NetHack 3.6 wintty.c $NHDT-Date: 1544919891 2018/12/16 00:24:51 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.189 $ */
/* Copyright (c) David Cohrs, 1991 */ /* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -45,6 +45,33 @@ extern short glyph2tile[];
#define AVTC_INLINE_SYNC 3 #define AVTC_INLINE_SYNC 3
#endif #endif
#ifdef HANGUP_HANDLING
/*
* NetHack's core switches to a dummy windowing interface when it
* detects SIGHUP, but that's no help for any interface routine which
* is already in progress at the time, and there have been reports of
* runaway disconnected processes which use up all available CPU time.
* HUPSKIP() and HUPSKIP_RETURN(x) are used to try to cut them off so
* that they return to the core instead attempting more terminal I/O.
*/
#define HUPSKIP() \
do { \
if (program_state.done_hup) { \
morc = '\033'; \
return; \
} \
} while (0)
/* morc=ESC - in case we bypass xwaitforspace() which sets that */
#define HUPSKIP_RESULT(RES) \
do { \
if (program_state.done_hup) \
return (RES); \
} while (0)
#else /* !HANGUP_HANDLING */
#define HUPSKIP() /*empty*/
#define HUPSKIP_RESULT(RES) /*empty*/
#endif /* ?HANGUP_HANDLING */
extern char mapped_menu_cmds[]; /* from options.c */ extern char mapped_menu_cmds[]; /* from options.c */
/* this is only needed until tty_status_* routines are written */ /* this is only needed until tty_status_* routines are written */
@@ -208,6 +235,7 @@ void
print_vt_code(i, c, d) print_vt_code(i, c, d)
int i, c, d; int i, c, d;
{ {
HUPSKIP();
if (iflags.vt_tiledata) { if (iflags.vt_tiledata) {
if (c >= 0) { if (c >= 0) {
if (i == AVTC_SELECT_WINDOW) { if (i == AVTC_SELECT_WINDOW) {
@@ -1170,8 +1198,7 @@ tty_askname()
bail("Giving up after 10 tries.\n"); bail("Giving up after 10 tries.\n");
tty_curs(BASE_WINDOW, 1, wins[BASE_WINDOW]->cury - 1); tty_curs(BASE_WINDOW, 1, wins[BASE_WINDOW]->cury - 1);
tty_putstr(BASE_WINDOW, 0, "Enter a name for your character..."); tty_putstr(BASE_WINDOW, 0, "Enter a name for your character...");
/* erase previous prompt (in case of ESC after partial response) /* erase previous prompt (in case of ESC after partial response) */
*/
tty_curs(BASE_WINDOW, 1, wins[BASE_WINDOW]->cury), cl_end(); tty_curs(BASE_WINDOW, 1, wins[BASE_WINDOW]->cury), cl_end();
} }
tty_putstr(BASE_WINDOW, 0, who_are_you); tty_putstr(BASE_WINDOW, 0, who_are_you);
@@ -1261,6 +1288,7 @@ tty_get_nh_event()
STATIC_OVL void STATIC_OVL void
getret() getret()
{ {
HUPSKIP();
xputs("\n"); xputs("\n");
if (flags.standout) if (flags.standout)
standoutbeg(); standoutbeg();
@@ -1516,6 +1544,7 @@ winid window;
{ {
register struct WinDesc *cw = 0; register struct WinDesc *cw = 0;
HUPSKIP();
if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0)
panic(winpanicstr, window); panic(winpanicstr, window);
ttyDisplay->lastwin = window; ttyDisplay->lastwin = window;
@@ -1602,6 +1631,7 @@ const char *s; /* valid responses */
const char *prompt = cw->morestr ? cw->morestr : defmorestr; const char *prompt = cw->morestr ? cw->morestr : defmorestr;
int offset = (cw->type == NHW_TEXT) ? 1 : 2; int offset = (cw->type == NHW_TEXT) ? 1 : 2;
HUPSKIP();
tty_curs(BASE_WINDOW, (int) ttyDisplay->curx + offset, tty_curs(BASE_WINDOW, (int) ttyDisplay->curx + offset,
(int) ttyDisplay->cury); (int) ttyDisplay->cury);
if (flags.standout) if (flags.standout)
@@ -1622,6 +1652,7 @@ tty_menu_item *item;
{ {
char ch = item->selected ? (item->count == -1L ? '+' : '#') : '-'; char ch = item->selected ? (item->count == -1L ? '+' : '#') : '-';
HUPSKIP();
tty_curs(window, 4, lineno); tty_curs(window, 4, lineno);
term_start_attr(item->attr); term_start_attr(item->attr);
(void) putchar(ch); (void) putchar(ch);
@@ -1789,6 +1820,7 @@ struct WinDesc *cw;
/* loop until finished */ /* loop until finished */
while (!finished) { while (!finished) {
HUPSKIP();
if (reset_count) { if (reset_count) {
counting = FALSE; counting = FALSE;
count = 0; count = 0;
@@ -2117,6 +2149,7 @@ struct WinDesc *cw;
register char *cp; register char *cp;
for (n = 0, i = 0; i < cw->maxrow; i++) { for (n = 0, i = 0; i < cw->maxrow; i++) {
HUPSKIP();
if (!cw->offx && (n + cw->offy == ttyDisplay->rows - 1)) { if (!cw->offx && (n + cw->offy == ttyDisplay->rows - 1)) {
tty_curs(window, 1, n); tty_curs(window, 1, n);
cl_end(); cl_end();
@@ -2183,6 +2216,7 @@ boolean blocking; /* with ttys, all windows are blocking */
register struct WinDesc *cw = 0; register struct WinDesc *cw = 0;
short s_maxcol; short s_maxcol;
HUPSKIP();
if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0)
panic(winpanicstr, window); panic(winpanicstr, window);
if (cw->flags & WIN_CANCELLED) if (cw->flags & WIN_CANCELLED)
@@ -2275,6 +2309,7 @@ winid window;
{ {
register struct WinDesc *cw = 0; register struct WinDesc *cw = 0;
HUPSKIP();
if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0)
panic(winpanicstr, window); panic(winpanicstr, window);
@@ -2345,6 +2380,7 @@ register int x, y; /* not xchar: perhaps xchar is unsigned and
int cx = ttyDisplay->curx; int cx = ttyDisplay->curx;
int cy = ttyDisplay->cury; int cy = ttyDisplay->cury;
HUPSKIP();
if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0)
panic(winpanicstr, window); panic(winpanicstr, window);
ttyDisplay->lastwin = window; ttyDisplay->lastwin = window;
@@ -2359,6 +2395,7 @@ register int x, y; /* not xchar: perhaps xchar is unsigned and
#ifdef DEBUG #ifdef DEBUG
if (x < 0 || y < 0 || y >= cw->rows || x > cw->cols) { if (x < 0 || y < 0 || y >= cw->rows || x > cw->cols) {
const char *s = "[unknown type]"; const char *s = "[unknown type]";
switch (cw->type) { switch (cw->type) {
case NHW_MESSAGE: case NHW_MESSAGE:
s = "[topl window]"; s = "[topl window]";
@@ -2442,6 +2479,7 @@ char ch;
{ {
register struct WinDesc *cw = 0; register struct WinDesc *cw = 0;
HUPSKIP();
if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0)
panic(winpanicstr, window); panic(winpanicstr, window);
@@ -2511,6 +2549,7 @@ const char *str;
register long j; register long j;
#endif #endif
HUPSKIP();
/* Assume there's a real problem if the window is missing -- /* Assume there's a real problem if the window is missing --
* probably a panic message * probably a panic message
*/ */
@@ -2780,6 +2819,7 @@ boolean preselected; /* item is marked as selected */
const char *newstr; const char *newstr;
char buf[4 + BUFSZ]; char buf[4 + BUFSZ];
HUPSKIP();
if (str == (const char *) 0) if (str == (const char *) 0)
return; return;
@@ -2991,6 +3031,7 @@ char let;
int how; int how;
const char *mesg; const char *mesg;
{ {
HUPSKIP();
/* "menu" without selection; use ordinary pline, no more() */ /* "menu" without selection; use ordinary pline, no more() */
if (how == PICK_NONE) { if (how == PICK_NONE) {
pline("%s", mesg); pline("%s", mesg);
@@ -3026,12 +3067,14 @@ tty_update_inventory()
void void
tty_mark_synch() tty_mark_synch()
{ {
HUPSKIP();
(void) fflush(stdout); (void) fflush(stdout);
} }
void void
tty_wait_synch() tty_wait_synch()
{ {
HUPSKIP();
/* we just need to make sure all windows are synch'd */ /* we just need to make sure all windows are synch'd */
if (!ttyDisplay || ttyDisplay->rawprint) { if (!ttyDisplay || ttyDisplay->rawprint) {
getret(); getret();
@@ -3061,6 +3104,7 @@ register int xmin, ymax;
register int y; register int y;
register struct WinDesc *cw = wins[WIN_MAP]; register struct WinDesc *cw = wins[WIN_MAP];
HUPSKIP();
#if 0 /* this optimization is not valuable enough to justify #if 0 /* this optimization is not valuable enough to justify
abusing core internals... */ abusing core internals... */
if (u.uswallow) { /* Can be done more efficiently */ if (u.uswallow) { /* Can be done more efficiently */
@@ -3109,6 +3153,7 @@ register int xmin, ymax;
void void
end_glyphout() end_glyphout()
{ {
HUPSKIP();
#if defined(ASCIIGRAPH) && !defined(NO_TERMS) #if defined(ASCIIGRAPH) && !defined(NO_TERMS)
if (GFlag) { if (GFlag) {
GFlag = FALSE; GFlag = FALSE;
@@ -3130,6 +3175,7 @@ int in_ch;
{ {
register char ch = (char) in_ch; register char ch = (char) in_ch;
HUPSKIP();
#if defined(ASCIIGRAPH) && !defined(NO_TERMS) #if defined(ASCIIGRAPH) && !defined(NO_TERMS)
if (SYMHANDLING(H_IBM) || iflags.eight_bit_tty) { if (SYMHANDLING(H_IBM) || iflags.eight_bit_tty) {
/* IBM-compatible displays don't need other stuff */ /* IBM-compatible displays don't need other stuff */
@@ -3174,6 +3220,7 @@ int x, y;
extern boolean restoring; extern boolean restoring;
int oldx = clipx, oldy = clipy; int oldx = clipx, oldy = clipy;
HUPSKIP();
if (!clipping) if (!clipping)
return; return;
if (x < clipx + 5) { if (x < clipx + 5) {
@@ -3218,6 +3265,7 @@ int bkglyph UNUSED;
int color; int color;
unsigned special; unsigned special;
HUPSKIP();
#ifdef CLIPPING #ifdef CLIPPING
if (clipping) { if (clipping) {
if (x <= clipx || y < clipy || x >= clipxmax || y >= clipymax) if (x <= clipx || y < clipy || x >= clipxmax || y >= clipymax)
@@ -3288,6 +3336,7 @@ void
tty_raw_print(str) tty_raw_print(str)
const char *str; const char *str;
{ {
HUPSKIP();
if (ttyDisplay) if (ttyDisplay)
ttyDisplay->rawprint++; ttyDisplay->rawprint++;
print_vt_code2(AVTC_SELECT_WINDOW, NHW_BASE); print_vt_code2(AVTC_SELECT_WINDOW, NHW_BASE);
@@ -3303,6 +3352,7 @@ void
tty_raw_print_bold(str) tty_raw_print_bold(str)
const char *str; const char *str;
{ {
HUPSKIP();
if (ttyDisplay) if (ttyDisplay)
ttyDisplay->rawprint++; ttyDisplay->rawprint++;
print_vt_code2(AVTC_SELECT_WINDOW, NHW_BASE); print_vt_code2(AVTC_SELECT_WINDOW, NHW_BASE);
@@ -3335,6 +3385,7 @@ tty_nhgetch()
char nestbuf; char nestbuf;
#endif #endif
HUPSKIP_RESULT('\033');
print_vt_code1(AVTC_INLINE_SYNC); print_vt_code1(AVTC_INLINE_SYNC);
(void) fflush(stdout); (void) fflush(stdout);
/* Note: if raw_print() and wait_synch() get called to report terminal /* Note: if raw_print() and wait_synch() get called to report terminal
@@ -3366,6 +3417,7 @@ tty_nhgetch()
{ {
/* hack to force output of the window select code */ /* hack to force output of the window select code */
int tmp = vt_tile_current_window; int tmp = vt_tile_current_window;
vt_tile_current_window++; vt_tile_current_window++;
print_vt_code2(AVTC_SELECT_WINDOW, tmp); print_vt_code2(AVTC_SELECT_WINDOW, tmp);
} }
@@ -3383,8 +3435,10 @@ int
tty_nh_poskey(x, y, mod) tty_nh_poskey(x, y, mod)
int *x, *y, *mod; int *x, *y, *mod;
{ {
#if defined(WIN32CON)
int i; int i;
HUPSKIP_RESULT('\033');
#if defined(WIN32CON)
(void) fflush(stdout); (void) fflush(stdout);
/* Note: if raw_print() and wait_synch() get called to report terminal /* Note: if raw_print() and wait_synch() get called to report terminal
* initialization problems, then wins[] and ttyDisplay might not be * initialization problems, then wins[] and ttyDisplay might not be
@@ -3398,14 +3452,14 @@ int *x, *y, *mod;
i = '\033'; /* map NUL or EOF to ESC, nethack doesn't expect either */ i = '\033'; /* map NUL or EOF to ESC, nethack doesn't expect either */
if (ttyDisplay && ttyDisplay->toplin == 1) if (ttyDisplay && ttyDisplay->toplin == 1)
ttyDisplay->toplin = 2; ttyDisplay->toplin = 2;
return i;
#else /* !WIN32CON */ #else /* !WIN32CON */
nhUse(x); nhUse(x);
nhUse(y); nhUse(y);
nhUse(mod); nhUse(mod);
return tty_nhgetch(); i = tty_nhgetch();
#endif /* ?WIN32CON */ #endif /* ?WIN32CON */
return i;
} }
void void
@@ -4182,6 +4236,7 @@ render_status(VOID_ARGS)
} }
for (row = 0; row < 2; ++row) { for (row = 0; row < 2; ++row) {
HUPSKIP();
curs(WIN_STATUS, 1, row); curs(WIN_STATUS, 1, row);
for (i = 0; fieldorder[row][i] != BL_FLUSH; ++i) { for (i = 0; fieldorder[row][i] != BL_FLUSH; ++i) {
int idx = fieldorder[row][i]; int idx = fieldorder[row][i];
@@ -4359,7 +4414,7 @@ render_status(VOID_ARGS)
tty_putstatusfield(nullfield, " ", x++, y); tty_putstatusfield(nullfield, " ", x++, y);
} }
} }
/* reset .redraw, .dirty, .padright now that they've been rendered */ /* reset .redraw, .dirty, .padright now that they're rendered */
tty_status[NOW][idx].dirty = FALSE; tty_status[NOW][idx].dirty = FALSE;
tty_status[NOW][idx].redraw = FALSE; tty_status[NOW][idx].redraw = FALSE;
tty_status[NOW][idx].last_on_row = FALSE; tty_status[NOW][idx].last_on_row = FALSE;

9
win/win32/mhdlg.c
View File

@@ -167,6 +167,15 @@ INT_PTR CALLBACK ExtCmdDlgProc(HWND, UINT, WPARAM, LPARAM);
int int
mswin_ext_cmd_window(int *selection) mswin_ext_cmd_window(int *selection)
{ {
if (iflags.debug_fuzzer) {
*selection = rnd_extcmd_idx();
if (*selection != -1)
return IDOK;
else
return IDCANCEL;
}
INT_PTR ret; INT_PTR ret;
struct extcmd_data data; struct extcmd_data data;

19
win/win32/mhmain.c
View File

@@ -195,7 +195,7 @@ static const char scanmap[] = {
LRESULT CALLBACK LRESULT CALLBACK
MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
PNHMainWindow data; PNHMainWindow data = (PNHMainWindow) GetWindowLongPtr(hWnd, GWLP_USERDATA);
switch (message) { switch (message) {
case WM_CREATE: case WM_CREATE:
@@ -225,7 +225,6 @@ MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
case WM_KEYDOWN: { case WM_KEYDOWN: {
data = (PNHMainWindow) GetWindowLongPtr(hWnd, GWLP_USERDATA);
/* translate arrow keys into nethack commands */ /* translate arrow keys into nethack commands */
switch (wParam) { switch (wParam) {
@@ -332,6 +331,15 @@ MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
NHEVENT_KBD(KEYTABLE(KEY_PLUS)); NHEVENT_KBD(KEYTABLE(KEY_PLUS));
return 0; return 0;
#if defined(DEBUG) && defined(_MSC_VER)
case VK_PAUSE:
if (IsDebuggerPresent()) {
iflags.debug_fuzzer = !iflags.debug_fuzzer;
return 0;
}
break;
#endif
case VK_CLEAR: /* This is the '5' key */ case VK_CLEAR: /* This is the '5' key */
NHEVENT_KBD(KEYTABLE(KEY_GOINTERESTING)); NHEVENT_KBD(KEYTABLE(KEY_GOINTERESTING));
return 0; return 0;
@@ -530,9 +538,10 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
child = GetNHApp()->windowlist[msg_param->wid].win; child = GetNHApp()->windowlist[msg_param->wid].win;
} break; } break;
case MSNH_MSG_RANDOM_INPUT: case MSNH_MSG_RANDOM_INPUT: {
nhassert(0); // unexpected nhassert(iflags.debug_fuzzer);
break; NHEVENT_KBD(randomkey());
} break;
} }
} }

43
win/win32/mhmenu.c
View File

@@ -689,14 +689,8 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
} break; } break;
case MSNH_MSG_RANDOM_INPUT: { case MSNH_MSG_RANDOM_INPUT: {
char c = randomkey(); PostMessage(GetMenuControl(hWnd),
if (c == '\n') WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
PostMessage(hWnd, WM_COMMAND, MAKELONG(IDOK, 0), 0);
else if (c == '\033')
PostMessage(hWnd, WM_COMMAND, MAKELONG(IDCANCEL, 0), 0);
else
PostMessage(GetDlgItem(hWnd, IDC_TEXT_CONTROL), WM_CHAR, c, 0);
} break; } break;
} }
@@ -1601,6 +1595,7 @@ reset_menu_count(HWND hwndList, PNHMenuWindow data)
LRESULT CALLBACK LRESULT CALLBACK
NHMenuListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) NHMenuListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND hWndParent = GetParent(hWnd);
BOOL bUpdateFocusItem; BOOL bUpdateFocusItem;
/* we will redraw focused item whenever horizontal scrolling occurs /* we will redraw focused item whenever horizontal scrolling occurs
@@ -1632,6 +1627,20 @@ NHMenuListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
SetFocus(GetNHApp()->hMainWnd); SetFocus(GetNHApp()->hMainWnd);
} }
return FALSE; return FALSE;
case WM_MSNH_COMMAND:
if (wParam == MSNH_MSG_RANDOM_INPUT) {
char c = randomkey();
if (c == '\n')
PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDOK, 0), 0);
else if (c == '\033')
PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDCANCEL, 0), 0);
else
PostMessage(hWnd, WM_CHAR, c, 0);
return 0;
}
break;
} }
/* update focused item */ /* update focused item */
@@ -1659,6 +1668,7 @@ NHMenuListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
LRESULT CALLBACK LRESULT CALLBACK
NHMenuTextWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) NHMenuTextWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND hWndParent = GetParent(hWnd);
HDC hDC; HDC hDC;
RECT rc; RECT rc;
@@ -1686,8 +1696,7 @@ NHMenuTextWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
&& (si.nPos + (int) si.nPage) <= (si.nMax - si.nMin)) && (si.nPos + (int) si.nPage) <= (si.nMax - si.nMin))
SendMessage(hWnd, EM_SCROLL, SB_PAGEDOWN, 0); SendMessage(hWnd, EM_SCROLL, SB_PAGEDOWN, 0);
else else
PostMessage(GetParent(hWnd), WM_COMMAND, MAKELONG(IDOK, 0), PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDOK, 0), 0);
0);
return 0; return 0;
} }
case VK_NEXT: case VK_NEXT:
@@ -1726,6 +1735,20 @@ NHMenuTextWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_SETFOCUS: case WM_SETFOCUS:
HideCaret(hWnd); HideCaret(hWnd);
return 0; return 0;
case WM_MSNH_COMMAND:
if (wParam == MSNH_MSG_RANDOM_INPUT) {
char c = randomkey();
if (c == '\n')
PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDOK, 0), 0);
else if (c == '\033')
PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDCANCEL, 0), 0);
else
PostMessage(hWnd, WM_CHAR, c, 0);
return 0;
}
break;
} }
if (editControlWndProc) if (editControlWndProc)

45
win/win32/mhtext.c
View File

@@ -27,7 +27,6 @@ HWND
mswin_init_text_window() mswin_init_text_window()
{ {
HWND ret; HWND ret;
PNHTextWindow data;
RECT rt; RECT rt;
/* get window position */ /* get window position */
@@ -52,13 +51,6 @@ mswin_init_text_window()
/* Set window caption */ /* Set window caption */
SetWindowText(ret, "Text"); SetWindowText(ret, "Text");
/* create and set window data */
data = (PNHTextWindow) malloc(sizeof(NHTextWindow));
if (!data)
panic("out of memory");
ZeroMemory(data, sizeof(NHTextWindow));
SetWindowLongPtr(ret, GWLP_USERDATA, (LONG_PTR) data);
mswin_apply_window_style(ret); mswin_apply_window_style(ret);
return ret; return ret;
@@ -88,6 +80,12 @@ NHTextWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
switch (message) { switch (message) {
case WM_INITDIALOG: { case WM_INITDIALOG: {
data = (PNHTextWindow)malloc(sizeof(NHTextWindow));
if (!data)
panic("out of memory");
ZeroMemory(data, sizeof(NHTextWindow));
SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)data);
HWND control = GetDlgItem(hWnd, IDC_TEXT_CONTROL); HWND control = GetDlgItem(hWnd, IDC_TEXT_CONTROL);
HDC hdc = GetDC(control); HDC hdc = GetDC(control);
cached_font * font = mswin_get_font(NHW_TEXT, ATR_NONE, hdc, FALSE); cached_font * font = mswin_get_font(NHW_TEXT, ATR_NONE, hdc, FALSE);
@@ -177,7 +175,10 @@ NHTextWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR) 0); SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR) 0);
} }
break; break;
} }
return FALSE; return FALSE;
} }
@@ -214,14 +215,8 @@ onMSNHCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
} }
case MSNH_MSG_RANDOM_INPUT: { case MSNH_MSG_RANDOM_INPUT: {
char c = randomkey(); PostMessage(GetDlgItem(hWnd, IDC_TEXT_CONTROL),
if (c == '\n') WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
PostMessage(hWnd, WM_COMMAND, MAKELONG(IDOK, 0), 0);
else if (c == '\033')
PostMessage(hWnd, WM_COMMAND, MAKELONG(IDCANCEL, 0), 0);
else
PostMessage(GetDlgItem(hWnd, IDC_TEXT_CONTROL), WM_CHAR, c, 0);
} }
break; break;
@@ -278,6 +273,7 @@ LayoutText(HWND hWnd)
LRESULT CALLBACK LRESULT CALLBACK
NHEditHookWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) NHEditHookWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND hWndParent = GetParent(hWnd);
HDC hDC; HDC hDC;
RECT rc; RECT rc;
@@ -305,8 +301,7 @@ NHEditHookWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
&& (si.nPos + (int) si.nPage) <= (si.nMax - si.nMin)) && (si.nPos + (int) si.nPage) <= (si.nMax - si.nMin))
SendMessage(hWnd, EM_SCROLL, SB_PAGEDOWN, 0); SendMessage(hWnd, EM_SCROLL, SB_PAGEDOWN, 0);
else else
PostMessage(GetParent(hWnd), WM_COMMAND, MAKELONG(IDOK, 0), PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDOK, 0), 0);
0);
return 0; return 0;
} }
case VK_NEXT: case VK_NEXT:
@@ -346,6 +341,20 @@ NHEditHookWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_SETFOCUS: case WM_SETFOCUS:
HideCaret(hWnd); HideCaret(hWnd);
return 0; return 0;
case WM_MSNH_COMMAND:
if (wParam == MSNH_MSG_RANDOM_INPUT) {
char c = randomkey();
if (c == '\n')
PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDOK, 0), 0);
else if (c == '\033')
PostMessage(hWndParent, WM_COMMAND, MAKELONG(IDCANCEL, 0), 0);
else
PostMessage(hWnd, WM_CHAR, c, 0);
return 0;
}
break;
} }
if (editControlWndProc) if (editControlWndProc)

76
win/win32/mswproc.c
View File

@@ -2102,24 +2102,25 @@ mswin_main_loop()
{ {
MSG msg; MSG msg;
while (!mswin_have_input()) { while (!mswin_have_input()) {
if (!iflags.debug_fuzzer || PeekMessage(&msg, NULL, 0, 0, FALSE)) { if (!iflags.debug_fuzzer || PeekMessage(&msg, NULL, 0, 0, FALSE)) {
if(GetMessage(&msg, NULL, 0, 0) != 0) { if(GetMessage(&msg, NULL, 0, 0) != 0) {
if (GetNHApp()->regNetHackMode if (GetNHApp()->regNetHackMode
|| !TranslateAccelerator(msg.hwnd, GetNHApp()->hAccelTable, || !TranslateAccelerator(msg.hwnd, GetNHApp()->hAccelTable,
&msg)) { &msg)) {
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessage(&msg);
} }
} else { } else {
/* WM_QUIT */ /* WM_QUIT */
break; break;
} }
} else { } else {
nhassert(iflags.debug_fuzzer); nhassert(iflags.debug_fuzzer);
NHEVENT_KBD(randomkey()); PostMessage(GetNHApp()->hMainWnd, WM_MSNH_COMMAND,
} MSNH_MSG_RANDOM_INPUT, 0);
} }
}
} }
/* clean up and quit */ /* clean up and quit */
@@ -2232,25 +2233,26 @@ mswin_popup_display(HWND hWnd, int *done_indicator)
SetFocus(hWnd); SetFocus(hWnd);
/* go into message loop */ /* go into message loop */
while (IsWindow(hWnd) && (done_indicator == NULL || !*done_indicator)) { while (IsWindow(hWnd) && (done_indicator == NULL || !*done_indicator)) {
if (!iflags.debug_fuzzer || PeekMessage(&msg, NULL, 0, 0, FALSE)) { if (!iflags.debug_fuzzer || PeekMessage(&msg, NULL, 0, 0, FALSE)) {
if(GetMessage(&msg, NULL, 0, 0) != 0) { if(GetMessage(&msg, NULL, 0, 0) != 0) {
if (!IsDialogMessage(hWnd, &msg)) { if (msg.message == WM_MSNH_COMMAND ||
if (!TranslateAccelerator(msg.hwnd, GetNHApp()->hAccelTable, !IsDialogMessage(hWnd, &msg)) {
&msg)) { if (!TranslateAccelerator(msg.hwnd,
TranslateMessage(&msg); GetNHApp()->hAccelTable, &msg)) {
DispatchMessage(&msg); TranslateMessage(&msg);
} DispatchMessage(&msg);
} }
} else { }
/* WM_QUIT */ } else {
break; /* WM_QUIT */
} break;
} else { }
nhassert(iflags.debug_fuzzer); } else {
PostMessage(hWnd, WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0); nhassert(iflags.debug_fuzzer);
} PostMessage(hWnd, WM_MSNH_COMMAND, MSNH_MSG_RANDOM_INPUT, 0);
} }
}
} }
void void