mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 19:12:42 +02:00
Code Issues Projects Releases Wiki Activity

Don't determine if there is a real console with AllocConsole

Browse Source
This commit is contained in:
Anders
2022-02-02 22:22:31 +01:00
committed by GitHub
parent 76b881c2e1
commit cead58471d
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
SDL/console.c
View File

@@ -85,28 +85,30 @@ static bool is_term(void)
{ {
if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO)) return false; if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO)) return false;
#ifdef _WIN32 #ifdef _WIN32
if (AllocConsole()) { unsigned long input_mode, output_mode, has_con_input, has_con_output;
FreeConsole();
return false; HANDLE hSI = GetStdHandle(STD_INPUT_HANDLE);
HANDLE hSO = GetStdHandle(STD_OUTPUT_HANDLE);
has_con_input = GetConsoleMode(hSI, &input_mode);
has_con_output = GetConsoleMode(hSO, &output_mode);
if (!has_con_output) {
return false; // stdout has been redirected to a file or pipe
} }
unsigned long input_mode, output_mode; SetConsoleMode(hSI, ENABLE_VIRTUAL_TERMINAL_INPUT);
SetConsoleMode(hSO, ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &input_mode);
GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &output_mode);
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), ENABLE_VIRTUAL_TERMINAL_INPUT);
SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
CONSOLE_SCREEN_BUFFER_INFO before = {0,}; CONSOLE_SCREEN_BUFFER_INFO before = {0,};
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &before); GetConsoleScreenBufferInfo(hSO, &before);
printf(SGR("0")); printf(SGR("0"));
CONSOLE_SCREEN_BUFFER_INFO after = {0,}; CONSOLE_SCREEN_BUFFER_INFO after = {0,};
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &after); GetConsoleScreenBufferInfo(hSO, &after);
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), input_mode); SetConsoleMode(hSI, input_mode);
SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), output_mode); SetConsoleMode(hSO, output_mode);
if (before.dwCursorPosition.X != after.dwCursorPosition.X || if (before.dwCursorPosition.X != after.dwCursorPosition.X ||
@@ -127,7 +129,7 @@ static char raw_getc(void)
#ifdef _WIN32 #ifdef _WIN32
char c; char c;
unsigned long ret; unsigned long ret;
ReadConsole(GetStdHandle(STD_INPUT_HANDLE), &c, 1, &ret, NULL); ReadFile(GetStdHandle(STD_INPUT_HANDLE), &c, 1, &ret, NULL);
#else #else
ssize_t ret; ssize_t ret;
char c; char c;