Fix broken extended command entry in curses interface

.gitignore

@@ -5,6 +5,7 @@ dat/*.lev
 dat/data
 dat/dungeon
 dat/dungeon.pdf
+dat/nhdat
 dat/options
 dat/oracles
 dat/quest.dat
@@ -28,6 +29,7 @@ src/vis_tab.c
 util/dgn_comp
 util/dgn_lex.c
 util/dgn_yacc.c
+util/dlb
 util/lev_comp
 util/lev_lex.c
 util/lev_yacc.c

include/decl.h

@@ -479,6 +479,7 @@ E struct _plinemsg *pline_msg;
 #define MSGTYP_NOREP   1
 #define MSGTYP_NOSHOW  2
 #define MSGTYP_STOP    3
+#define MSGTYP_ALERT   4
 
 
 /* FIXME: These should be integrated into objclass and permonst structs,

include/extern.h

@@ -616,6 +616,7 @@ E void FDECL(make_grave, (int,int,const char *));
 
 /* ### exper.c ### */
 
+E long FDECL(newuexp, (int));
 E int FDECL(experience, (struct monst *,int));
 E void FDECL(more_experienced, (int,int));
 E void FDECL(losexp, (const char *));

include/flag.h

@@ -157,7 +157,8 @@ struct flag {
 struct instance_flags {
 	boolean  cbreak;	/* in cbreak mode, rogue format */
 #ifdef CURSES_GRAPHICS
-    boolean  cursesgraphics;    /* Use portable curses extended characters */
+	boolean  classic_status;	/* What kind of horizontal statusbar to use */
+	boolean  cursesgraphics;	/* Use portable curses extended characters */
 #endif
 	boolean  DECgraphics;	/* use DEC VT-xxx extended character set */
 	boolean  echo;		/* 1 to echo characters */
@@ -342,6 +343,9 @@ struct instance_flags {
 #ifdef REALTIME_ON_BOTL
   boolean  showrealtime; /* show actual elapsed time */
 #endif
+  boolean msg_is_alert; /* suggest windowport should grab player's attention
+                         * and request <TAB> acknowlegement */
+
 };
 
 /*

include/unixconf.h

@@ -102,8 +102,9 @@
  * If you want the static parts of your playground on a read-only file
  * system, define VAR_PLAYGROUND to be where the variable parts are kept.
  */
+#ifndef VAR_PLAYGROUND
 #define VAR_PLAYGROUND "/nh343/var"
-
+#endif
 
 /*
  * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"

include/wincurs.h

@@ -21,6 +21,7 @@ boolean counting;   /* Count window is active */
 #define NONE -1
 #define KEY_ESC 0x1b
 #define DIALOG_BORDER_COLOR CLR_MAGENTA
+#define ALERT_BORDER_COLOR CLR_RED
 #define SCROLLBAR_COLOR CLR_MAGENTA
 #define SCROLLBAR_BACK_COLOR CLR_BLACK
 #define HIGHLIGHT_COLOR CLR_WHITE
@@ -30,7 +31,8 @@ boolean counting;   /* Count window is active */
 #define MESSAGE_WIN 1
 #define STATUS_WIN  2
 #define MAP_WIN     3
-#define NHWIN_MAX   4
+#define INV_WIN     4
+#define NHWIN_MAX   5
 #define MESG_HISTORY_MAX   200
 #if !defined(__APPLE__) || !defined(NCURSES_VERSION)
 # define USE_DARKGRAY /* Allow "bright" black; delete if not visible */
@@ -178,6 +180,10 @@ extern void curses_puts(winid wid, int attr, const char *text);
 
 extern void curses_clear_nhwin(winid wid);
 
+extern void curses_alert_win_border(winid wid, boolean onoff);
+
+extern void curses_alert_main_borders(boolean onoff);
+
 extern void curses_draw_map(int sx, int sy, int ex, int ey);
 
 extern boolean curses_map_borders(int *sx, int *sy, int *ex, int *ey,
@@ -237,8 +243,10 @@ extern int curses_character_input_dialog(const char *prompt, const char *choices
 extern int curses_ext_cmd(void);
 
 extern void curses_create_nhmenu(winid wid);
-
-extern void curses_add_nhmenu_item(winid wid, const ANY_P *identifier,
+#ifdef MENU_COLOR
+extern boolean get_menu_coloring(char *, int *, int *);
+#endif
+extern void curses_add_nhmenu_item(winid wid, int glyph, const ANY_P *identifier,
  CHAR_P accelerator, CHAR_P group_accel, int attr, const char *str,
  BOOLEAN_P presel);
 
@@ -253,10 +261,14 @@ extern void curses_del_menu(winid wid);
 
 /* cursstat.c */
 
-extern void curses_update_stats(boolean redraw);
-
+extern attr_t curses_color_attr(int nh_color, int bg_color);
+extern void curses_update_stats(void);
 extern void curses_decrement_highlight(void);
 
+/* cursinvt.c */
+
+extern void curses_update_inv(void);
+extern void curses_add_inv(int, int, CHAR_P, attr_t, const char *);
 
 /* cursinit.c */
 
@@ -279,10 +291,14 @@ extern void curses_cleanup(void);
 
 extern void curses_message_win_puts(const char *message, boolean recursed);
 
+extern int curses_block(boolean require_tab); /* for MSGTYPE=STOP */
+
 extern int curses_more(void);
 
 extern void curses_clear_unhighlight_message_window(void);
 
+extern void curses_message_win_getline(const char *prompt, char *answer, int buffer);
+
 extern void curses_last_messages(void);
 
 extern void curses_init_mesg_history(void);

src/display.c

@@ -1324,6 +1324,7 @@ row_refresh(start,stop,y)
     for (x = start; x <= stop; x++)
 	if (gbuf[y][x].glyph != cmap_to_glyph(S_stone))
 	    print_glyph(WIN_MAP,x,y,gbuf[y][x].glyph);
+    display_nhwindow(WIN_MAP,FALSE);
 }
 
 void

src/end.c

@@ -169,14 +169,15 @@ dump_init ()
     char new_dump_fn[512];
     Sprintf(new_dump_fn, "%s", dump_format_str(dump_fn));
 
-    dump_fp = fopen(new_dump_fn, "w");
-#ifdef UNIX
-    chmod(new_dump_fn, dumpmode);
-#endif
+    dump_fp = fopen (new_dump_fn, "w");
     if (!dump_fp) {
       pline("Can't open %s for output.", new_dump_fn);
       pline("Dump file not created.");
+      return;
     }
+#if defined(UNIX)
+    chmod(new_dump_fn, dumpmode);
+#endif
   }
 }
 
@@ -861,19 +862,21 @@ int how;
 	program_state.something_worth_saving = 0;
 #ifdef DUMP_LOG
 	/* D: Grab screen dump right here */
-	if (dump_fn[0]) {
-	  dump_init();
-	  Sprintf(pbuf, "%s, %s %s %s %s", plname,
-		  aligns[1 - u.ualign.type].adj,
-		  genders[flags.female].adj,
-		  urace.adj,
-		  (flags.female && urole.name.f)?
-		   urole.name.f : urole.name.m);
-	  dump("", pbuf);
-	  /* D: Add a line for clearance from the screen dump */
-	  dump("", "");
-	  dump_screen(0);
-	}
+        if (dump_fn[0]) {
+            dump_init();
+            if (dump_fp) {
+                Sprintf(pbuf, "%s, %s %s %s %s", plname,
+                        aligns[1 - u.ualign.type].adj,
+                        genders[flags.female].adj,
+                        urace.adj,
+                        (flags.female && urole.name.f)?
+                        urole.name.f : urole.name.m);
+                dump("", pbuf);
+                /* D: Add a line for clearance from the screen dump */
+	        dump("", "");
+	        dump_screen(0);
+            }
+        }
 #endif /* DUMP_LOG */
 
 #ifdef WHEREIS_FILE

src/exper.c

@@ -4,10 +4,9 @@
 
 #include "hack.h"
 
-STATIC_DCL long FDECL(newuexp, (int));
 STATIC_DCL int FDECL(enermod, (int));
 
-STATIC_OVL long
+long
 newuexp(lev)
 int lev;
 {

src/files.c

@@ -1998,6 +1998,8 @@ char		*tmp_levels;
 		else if (!strcasecmp("noshow", msgtype)) typ = MSGTYP_NOSHOW;
 		else if (!strcasecmp("more", msgtype)) typ = MSGTYP_STOP;
 		else if (!strcasecmp("stop", msgtype)) typ = MSGTYP_STOP;
+                /* 'alert' will fallback to 'stop' behaviour if windowport does not support it */
+		else if (!strcasecmp("alert", msgtype)) typ = MSGTYP_ALERT;
 		if ((typ != MSGTYP_NORMAL) || !strcasecmp("show", msgtype)) {
 		    msgpline_add(typ, pattern);
 		}

src/mthrowu.c

@@ -421,21 +421,22 @@ m_throw(mon, x, y, dx, dy, range, obj)
 			(void) drop_throw(singleobj, hitu, u.ux, u.uy);
 			break;
 		    }
-		} else if (!range	/* reached end of path */
-			/* missile hits edge of screen */
-			|| !isok(bhitpos.x+dx,bhitpos.y+dy)
-			/* missile hits the wall */
-			|| IS_ROCK(levl[bhitpos.x+dx][bhitpos.y+dy].typ)
-			/* missile hit closed door */
-			|| closed_door(bhitpos.x+dx, bhitpos.y+dy)
-			/* missile might hit iron bars */
-			|| (levl[bhitpos.x+dx][bhitpos.y+dy].typ == IRONBARS &&
-			hits_bars(&singleobj, bhitpos.x, bhitpos.y, !rn2(5), 0))
+		}
+                if (!range /* reached end of path */
+                    /* missile hits edge of screen */
+                    || !isok(bhitpos.x+dx,bhitpos.y+dy)
+                    /* missile hits the wall */
+                    || IS_ROCK(levl[bhitpos.x+dx][bhitpos.y+dy].typ)
+                    /* missile hit closed door */
+                    || closed_door(bhitpos.x+dx, bhitpos.y+dy)
+                    /* missile might hit iron bars */
+                    || (levl[bhitpos.x+dx][bhitpos.y+dy].typ == IRONBARS &&
+                    hits_bars(&singleobj, bhitpos.x, bhitpos.y, !rn2(5), 0))
 #ifdef SINKS
-			/* Thrown objects "sink" */
-			|| IS_SINK(levl[bhitpos.x][bhitpos.y].typ)
+		    /* Thrown objects "sink" */
+		    || IS_SINK(levl[bhitpos.x][bhitpos.y].typ)
 #endif
-								) {
+		    ) {
 		    if (singleobj) /* hits_bars might have destroyed it */
 			(void) drop_throw(singleobj, 0, bhitpos.x, bhitpos.y);
 		    break;

src/options.c

@@ -79,6 +79,9 @@ static struct Bool_Opt
 	{"checkspace", &iflags.checkspace, TRUE, SET_IN_GAME},
 #else
 	{"checkspace", (boolean *)0, FALSE, SET_IN_FILE},
+#endif
+#ifdef CURSES_GRAPHICS
+	{"classic_status", &iflags.classic_status, TRUE, SET_IN_FILE},
 #endif
 	{"cmdassist", &iflags.cmdassist, TRUE, SET_IN_GAME},
 # if defined(MICRO) || defined(WIN32) || defined(CURSES_GRAPHICS)
@@ -637,6 +640,7 @@ initoptions()
 #ifdef SORTLOOT
 	iflags.sortloot = 'n';
 #endif
+        iflags.msg_is_alert = FALSE;
 
      /* assert( sizeof flags.inv_order == sizeof def_inv_order ); */
 	(void)memcpy((genericptr_t)flags.inv_order,

src/pline.c

@@ -218,7 +218,15 @@ pline VA_DECL(const char *, line)
 
 	putstr(WIN_MESSAGE, 0, line);
 	strncpy(prevmsg, line, BUFSZ);
-	if (typ == MSGTYP_STOP) display_nhwindow(WIN_MESSAGE, TRUE); /* --more-- */
+	switch (typ) {
+	case MSGTYP_ALERT:
+	    iflags.msg_is_alert = TRUE; /* <TAB> */
+	    /* FT */
+	case MSGTYP_STOP:
+	    display_nhwindow(WIN_MESSAGE, TRUE); /* --more-- */
+	    break;
+	}
+	iflags.msg_is_alert = FALSE;
 }
 
 /*VARARGS1*/

sys/unix/Makefile.src

@@ -177,9 +177,9 @@ WINTTYOBJ = getline.o termcap.o topl.o wintty.o tile.o
 WINCURSESSRC = ../win/curses/cursmain.c ../win/curses/curswins.c \
 	../win/curses/cursmisc.c ../win/curses/cursdial.c \
 	../win/curses/cursstat.c ../win/curses/cursinit.c \
-	../win/curses/cursmesg.c
+	../win/curses/cursmesg.c ../win/curses/cursinvt.c
 WINCURSESOBJ = cursmain.o curswins.o cursmisc.o cursdial.o cursstat.o \
-	cursinit.o cursmesg.o
+	cursinit.o cursmesg.o cursinvt.o
 #
 #
 # files for an X11 port
@@ -635,6 +635,9 @@ cursinit.o: ../win/curses/cursinit.c $(HACK_H) ../include/wincurs.h \
 cursmesg.o: ../win/curses/cursmesg.c $(HACK_H) ../include/wincurs.h \
 		../win/curses/cursmesg.h
 	$(CC) $(CFLAGS) -c ../win/curses/cursmesg.c
+cursinvt.o: ../win/curses/cursinvt.c $(HACK_H) ../include/wincurs.h \
+		../win/curses/cursinvt.h
+	$(CC) $(CFLAGS) -c ../win/curses/cursinvt.c
 Window.o: ../win/X11/Window.c ../include/xwindowp.h ../include/xwindow.h \
 		$(CONFIG_H)
 	$(CC) $(CFLAGS) -c ../win/X11/Window.c