From ab97223ceaf8b1f82059cf0430282be7366c6cc8 Mon Sep 17 00:00:00 2001 From: Kaspar Martin Suursalu Date: Sun, 24 Sep 2023 15:39:02 +0300 Subject: [PATCH 1/3] Fix windows terminal support --- src/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main.c b/src/main.c index b1c099d8..00da607b 100644 --- a/src/main.c +++ b/src/main.c @@ -268,6 +268,15 @@ char* resolveEntryPath(ENGINE* engine, char* entryArgument, bool autoResolve) { int main(int argc, char* argv[]) { +#ifdef __MINGW32__ + // WT_SESSION = Windows terminal, SESSIONNAME=Console == Powershell and CMD and TERM_PROGRAM=Tabby == Tabby + if(getenv("WT_SESSION") || (strcmp(getenv("SESSIONNAME"),"Console") == 0 && !getenv("SHELL")) || getenv("TERM_PROGRAM") == "Tabby") { + if (AttachConsole(ATTACH_PARENT_PROCESS)) { + freopen("CONOUT$","wb",stdout); + freopen("CONOUT$","wb",stderr); + } + } +#endif // configuring the buffer has to be first setbuf(stdout, NULL); From 887ebfc4b7de38b24586b7b12dc81bb5f0b635a7 Mon Sep 17 00:00:00 2001 From: Kaspar Martin Suursalu Date: Sun, 24 Sep 2023 23:09:51 +0300 Subject: [PATCH 2/3] Add more general check if terminal is available --- src/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 00da607b..d1e28720 100644 --- a/src/main.c +++ b/src/main.c @@ -269,8 +269,7 @@ char* resolveEntryPath(ENGINE* engine, char* entryArgument, bool autoResolve) { int main(int argc, char* argv[]) { #ifdef __MINGW32__ - // WT_SESSION = Windows terminal, SESSIONNAME=Console == Powershell and CMD and TERM_PROGRAM=Tabby == Tabby - if(getenv("WT_SESSION") || (strcmp(getenv("SESSIONNAME"),"Console") == 0 && !getenv("SHELL")) || getenv("TERM_PROGRAM") == "Tabby") { + if(!GetStdHandle(STD_OUTPUT_HANDLE)) { if (AttachConsole(ATTACH_PARENT_PROCESS)) { freopen("CONOUT$","wb",stdout); freopen("CONOUT$","wb",stderr); From 3d233fb5faed12e1ac63000c2130305f83b3d025 Mon Sep 17 00:00:00 2001 From: Aviv Beeri Date: Sat, 2 Mar 2024 08:00:46 +0000 Subject: [PATCH 3/3] Add to the AUTHORs file --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index ec1b0df3..68fbace3 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -14,3 +14,4 @@ We'd like to thank the following people for their contributions. * Trevor Martin [https://github.com/trelemar] * 8_BIT-DEV [https://github.com/8-BIT-DEV] * catsanddo [https://github.com/catsanddo] + * Kaspar Martin Suursalu [https://github.com/Kasparsu]