OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4001 Improved windows console support. Other shells than native also supported. Preparations for Summary plotting command line parameters.

Browse Source
This commit is contained in:
Jacob Støren
2019-08-08 13:33:51 +02:00
parent 81de872c7b
commit b2adea51e3
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/Application/RiaConsoleApplication.cpp
View File

@@ -70,11 +70,34 @@ void RiaConsoleApplication::initialize()
#ifdef _WIN32 #ifdef _WIN32
#pragma warning(push) // Saves the current warning state. #pragma warning(push) // Saves the current warning state.
#pragma warning(disable : 4996) // Temporarily disables warning 4996. #pragma warning(disable : 4996) // Temporarily disables warning 4996.
if (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())
bool isReOpenStdToConsoleNeeded = false;
if ( AttachConsole(ATTACH_PARENT_PROCESS) )
{ {
freopen("CONOUT$", "w", stdout); int fileType = GetFileType(GetStdHandle(STD_OUTPUT_HANDLE));
freopen("CONOUT$", "w", stderr);
// FILE_TYPE_CHAR indicates a windows console buffer.
// FILE_TYPE_PIPE indicates redirection imposed by the starting shell (eg migw shell)
// If we are dealing with a pipe, we do not want to do the reopen, and destroy the connection.
if (fileType == FILE_TYPE_CHAR )
{
isReOpenStdToConsoleNeeded = true;
}
} }
else if ( AllocConsole() )
{
isReOpenStdToConsoleNeeded = true;
}
if (isReOpenStdToConsoleNeeded)
{
freopen("conout$", "w", stdout);
freopen("conout$", "w", stderr);
freopen("conin$", "r", stdin);
}
#pragma warning(pop) #pragma warning(pop)
#endif #endif