d418008b31
Back out '#include "date.h"' so that cursinit.c won't be recompiled every time any other file(s) need to be compiled. It doesn't need patchlevel.h either. There is already a straightforward way to fetch the copyright banner lines from version.c. The splash screen (ascii art spelling "NetHack" preceding the normal copyright lines) was invisible when showing white text on white-ish background. Make it honor !guicolor. "Shall I pick a character's role, race, gender and alignment for you? [ynaq] (y) " was too wide to accept the answer on the same line on an 80-column display so "(y) " was placed on the second line. That's constructed in the core; change the construction to omit " a" when using "character" rather than a role name. (tty shortens it by omitting the default " (y)"; with " a" gone, it could revert to normal prompt.) Also a bit of lint cleanup and some reformatting of cursinit.c....
108 lines
2.8 KiB
C
108 lines
2.8 KiB
C
/* vim:set cin ft=c sw=4 sts=4 ts=8 et ai cino=Ls\:0t0(0 : -*- mode:c;fill-column:80;tab-width:8;c-basic-offset:4;indent-tabs-mode:nil;c-file-style:"k&r" -*-*/
|
|
/* NetHack 3.6 cursinvt.c */
|
|
/* Copyright (c) Fredrik Ljungdahl, 2017. */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#include "curses.h"
|
|
#include "hack.h"
|
|
#include "wincurs.h"
|
|
#include "cursinvt.h"
|
|
|
|
/* Permanent inventory for curses interface */
|
|
|
|
/* Runs when the game indicates that the inventory has been updated */
|
|
void
|
|
curses_update_inv(void)
|
|
{
|
|
WINDOW *win = curses_get_nhwin(INV_WIN);
|
|
boolean border;
|
|
int x = 0, y = 0;
|
|
|
|
/* Check if the inventory window is enabled in first place */
|
|
if (!win) {
|
|
/* It's not. Re-initialize the main windows if the
|
|
option was enabled. */
|
|
if (iflags.perm_invent) {
|
|
curses_create_main_windows();
|
|
curses_last_messages();
|
|
doredraw();
|
|
}
|
|
return;
|
|
}
|
|
|
|
border = curses_window_has_border(INV_WIN);
|
|
|
|
/* Figure out drawing area */
|
|
if (border) {
|
|
x++;
|
|
y++;
|
|
}
|
|
|
|
/* Clear the window as it is at the moment. */
|
|
werase(win);
|
|
|
|
display_inventory(NULL, FALSE);
|
|
|
|
if (border)
|
|
box(win, 0, 0);
|
|
|
|
wnoutrefresh(win);
|
|
}
|
|
|
|
/* Adds an inventory item. */
|
|
void
|
|
curses_add_inv(int y,
|
|
int glyph UNUSED,
|
|
CHAR_P accelerator, attr_t attr, const char *str)
|
|
{
|
|
WINDOW *win = curses_get_nhwin(INV_WIN);
|
|
int color = NO_COLOR;
|
|
int x = 0;
|
|
|
|
/* Figure out where to draw the line */
|
|
if (curses_window_has_border(INV_WIN)) {
|
|
x++;
|
|
}
|
|
|
|
wmove(win, y, x);
|
|
if (accelerator) {
|
|
attr_t bold = A_BOLD;
|
|
|
|
wattron(win, bold);
|
|
waddch(win, accelerator);
|
|
wattroff(win, bold);
|
|
wprintw(win, ") ");
|
|
}
|
|
#if 0 /* FIXME: MENU GLYPHS */
|
|
if (accelerator && glyph != NO_GLYPH && iflags.use_menu_glyphs) {
|
|
unsigned dummy = 0; /* Not used */
|
|
int color = 0;
|
|
int symbol = 0;
|
|
attr_t glyphclr;
|
|
|
|
mapglyph(glyph, &symbol, &color, &dummy,
|
|
u.ux, u.uy);
|
|
glyphclr = curses_color_attr(color, 0);
|
|
wattron(win, glyphclr);
|
|
wprintw(win, "%c ", symbol);
|
|
wattroff(win, glyphclr);
|
|
}
|
|
#endif
|
|
if (accelerator /* Don't colorize categories */
|
|
&& iflags.use_menu_color) {
|
|
char str_mutable[BUFSZ];
|
|
|
|
Strcpy(str_mutable, str);
|
|
attr = 0;
|
|
get_menu_coloring(str_mutable, &color, (int *) &attr);
|
|
attr = curses_convert_attr(attr);
|
|
}
|
|
if (color == NO_COLOR) color = NONE;
|
|
curses_toggle_color_attr(win, color, attr, ON);
|
|
/* wattron(win, attr); */
|
|
wprintw(win, "%s", str);
|
|
/* wattroff(win, attr); */
|
|
curses_toggle_color_attr(win, color, attr, OFF);
|
|
wclrtoeol(win);
|
|
}
|