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

no quotes in WINDOWPORT macro invocation

Browse Source
This commit is contained in:
nhmall
2022-06-29 22:13:28 -04:00
parent eaa3b35fcf
commit a518d82c54
16 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/winprocs.h
+1 -1
View File
@@ -279,7 +279,7 @@ struct wc_Opt {
/* Macro for the currently active Window Port whose function
pointers have been loaded */
#define WINDOWPORT(wn) \
(windowprocs.name && !strncmpi((wn), windowprocs.name, strlen((wn))))
(windowprocs.name && !strncmpi((#wn), windowprocs.name, strlen((#wn))))
/* role selection by player_selection(); this ought to be in the core... */
#define RS_NAME 0
src/bones.c
+1 -1
View File
@@ -195,7 +195,7 @@ void
sanitize_name(char *namebuf)
{
int c;
boolean strip_8th_bit = (WINDOWPORT("tty")
boolean strip_8th_bit = (WINDOWPORT(tty)
&& !iflags.wc_eight_bit_input);
/* it's tempting to skip this for single-user platforms, since
src/cmd.c
+1 -1
View File
@@ -1532,7 +1532,7 @@ wiz_show_wmodes(void)
int x, y;
char row[COLNO + 1];
struct rm *lev;
boolean istty = WINDOWPORT("tty");
boolean istty = WINDOWPORT(tty);
win = create_nhwindow(NHW_TEXT);
if (istty)
src/end.c
+1 -1
View File
@@ -110,7 +110,7 @@ panictrace_handler(int sig_unused UNUSED)
int f2;
#ifdef CURSES_GRAPHICS
if (iflags.window_inited && WINDOWPORT("curses")) {
if (iflags.window_inited && WINDOWPORT(curses)) {
extern void curses_uncurse_terminal(void); /* wincurs.h */
/* it is risky calling this during a program-terminating signal,
src/files.c
+1 -1
View File
@@ -1361,7 +1361,7 @@ docompress_file(const char *filename, boolean uncomp)
int f;
unsigned ln;
#ifdef TTY_GRAPHICS
boolean istty = WINDOWPORT("tty");
boolean istty = WINDOWPORT(tty);
#endif
#ifdef COMPRESS_EXTENSION
src/invent.c
+3 -3
View File
@@ -2441,7 +2441,7 @@ update_inventory(void)
save_suppress_price = iflags.suppress_price;
iflags.suppress_price = 0;
#if defined(TTY_PERM_INVENT) && defined(CORE_INVENT)
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
sync_perminvent();
else
#else
@@ -5407,7 +5407,7 @@ sync_perminvent(void)
* FALSE without actually doing anything else.
*/
#ifdef TTY_PERM_INVENT
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
perm_invent_toggled(TRUE); /* TRUE means negated */
#endif
(void) doredraw();
@@ -5443,7 +5443,7 @@ sync_perminvent(void)
* [port]_update_inventory() mechanism.
*/
if (WINDOWPORT("tty") && iflags.perm_invent)
if (WINDOWPORT(tty) && iflags.perm_invent)
wport_id = "tty perm_invent";
else
wport_id = "perm_invent";
src/options.c
+8 -8
View File
@@ -2063,7 +2063,7 @@ optfn_msg_window(int optidx, int req, boolean negated, char *opts, char *op)
opts[0] = '\0';
#if PREV_MSGS
tmp = iflags.prevmsg_window;
if (WINDOWPORT("curses")) {
if (WINDOWPORT(curses)) {
if (tmp == 's' || tmp == 'c')
tmp = iflags.prevmsg_window = 'r';
}
@@ -2492,7 +2492,7 @@ optfn_petattr(int optidx, int req, boolean negated, char *opts, char *op)
return optn_err;
#ifdef CURSES_GRAPHICS
if (WINDOWPORT("curses")) {
if (WINDOWPORT(curses)) {
char tmpbuf[QBUFSZ];
Strcpy(opts, curses_fmt_attrs(tmpbuf));
@@ -4408,7 +4408,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op)
perm_invent_toggled() and routines it calls don't check
iflags.perm_invent so it doesn't matter that 'SET IT HERE'
hasn't been executed yet */
if (WINDOWPORT("tty") && !g.opt_initial && !negated) {
if (WINDOWPORT(tty) && !g.opt_initial && !negated) {
perm_invent_toggled(FALSE);
/* perm_invent_toggled()
-> sync_perminvent()
@@ -4498,7 +4498,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op)
break;
case opt_hilite_pet:
#ifdef CURSES_GRAPHICS
if (WINDOWPORT("curses")) {
if (WINDOWPORT(curses)) {
/* if we're enabling hilite_pet and petattr isn't set,
set it to Inverse; if we're disabling, leave petattr
alone so that re-enabling will get current value back
@@ -4515,7 +4515,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op)
status_initialize(REASSESS_ONLY);
g.opt_need_redraw = TRUE;
#ifdef QT_GRAPHICS
} else if (WINDOWPORT("Qt")) {
} else if (WINDOWPORT(Qt)) {
/* Qt doesn't support HILITE_STATUS or FLUSH_STATUS so fails
VIA_WINDOWPORT(), but it does support WC2_HITPOINTBAR */
g.context.botlx = TRUE;
@@ -4877,7 +4877,7 @@ handler_msg_window(void)
#if PREV_MSGS /* tty or curses */
winid tmpwin;
anything any;
boolean is_tty = WINDOWPORT("tty"), is_curses = WINDOWPORT("curses");
boolean is_tty = WINDOWPORT(tty), is_curses = WINDOWPORT(curses);
int clr = 0;
if (is_tty || is_curses) {
@@ -6304,7 +6304,7 @@ initoptions_finish(void)
* Option processing can take place before a user-decided WindowPort
* is even initialized, so check for that too.
*/
if (!WINDOWPORT("safe-startup")) {
if (!WINDOWPORT(safe-startup)) {
if (iflags.hilite_delta && !wc2_supported("statushilites")) {
raw_printf("Status highlighting not supported for %s interface.",
windowprocs.name);
@@ -8956,7 +8956,7 @@ enhance_menu_text(
availsz = sz - nowsz;
#ifdef TTY_PERM_INVENT
if (bool_p == &iflags.perm_invent && WINDOWPORT("tty")) {
if (bool_p == &iflags.perm_invent && WINDOWPORT(tty)) {
if (thisopt->setwhere == set_gameview)
Snprintf(eos(buf), availsz, " *terminal size is too small");
}
src/restore.c
+3 -3
View File
@@ -788,7 +788,7 @@ dorecover(NHFILE* nhfp)
#ifdef AMII_GRAPHICS
{
extern struct window_procs amii_procs;
if (WINDOWPORT("amii")) {
if (WINDOWPORT(amii)) {
extern winid WIN_BASE;
clear_nhwindow(WIN_BASE); /* hack until there's a hook for this */
}
@@ -804,7 +804,7 @@ dorecover(NHFILE* nhfp)
curs(WIN_MAP, 1, 1);
dotcnt = 0;
dotrow = 2;
if (!WINDOWPORT("X11"))
if (!WINDOWPORT(X11))
putstr(WIN_MAP, 0, "Restoring:");
#endif
restoreinfo.mread_flags = 1; /* return despite error */
@@ -821,7 +821,7 @@ dorecover(NHFILE* nhfp)
dotrow++;
dotcnt = 0;
}
if (!WINDOWPORT("X11")) {
if (!WINDOWPORT(X11)) {
putstr(WIN_MAP, 0, ".");
}
mark_synch();
src/save.c
+2 -2
View File
@@ -149,7 +149,7 @@ dosave0(void)
dotcnt = 0;
dotrow = 2;
curs(WIN_MAP, 1, 1);
if (!WINDOWPORT("X11"))
if (!WINDOWPORT(X11))
putstr(WIN_MAP, 0, "Saving:");
#endif
nhfp->mode = WRITING | FREEING;
@@ -197,7 +197,7 @@ dosave0(void)
dotrow++;
dotcnt = 0;
}
if (!WINDOWPORT("X11")) {
if (!WINDOWPORT(X11)) {
putstr(WIN_MAP, 0, ".");
}
mark_synch();
src/sounds.c
+3 -3
View File
@@ -1516,16 +1516,16 @@ maybe_play_sound(const char* msg)
&& !iflags.vt_sounddata
#endif
#if defined(QT_GRAPHICS)
&& WINDOWPORT("Qt")
&& WINDOWPORT(Qt)
#endif
#if defined(WIN32)
&& (WINDOWPORT("tty") || WINDOWPORT("mswin") || WINDOWPORT("curses"))
&& (WINDOWPORT(tty) || WINDOWPORT(mswin) || WINDOWPORT(curses))
#endif
#endif /* WIN32 || QT_GRAPHICS */
)
play_usersound(snd->filename, snd->volume);
#if defined(TTY_GRAPHICS) && defined(TTY_SOUND_ESCCODES)
else if (snd && iflags.vt_sounddata && snd->idx >= 0 && WINDOWPORT("tty"))
else if (snd && iflags.vt_sounddata && snd->idx >= 0 && WINDOWPORT(tty))
play_usersound_via_idx(snd->idx, snd->volume);
#endif /* TTY_GRAPHICS && TTY_SOUND_ESCCODES */
#endif /* WIN32 || QT_GRAPHICS || TTY_SOUND_ESCCODES */
src/windows.c
+1 -1
View File
@@ -312,7 +312,7 @@ choose_windows(const char *s)
free((genericptr_t) tmps) /*, tmps = 0*/ ;
if (windowprocs.win_raw_print == def_raw_print
|| WINDOWPORT("safe-startup"))
|| WINDOWPORT(safe-startup))
nh_terminate(EXIT_SUCCESS);
}
sys/share/pcunix.c
+1 -1
View File
@@ -188,7 +188,7 @@ getlock(void)
#else /*SELF_RECOVER*/
if (recover_savefile()) {
#if defined(TTY_GRAPHICS)
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
clear_screen(); /* display gets fouled up otherwise */
#endif
goto gotlock;
sys/share/unixtty.c
+8 -8
View File
@@ -316,7 +316,7 @@ void intron(void) /* enable kbd interupts if enabled when game started */
{
#ifdef TTY_GRAPHICS
/* Ugly hack to keep from changing tty modes for non-tty games -dlc */
if (WINDOWPORT("tty") && intr_char != nonesuch
if (WINDOWPORT(tty) && intr_char != nonesuch
&& curttyb2.intr_sym != '\003') {
curttyb2.intr_sym = '\003';
setctty();
@@ -328,7 +328,7 @@ void introff(void) /* disable kbd interrupts if required*/
{
#ifdef TTY_GRAPHICS
/* Ugly hack to keep from changing tty modes for non-tty games -dlc */
if (WINDOWPORT("tty") && curttyb2.intr_sym != nonesuch) {
if (WINDOWPORT(tty) && curttyb2.intr_sym != nonesuch) {
curttyb2.intr_sym = nonesuch;
setctty();
}
@@ -356,7 +356,7 @@ void
sco_mapon(void)
{
#ifdef TTY_GRAPHICS
if (WINDOWPORT("tty") && sco_flag_console) {
if (WINDOWPORT(tty) && sco_flag_console) {
if (sco_map_valid != -1) {
ioctl(0, LDSMAP, sco_chanmap_buf);
}
@@ -369,7 +369,7 @@ void
sco_mapoff(void)
{
#ifdef TTY_GRAPHICS
if (WINDOWPORT("tty") && sco_flag_console) {
if (WINDOWPORT(tty) && sco_flag_console) {
sco_map_valid = ioctl(0, LDGMAP, sco_chanmap_buf);
if (sco_map_valid != -1) {
ioctl(0, LDNMAP, (char *) 0);
@@ -390,7 +390,7 @@ void
init_sco_cons(void)
{
#ifdef TTY_GRAPHICS
if (WINDOWPORT("tty") && sco_flag_console) {
if (WINDOWPORT(tty) && sco_flag_console) {
atexit(sco_mapon);
sco_mapoff();
load_symset("IBMGraphics", PRIMARYSET);
@@ -420,7 +420,7 @@ void
linux_mapon(void)
{
#ifdef TTY_GRAPHICS
if (WINDOWPORT("tty") && linux_flag_console) {
if (WINDOWPORT(tty) && linux_flag_console) {
write(1, "\033(B", 3);
}
#endif
@@ -430,7 +430,7 @@ void
linux_mapoff(void)
{
#ifdef TTY_GRAPHICS
if (WINDOWPORT("tty") && linux_flag_console) {
if (WINDOWPORT(tty) && linux_flag_console) {
write(1, "\033(U", 3);
}
#endif
@@ -450,7 +450,7 @@ void
init_linux_cons(void)
{
#ifdef TTY_GRAPHICS
if (WINDOWPORT("tty") && linux_flag_console) {
if (WINDOWPORT(tty) && linux_flag_console) {
atexit(linux_mapon);
linux_mapoff();
#ifdef TEXTCOLOR
sys/windows/consoletty.c
+1 -1
View File
@@ -1441,7 +1441,7 @@ cl_end(void)
void
raw_clear_screen(void)
{
if (WINDOWPORT("tty")) {
if (WINDOWPORT(tty)) {
cell_t * back = console.back_buffer;
cell_t * front = console.front_buffer;
COORD pos;
sys/windows/windmain.c
+11 -11
View File
@@ -541,14 +541,14 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
nethack_enter(argc, argv);
iflags.use_background_glyph = FALSE;
if (WINDOWPORT("mswin"))
if (WINDOWPORT(mswin))
iflags.use_background_glyph = TRUE;
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
consoletty_open(1);
init_nhwindows(&argc, argv);
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
toggle_mouse_support();
if (g.symset[PRIMARYSET].handling
@@ -569,7 +569,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
#endif /* TERMLIB || CURSES */
#if 0
#ifdef CURSES_GRAPHICS
if (WINDOWPORT("curses"))
if (WINDOWPORT(curses))
(*cursesgraphics_mode_callback)();
#endif
#endif
@@ -893,7 +893,7 @@ safe_routines(void)
* Get a set of valid safe windowport function
* pointers during early startup initialization.
*/
if (!WINDOWPORT("safe-startup"))
if (!WINDOWPORT(safe-startup))
windowprocs = *get_safe_procs(1);
if (!GUILaunched)
windowprocs.win_nhgetch = windows_console_custom_nhgetch;
@@ -1148,7 +1148,7 @@ getlock(void)
const char *fq_lock;
#define OOPS_BUFSZ 512
char oops[OOPS_BUFSZ];
boolean istty = WINDOWPORT("tty");
boolean istty = WINDOWPORT(tty);
/* we ignore QUIT and INT at this point */
if (!lock_file(HLOCK, LOCKPREFIX, 10)) {
@@ -1179,7 +1179,7 @@ getlock(void)
(void) nhclose(fd);
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
prompt_result = tty_self_recover_prompt();
else
prompt_result = other_self_recover_prompt();
@@ -1316,7 +1316,7 @@ tty_self_recover_prompt(void)
c = 'n';
ct = 0;
saved_procs = windowprocs;
if (!WINDOWPORT("safe-startup"))
if (!WINDOWPORT(safe-startup))
windowprocs = *get_safe_procs(2); /* arg 2 uses no-newline variant */
windowprocs.win_nhgetch = windows_console_custom_nhgetch;
raw_print("\n");
@@ -1376,13 +1376,13 @@ int
other_self_recover_prompt(void)
{
register int c, ci, ct, pl, retval = 0;
boolean ismswin = WINDOWPORT("mswin"),
iscurses = WINDOWPORT("curses");
boolean ismswin = WINDOWPORT(mswin),
iscurses = WINDOWPORT(curses);
pl = 1;
c = 'n';
ct = 0;
if (iflags.window_inited || WINDOWPORT("curses")) {
if (iflags.window_inited || WINDOWPORT(curses)) {
c = yn("There are files from a game in progress under your name. "
"Recover?");
} else {
sys/windows/windsys.c
+5 -5
View File
@@ -201,7 +201,7 @@ VA_DECL(const char *, s)
/* error() may get called before tty is initialized */
if (iflags.window_inited)
end_screen();
if (WINDOWPORT("tty")) {
if (WINDOWPORT(tty)) {
buf[0] = '\n';
(void) vsnprintf(&buf[1], sizeof buf - (1 + sizeof "\n"), s, VA_ARGS);
Strcat(buf, "\n");
@@ -228,12 +228,12 @@ win32_abort(void)
{
int c;
if (WINDOWPORT("mswin") || WINDOWPORT("tty")) {
if (WINDOWPORT(mswin) || WINDOWPORT(tty)) {
if (iflags.window_inited)
exit_nhwindows((char *) 0);
iflags.window_inited = FALSE;
}
if (!WINDOWPORT("mswin") && !WINDOWPORT("safe-startup"))
if (!WINDOWPORT(mswin) && !WINDOWPORT(safe-startup))
safe_routines();
if (wizard) {
raw_print("Execute debug breakpoint wizard?");
@@ -482,7 +482,7 @@ getreturn(const char *str)
in_getreturn = TRUE;
Sprintf(buf,"Hit <Enter> %s.", str);
raw_print(buf);
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
windows_console_custom_nhgetch();
wait_synch();
in_getreturn = FALSE;
@@ -493,7 +493,7 @@ getreturn(const char *str)
initializing the window port */
void nethack_enter_windows(void)
{
if (WINDOWPORT("tty"))
if (WINDOWPORT(tty))
nethack_enter_consoletty();
}