suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: fix gracket console stdout, half-fix break signal

Browse Source
This commit is contained in:
Matthew Flatt 2010-10-12 20:55:47 -06:00
parent 7ffff49507
commit 9702e7c6d3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gracket/grmain.c
View File

@ -104,6 +104,7 @@ static Scheme_Object *console_inport;
static HWND console_hwnd; static HWND console_hwnd;
static int has_stdio, stdio_kills_prog; static int has_stdio, stdio_kills_prog;
static HANDLE waiting_sema; static HANDLE waiting_sema;
static void *orig_signal_handle;
typedef HWND (WINAPI* gcw_proc)(); typedef HWND (WINAPI* gcw_proc)();
@ -122,7 +123,7 @@ static BOOL WINAPI ConsoleHandler(DWORD op)
ReleaseSemaphore(waiting_sema, 1, NULL); ReleaseSemaphore(waiting_sema, 1, NULL);
} else { } else {
scheme_break_main_thread(); scheme_break_main_thread();
scheme_signal_received(); scheme_signal_received_at(orig_signal_handle);
} }
return TRUE; return TRUE;
} }
@ -162,6 +163,7 @@ static void MrEdSchemeMessages(char *msg, ...)
if (!wx_in_terminal) { if (!wx_in_terminal) {
has_stdio = 1; has_stdio = 1;
waiting_sema = CreateSemaphore(NULL, 0, 1, NULL); waiting_sema = CreateSemaphore(NULL, 0, 1, NULL);
orig_signal_handle = scheme_get_signal_handle();
SetConsoleCtrlHandler(ConsoleHandler, TRUE); SetConsoleCtrlHandler(ConsoleHandler, TRUE);
{ {
@ -199,7 +201,10 @@ static void MrEdSchemeMessages(char *msg, ...)
} else { } else {
char *buffer; char *buffer;
DWORD wrote; DWORD wrote;
buffer = (char *)malloc(5 * strlen(msg)); /* FIXME: multiplying by 5 and adding 80 works for
all the cases where printf mode is currently used
for the function, but it's completely a hack. */
buffer = (char *)malloc((5 * strlen(msg)) + 80);
vsprintf(buffer, msg, args); vsprintf(buffer, msg, args);
WriteConsole(console_out, buffer, strlen(buffer), &wrote, NULL); WriteConsole(console_out, buffer, strlen(buffer), &wrote, NULL);
free(buffer); free(buffer);