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

add msghandler support for win32

Browse Source
This commit is contained in:
SHIRAKATA Kentaro
2022-05-03 14:39:24 -07:00
committed by PatR
parent 2a801538fa
commit 1a361af084
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/config.h
+1 -1
View File
@@ -554,7 +554,7 @@ typedef unsigned char uchar;
/* NetHack will execute an external program whenever a new message-window /* NetHack will execute an external program whenever a new message-window
* message is shown. The program to execute is given in environment variable * message is shown. The program to execute is given in environment variable
* NETHACK_MSGHANDLER. It will get the message as the only parameter. * NETHACK_MSGHANDLER. It will get the message as the only parameter.
* Only available with POSIX_TYPES or GNU C */ * Only available with POSIX_TYPES, GNU C, or WIN32 */
/* #define MSGHANDLER */ /* #define MSGHANDLER */
/* enable status highlighting via STATUS_HILITE directives in run-time /* enable status highlighting via STATUS_HILITE directives in run-time
src/pline.c
+17 -5
View File
@@ -11,7 +11,7 @@
static void putmesg(const char *); static void putmesg(const char *);
static char *You_buf(int); static char *You_buf(int);
#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) #if defined(MSGHANDLER)
static void execplinehandler(const char *); static void execplinehandler(const char *);
#endif #endif
#ifdef USER_SOUNDS #ifdef USER_SOUNDS
@@ -187,7 +187,7 @@ vpline(const char *line, va_list the_args)
putmesg(line); putmesg(line);
#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) #if defined(MSGHANDLER)
execplinehandler(line); execplinehandler(line);
#endif #endif
@@ -486,7 +486,7 @@ vraw_printf(const char *line, va_list the_args)
pbuf[BUFSZ - 1] = '\0'; /* terminate strncpy or truncate vsprintf */ pbuf[BUFSZ - 1] = '\0'; /* terminate strncpy or truncate vsprintf */
} }
raw_print(line); raw_print(line);
#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) #if defined(MSGHANDLER)
execplinehandler(line); execplinehandler(line);
#endif #endif
} }
@@ -528,7 +528,7 @@ impossible(const char *s, ...)
RESTORE_WARNING_FORMAT_NONLITERAL RESTORE_WARNING_FORMAT_NONLITERAL
#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) #if defined(MSGHANDLER)
static boolean use_pline_handler = TRUE; static boolean use_pline_handler = TRUE;
static void static void
@@ -546,6 +546,7 @@ execplinehandler(const char *line)
return; return;
} }
#if defined(POSIX_TYPES) || defined(__GNUC__)
f = fork(); f = fork();
if (f == 0) { /* child */ if (f == 0) { /* child */
args[0] = env; args[0] = env;
@@ -566,8 +567,19 @@ execplinehandler(const char *line)
use_pline_handler = FALSE; use_pline_handler = FALSE;
pline("%s", "Fork to message handler failed."); pline("%s", "Fork to message handler failed.");
} }
#elif defined(WIN32)
{
intptr_t ret;
args[0] = env;
args[1] = line;
args[2] = NULL;
ret = _spawnv(_P_NOWAIT, env, args);
}
#else
#error MSGHANDLER is not implemented on this sysytem.
#endif
} }
#endif /* MSGHANDLER && (POSIX_TYPES || __GNUC__) */ #endif /* MSGHANDLER */
/* /*
* varargs handling for files.c * varargs handling for files.c