R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: move console color init code to separate function

Browse Source 
Reserve Console_Init() for actual console init, if code only needs colors (e.g. a console application that already has a console), then they should call Console_ColorInit().
This commit is contained in:
Kawe Mazidjatari 2024-04-17 20:44:54 +02:00
parent 8e81d99585
commit dc8a22c05e
3 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
r5dev/revpk/revpk.cpp
View File

@ -25,7 +25,7 @@
#define FRONTEND_ENABLE_FILE "enable.txt"
static CKeyValuesSystem s_KeyValuesSystem;
static CFileSystem_Stdio g_FullFileSystem;
static CFileSystem_Stdio s_FullFileSystem;
static bool s_bUseAnsiColors = true;
//-----------------------------------------------------------------------------
@ -41,7 +41,7 @@ IKeyValuesSystem* KeyValuesSystem()
//-----------------------------------------------------------------------------
CFileSystem_Stdio* FileSystem()
{
return &g_FullFileSystem;
return &s_FullFileSystem;
}
//-----------------------------------------------------------------------------
@ -51,10 +51,15 @@ static void ReVPK_Init()
{
CheckSystemCPUForSSE2();
// Init time.
Plat_FloatTime();
g_CoreMsgVCallback = EngineLoggerSink;
lzham_enable_fail_exceptions(true);
Console_Init(s_bUseAnsiColors);
if (s_bUseAnsiColors)
Console_ColorInit();
SpdLog_Init(s_bUseAnsiColors);
}

54
r5dev/windows/console.cpp
View File

@ -81,20 +81,23 @@ void FlashConsoleBackground(int nFlashCount, int nFlashInterval, COLORREF color)
//-----------------------------------------------------------------------------
bool Console_Init(const bool bAnsiColor)
{
#ifndef _TOOLS
char msgBuf[2048];
///////////////////////////////////////////////////////////////////////////
// Create the console window
if (AllocConsole() == FALSE)
{
char szBuf[2048];
snprintf(szBuf, sizeof(szBuf), "Failed to create console window! [%s]\n", std::system_category().message(static_cast<int>(::GetLastError())).c_str());
snprintf(msgBuf, sizeof(msgBuf), "Failed to create console window! [%s]\n",
std::system_category().message(static_cast<int>(::GetLastError())).c_str());
OutputDebugStringA(szBuf);
OutputDebugStringA(msgBuf);
return false;
}
#ifndef _TOOLS
//-- Set the window title
SetConsoleTitleA("R5");
#endif // !_TOOLS
//-- Open input/output streams
FILE* fDummy;
@ -102,6 +105,7 @@ bool Console_Init(const bool bAnsiColor)
freopen_s(&fDummy, "CONOUT$", "w", stdout);
freopen_s(&fDummy, "CONOUT$", "w", stderr);
#ifndef _TOOLS
//-- Create a worker thread to process console commands
DWORD dwThreadId = NULL;
DWORD __stdcall ProcessConsoleWorker(LPVOID);
@ -113,22 +117,16 @@ bool Console_Init(const bool bAnsiColor)
}
#endif // !_TOOLS
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
DWORD dwMode = NULL;
if (bAnsiColor)
{
GetConsoleMode(hOutput, &dwMode);
dwMode |= ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING;
if (!SetConsoleMode(hOutput, dwMode)) // Some editions of Windows have 'VirtualTerminalLevel' disabled by default.
if (!Console_ColorInit())
{
// Warn the user if 'VirtualTerminalLevel' could not be set on users environment.
MessageBoxA(NULL, "Failed to set console mode 'VirtualTerminalLevel'; please disable ansi-colors and restart the program if output logging appears distorted.", "SDK Warning", MB_ICONEXCLAMATION | MB_OK);
}
Assert(0);
//snprintf(msgBuf, sizeof(msgBuf), "Failed to set color console mode! [%s]\n",
// std::system_category().message(static_cast<int>(::GetLastError())).c_str());
SetConsoleBackgroundColor(0x00000000);
AnsiColors_Init();
//MessageBoxA(NULL, msgBuf, "SDK Warning", MB_ICONEXCLAMATION | MB_OK);
}
}
#ifndef _TOOLS
@ -138,6 +136,27 @@ bool Console_Init(const bool bAnsiColor)
return true;
}
//-----------------------------------------------------------------------------
// Purpose: terminal color setup
// Output : true on success, false otherwise
//-----------------------------------------------------------------------------
bool Console_ColorInit()
{
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
DWORD dwMode = NULL;
GetConsoleMode(hOutput, &dwMode); // Some editions of Windows have 'VirtualTerminalLevel' disabled by default.
dwMode |= ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING;
if (!SetConsoleMode(hOutput, dwMode))
return false; // Failure.
SetConsoleBackgroundColor(0x00000000);
AnsiColors_Init();
return true;
}
//-----------------------------------------------------------------------------
// Purpose: terminal window shutdown
// Output : true on success, false otherwise
@ -149,7 +168,8 @@ bool Console_Shutdown()
if (FreeConsole() == FALSE)
{
char szBuf[2048];
snprintf(szBuf, sizeof(szBuf), "Failed to destroy console window! [%s]\n", std::system_category().message(static_cast<int>(::GetLastError())).c_str());
snprintf(szBuf, sizeof(szBuf), "Failed to destroy console window! [%s]\n",
std::system_category().message(static_cast<int>(::GetLastError())).c_str());
OutputDebugStringA(szBuf);
return false;

3
r5dev/windows/console.h
View File

@ -3,5 +3,6 @@
void SetConsoleBackgroundColor(COLORREF color);
void FlashConsoleBackground(int nFlashCount, int nFlashInterval, COLORREF color);
bool Console_Init(const bool bAnsiColor);
bool Console_Init(const bool bAnsiColor, const bool bWarn = true);
bool Console_ColorInit();
bool Console_Shutdown();