livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-13361: Enable color processing on Windows 10 debug console. 

(cherry picked from commit 0b61150e69)
meow-7.2.2
Nat Goodspeed 2020-06-02 16:44:22 -04:00
parent 4708662091
commit d8649dbb8a
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llcommon/llerror.cpp
View File

@ -40,6 +40,8 @@
# include <syslog.h>
# include <unistd.h>
# include <sys/stat.h>
#else
# include <io.h>
#endif // !LL_WINDOWS
#include <vector>
#include "string.h"
@ -236,14 +238,11 @@ namespace {
static bool checkANSI(void)
{
#if LL_LINUX || LL_DARWIN
// Check whether it's okay to use ANSI; if stderr is
// a tty then we assume yes. Can be turned off with
// the LL_NO_ANSI_COLOR env var.
return (0 != isatty(2)) &&
(NULL == getenv("LL_NO_ANSI_COLOR"));
#endif // LL_LINUX
return FALSE; // works in a cygwin shell... ;)
}
};

21
indra/newview/llappviewerwin32.cpp
View File

@ -500,6 +500,10 @@ void LLAppViewerWin32::disableWinErrorReporting()
}
const S32 MAX_CONSOLE_LINES = 500;
// Only defined in newer SDKs than we currently use
#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 4
#endif
namespace {
@ -507,13 +511,11 @@ FILE* set_stream(const char* which, DWORD handle_id, const char* mode);
bool create_console()
{
CONSOLE_SCREEN_BUFFER_INFO coninfo;
FILE *fp;
// allocate a console for this app
const bool isConsoleAllocated = AllocConsole();
// set the screen buffer to be big enough to let us scroll text
CONSOLE_SCREEN_BUFFER_INFO coninfo;
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &coninfo);
coninfo.dwSize.Y = MAX_CONSOLE_LINES;
SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize);
@ -542,19 +544,24 @@ bool create_console()
return isConsoleAllocated;
}
FILE* set_stream(const char* which, DWORD handle_id, const char* mode)
FILE* set_stream(const char* desc, DWORD handle_id, const char* mode)
{
long l_std_handle = (long)GetStdHandle(handle_id);
int h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
auto l_std_handle = GetStdHandle(handle_id);
int h_con_handle = _open_osfhandle(reinterpret_cast<intptr_t>(l_std_handle), _O_TEXT);
if (h_con_handle == -1)
{
LL_WARNS() << "create_console() failed to open " << which << " handle" << LL_ENDL;
LL_WARNS() << "create_console() failed to open " << desc << " handle" << LL_ENDL;
return nullptr;
}
else
{
FILE* fp = _fdopen( h_con_handle, mode );
setvbuf( fp, NULL, _IONBF, 0 );
// Enable color processing on Windows 10 console windows.
DWORD dwMode = 0;
GetConsoleMode(l_std_handle, &dwMode);
dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
SetConsoleMode(l_std_handle, dwMode);
return fp;
}
}