1f6c1d0f42
The walls for the mines, gehennom, knox, and sokoban had been changed at the "tile"-level, with no awareness of the core game, or non-tile interfaces. - Expand the glyphs to include a set of walls for the main level as well as each of those mentioned above. Altars had been adjusted at the map_glyphinfo() level to substitute some color variations on-the-fly for unaligned, chaotic, neutral, lawful altars, and shrines. The tile interface had no awareness of the feature. - Expand the glyphs to include each of the altar variations that had been implemented in the display code for tty-only. This required the addition of four placeholder tiles in other.txt. Someone with artistic skill will hopefully alter the additional tiles to better reflect their intended purpose. Explosions had unique tiles in the tile window port, and the display code for tty tinkered with the colors, but the game had very little awareness of the different types of explosions. - Expand the glyphs to include each of the explosion types: dark, noxious, muddy, wet, magical, fiery and frosty. Pile-markers to represent a pile had been introduced at the display-level, without little to no awareness by the core game. - Expand the glyphs to include piletops, including objects, bodys, and statues. Recently male and female variations of tiles and monsters had been had been introduced, but the mechanics had been mostly done at the display-level through a marker flag. The window port interface then had to increment the tile mapped to the glyph to get the female version of the tile. - Expand the glyphs to include the male and female versions of the monsters, and their corresponding pet versions, ridden, detected versions and statues of them. Direct references to GLYPH_BODY_OFF and GLYPH_STATUE_OFF in object_from_map() in pager.c were getting incomplete results. - Add macros glyph_to_body_corpsenm(glyph) and glyph_to_statue_corpsenm(glyph) macros for obtaining the corpsenm value after passing the glyph_is_body() or glyph_is_statue() test. Other relevant notes: - The tile ordering in the win/share/*.txt tile files has been altered, other.txt in particular. - tilemap.c has had a lot of alterations to accommodate the expanded glyphs. Output that is useful for troubleshooting will end up in tilemappings.lst if OBTAIN_TILEMAP is defined during build. It lists all of the glyphs and which tile it gets mapped to, and also lists each tile and some of the references to it by various glyphs. - An array glyphmap[MAXGLYPH] is now used. It has an entry for each glyph, ordered by glyph, and once reset_glyphs(glyph) has been run, it contains the mapped symindex, default color, glyphflags, and tile index. If USE_TILES is defined during build, the tile.c produced from the tilemap utility populates the tileidx field of each array element with a glyph-to-tile mapping for the glyph. Later on, when reset_glyphmap() is run, the other fields of each element will get populated. - The glyph-to-tile mapping is an added field available to a window port via the glyphinfo struct passed in the documented interface. The old glyph2tile[] array is gone. The various active window ports that had been using glyph2tile[] have been updated to use the new interface mechanism. Disclaimer: There may be some bug fixing or tidying required in the window port code. - reset_glyphmap() is called after config file options parsing has finished, because some config file settings can impact the results produced by reset_glyphmap(). - Everything that passes the glyph_is_cmap(glyph) test must return a valid cmap value from glyph_to_cmap(glyph). - An 'extern glyph_info glyphmap[MAX_GLYPH];' is inserted into the top of only the files which need awareness of it, not inserted into display.h. Presently, the only files that actually need to directly reference the glyphmap[] array are display.c, o_init.c (for shuffling the tiles), and the generated tile.c (if USE_TILES is defined). - Added an MG_MALE glyphflag to complement the MG_FEMALE glyphflag. - Provide an array for wall colorizations. reset_glyphmap() will draw the colors from this array: int array wallcolors[sokoban_walls + 1]; The indices of the wallcolors array are main_walls (0), mines_walls (1), gehennom_walls (2), knox_walls (3), and sokoban_walls (4). In future, a config file option for adjusting the wall colors and/or an 'O' option menu to do the same could be added. Right now, the initializaton of the wallcolors[] array entries in display.c leaves the walls at CLR_GRAY, matching the defsym color. - Most of the display-level kludges for some of the on-the-fly interface features have been removed from map_glyphinfo() as they aren't needed any longer. These glyph expansions adhere more closely to the original glyph mechanics of the game. - Because the glyphs are re-ordered and expanded, an update to editlevel will be required upon merge of these changes.
279 lines
8.4 KiB
C
279 lines
8.4 KiB
C
/* NetHack 3.7 wintty.h $NHDT-Date: 1596498572 2020/08/03 23:49:32 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.44 $ */
|
|
/* Copyright (c) David Cohrs, 1991,1992 */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#ifndef WINTTY_H
|
|
#define WINTTY_H
|
|
|
|
#define E extern
|
|
|
|
#ifndef WINDOW_STRUCTS
|
|
#define WINDOW_STRUCTS
|
|
|
|
/* menu structure */
|
|
typedef struct tty_mi {
|
|
struct tty_mi *next;
|
|
anything identifier; /* user identifier */
|
|
long count; /* user count */
|
|
char *str; /* description string (including accelerator) */
|
|
int attr; /* string attribute */
|
|
boolean selected; /* TRUE if selected by user */
|
|
unsigned itemflags; /* item flags */
|
|
char selector; /* keyboard accelerator */
|
|
char gselector; /* group accelerator */
|
|
} tty_menu_item;
|
|
|
|
/* descriptor for tty-based windows */
|
|
struct WinDesc {
|
|
int flags; /* window flags */
|
|
xchar type; /* type of window */
|
|
boolean active; /* true if window is active */
|
|
short offx, offy; /* offset from topleft of display */
|
|
long rows, cols; /* dimensions */
|
|
long curx, cury; /* current cursor position */
|
|
long maxrow, maxcol; /* the maximum size used -- for MENU wins */
|
|
unsigned long mbehavior; /* menu behavior flags (MENU) */
|
|
/* maxcol is also used by WIN_MESSAGE for */
|
|
/* tracking the ^P command */
|
|
short *datlen; /* allocation size for *data */
|
|
char **data; /* window data [row][column] */
|
|
char *morestr; /* string to display instead of default */
|
|
tty_menu_item *mlist; /* menu information (MENU) */
|
|
tty_menu_item **plist; /* menu page pointers (MENU) */
|
|
long plist_size; /* size of allocated plist (MENU) */
|
|
long npages; /* number of pages in menu (MENU) */
|
|
long nitems; /* total number of items (MENU) */
|
|
short how; /* menu mode - pick 1 or N (MENU) */
|
|
char menu_ch; /* menu char (MENU) */
|
|
};
|
|
|
|
/* window flags */
|
|
#define WIN_CANCELLED 1
|
|
#define WIN_STOP 1 /* for NHW_MESSAGE; stops output */
|
|
#define WIN_LOCKHISTORY 2 /* for NHW_MESSAGE; suppress history updates */
|
|
|
|
/* topline states */
|
|
#define TOPLINE_EMPTY 0 /* empty */
|
|
#define TOPLINE_NEED_MORE 1 /* non-empty, need --More-- */
|
|
#define TOPLINE_NON_EMPTY 2 /* non-empty, no --More-- required */
|
|
#define TOPLINE_SPECIAL_PROMPT 3 /* special prompt state */
|
|
|
|
/* descriptor for tty-based displays -- all the per-display data */
|
|
struct DisplayDesc {
|
|
short rows, cols; /* width and height of tty display */
|
|
short curx, cury; /* current cursor position on the screen */
|
|
#ifdef TEXTCOLOR
|
|
int color; /* current color */
|
|
#endif
|
|
int attrs; /* attributes in effect */
|
|
int toplin; /* flag for topl stuff */
|
|
int rawprint; /* number of raw_printed lines since synch */
|
|
int inmore; /* non-zero if more() is active */
|
|
int inread; /* non-zero if reading a character */
|
|
int intr; /* non-zero if inread was interrupted */
|
|
winid lastwin; /* last window used for I/O */
|
|
char dismiss_more; /* extra character accepted at --More-- */
|
|
};
|
|
|
|
#endif /* WINDOW_STRUCTS */
|
|
|
|
#ifdef STATUS_HILITES
|
|
struct tty_status_fields {
|
|
int idx;
|
|
int color;
|
|
int attr;
|
|
int x, y;
|
|
size_t lth;
|
|
boolean valid;
|
|
boolean dirty;
|
|
boolean redraw;
|
|
boolean sanitycheck; /* was 'last_in_row' */
|
|
};
|
|
#endif
|
|
|
|
#define MAXWIN 20 /* maximum number of windows, cop-out */
|
|
|
|
/* tty dependent window types */
|
|
#ifdef NHW_BASE
|
|
#undef NHW_BASE
|
|
#endif
|
|
#define NHW_BASE 6
|
|
|
|
extern struct window_procs tty_procs;
|
|
|
|
/* port specific variable declarations */
|
|
extern winid BASE_WINDOW;
|
|
|
|
extern struct WinDesc *wins[MAXWIN];
|
|
|
|
extern struct DisplayDesc *ttyDisplay; /* the tty display descriptor */
|
|
|
|
extern char morc; /* last character typed to xwaitforspace */
|
|
extern char defmorestr[]; /* default --more-- prompt */
|
|
|
|
/* port specific external function references */
|
|
|
|
/* ### getline.c ### */
|
|
E void xwaitforspace(const char *);
|
|
|
|
/* ### termcap.c, video.c ### */
|
|
|
|
E void tty_startup(int *, int *);
|
|
#ifndef NO_TERMS
|
|
E void tty_shutdown(void);
|
|
#endif
|
|
E int xputc(int);
|
|
E void xputs(const char *);
|
|
#if defined(SCREEN_VGA) || defined(SCREEN_8514)
|
|
E void xputg(const glyph_info *);
|
|
#endif
|
|
E void cl_end(void);
|
|
E void clear_screen(void);
|
|
E void home(void);
|
|
E void standoutbeg(void);
|
|
E void standoutend(void);
|
|
#if 0
|
|
E void revbeg(void);
|
|
E void boldbeg(void);
|
|
E void blinkbeg(void);
|
|
E void dimbeg(void);
|
|
E void m_end(void);
|
|
#endif
|
|
E void backsp(void);
|
|
E void graph_on(void);
|
|
E void graph_off(void);
|
|
E void cl_eos(void);
|
|
|
|
/*
|
|
* termcap.c (or facsimiles in other ports) is the right place for doing
|
|
* strange and arcane things such as outputting escape sequences to select
|
|
* a color or whatever. wintty.c should concern itself with WHERE to put
|
|
* stuff in a window.
|
|
*/
|
|
E int term_attr_fixup(int);
|
|
E void term_start_attr(int attr);
|
|
E void term_end_attr(int attr);
|
|
E void term_start_raw_bold(void);
|
|
E void term_end_raw_bold(void);
|
|
|
|
#ifdef TEXTCOLOR
|
|
E void term_end_color(void);
|
|
E void term_start_color(int color);
|
|
#endif /* TEXTCOLOR */
|
|
|
|
/* ### topl.c ### */
|
|
|
|
E void show_topl(const char *);
|
|
E void remember_topl(void);
|
|
E void addtopl(const char *);
|
|
E void more(void);
|
|
E void update_topl(const char *);
|
|
E void putsyms(const char *);
|
|
|
|
/* ### wintty.c ### */
|
|
#ifdef CLIPPING
|
|
E void setclipped(void);
|
|
#endif
|
|
E void docorner(int, int);
|
|
E void end_glyphout(void);
|
|
E void g_putch(int);
|
|
E void win_tty_init(int);
|
|
|
|
/* external declarations */
|
|
E void tty_init_nhwindows(int *, char **);
|
|
E void tty_preference_update(const char *);
|
|
E void tty_player_selection(void);
|
|
E void tty_askname(void);
|
|
E void tty_get_nh_event(void);
|
|
E void tty_exit_nhwindows(const char *);
|
|
E void tty_suspend_nhwindows(const char *);
|
|
E void tty_resume_nhwindows(void);
|
|
E winid tty_create_nhwindow(int);
|
|
E void tty_clear_nhwindow(winid);
|
|
E void tty_display_nhwindow(winid, boolean);
|
|
E void tty_dismiss_nhwindow(winid);
|
|
E void tty_destroy_nhwindow(winid);
|
|
E void tty_curs(winid, int, int);
|
|
E void tty_putstr(winid, int, const char *);
|
|
E void tty_display_file(const char *, boolean);
|
|
E void tty_start_menu(winid, unsigned long);
|
|
E void tty_add_menu(winid, const glyph_info *, const ANY_P *, char, char,
|
|
int, const char *, unsigned int);
|
|
E void tty_end_menu(winid, const char *);
|
|
E int tty_select_menu(winid, int, MENU_ITEM_P **);
|
|
E char tty_message_menu(char, int, const char *);
|
|
E void tty_update_inventory(int);
|
|
E void tty_mark_synch(void);
|
|
E void tty_wait_synch(void);
|
|
#ifdef CLIPPING
|
|
E void tty_cliparound(int, int);
|
|
#endif
|
|
#ifdef POSITIONBAR
|
|
E void tty_update_positionbar(char *);
|
|
#endif
|
|
E void tty_print_glyph(winid, xchar, xchar, const glyph_info *,
|
|
const glyph_info *);
|
|
E void tty_raw_print(const char *);
|
|
E void tty_raw_print_bold(const char *);
|
|
E int tty_nhgetch(void);
|
|
E int tty_nh_poskey(int *, int *, int *);
|
|
E void tty_nhbell(void);
|
|
E int tty_doprev_message(void);
|
|
E char tty_yn_function(const char *, const char *, char);
|
|
E void tty_getlin(const char *, char *);
|
|
E int tty_get_ext_cmd(void);
|
|
E void tty_number_pad(int);
|
|
E void tty_delay_output(void);
|
|
#ifdef CHANGE_COLOR
|
|
E void tty_change_color(int color, long rgb, int reverse);
|
|
#ifdef MAC
|
|
E void tty_change_background(int white_or_black);
|
|
E short set_tty_font_name(winid, char *);
|
|
#endif
|
|
E char *tty_get_color_string(void);
|
|
#endif
|
|
E void tty_status_enablefield(int, const char *, const char *, boolean);
|
|
E void tty_status_init(void);
|
|
E void tty_status_update(int, genericptr_t, int, int, int, unsigned long *);
|
|
|
|
/* other defs that really should go away (they're tty specific) */
|
|
E void tty_start_screen(void);
|
|
E void tty_end_screen(void);
|
|
|
|
E void genl_outrip(winid, int, time_t);
|
|
|
|
E char *tty_getmsghistory(boolean);
|
|
E void tty_putmsghistory(const char *, boolean);
|
|
|
|
#ifdef NO_TERMS
|
|
#ifdef MAC
|
|
#ifdef putchar
|
|
#undef putchar
|
|
#undef putc
|
|
#endif
|
|
#define putchar term_putc
|
|
#define fflush term_flush
|
|
#define puts term_puts
|
|
E int term_putc(int c);
|
|
E int term_flush(void *desc);
|
|
E int term_puts(const char *str);
|
|
#endif /* MAC */
|
|
#if defined(MSDOS) || defined(WIN32)
|
|
#if defined(SCREEN_BIOS) || defined(SCREEN_DJGPPFAST) || defined(WIN32)
|
|
#undef putchar
|
|
#undef putc
|
|
#undef puts
|
|
#define putchar(x) xputc(x) /* these are in video.c, nttty.c */
|
|
#define putc(x) xputc(x)
|
|
#define puts(x) xputs(x)
|
|
#endif /*SCREEN_BIOS || SCREEN_DJGPPFAST || WIN32 */
|
|
#ifdef POSITIONBAR
|
|
E void video_update_positionbar(char *);
|
|
#endif
|
|
#endif /*MSDOS*/
|
|
#endif /*NO_TERMS*/
|
|
|
|
#undef E
|
|
|
|
#endif /* WINTTY_H */
|