Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-03-14 15:04:55 +0100
committerMartin Hořeňovský2022-03-18 14:04:07 +0100
commit0e176c318bf309aaa4acd8686a82517fda7b859a (patch)
tree0a389ff7d59edb3ec8552eb97c76829adc5c59ea /src/catch2/internal
parentc1c72c7e05599151ae3b2a052735f4731f716420 (diff)
downloadcatch3-0e176c318bf309aaa4acd8686a82517fda7b859a.tar.gz
Refactored colour handling
* POSIX colour impl is now compiled for all platforms. * Deciding whether a colour impl should be picked is now stream dependent, and thus incompatible implementations can be removed immediately, rather than checking when the colour is being used.
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_console_colour.cpp54
1 files changed, 31 insertions, 23 deletions
diff --git a/src/catch2/internal/catch_console_colour.cpp b/src/catch2/internal/catch_console_colour.cpp
index 4504eddc..fcfd953c 100644
--- a/src/catch2/internal/catch_console_colour.cpp
+++ b/src/catch2/internal/catch_console_colour.cpp
@@ -93,16 +93,15 @@ namespace {
originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
}
- static bool useColourOnPlatform() { return true; }
+ static bool useColourOnPlatform(IStream const& stream) {
+ // Win32 text colour APIs can only be used on console streams
+ // We cannot check that the output hasn't been redirected,
+ // so we just check that the original stream is console stream.
+ return stream.isStdout();
+ }
private:
void use( Colour::Code _colourCode ) const override {
- // Early exit if we are not writing to the console, because
- // Win32 API can only change colour of the console.
- if ( !m_stream->isStdout() ) {
- return;
- }
-
switch( _colourCode ) {
case Colour::None: return setTextAttribute( originalForegroundAttributes );
case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
@@ -138,9 +137,13 @@ namespace {
} // end anon namespace
} // end namespace Catch
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+#endif // Windows/ ANSI/ None
-#include <unistd.h>
+
+#if defined( CATCH_PLATFORM_LINUX ) || defined( CATCH_PLATFORM_MAC )
+# define CATCH_INTERNAL_HAS_ISATTY
+# include <unistd.h>
+#endif
namespace Catch {
namespace {
@@ -153,18 +156,25 @@ namespace {
public:
PosixColourImpl( IStream const* stream ): ColourImpl( stream ) {}
- static bool useColourOnPlatform() {
+ static bool useColourOnPlatform(IStream const& stream) {
+ // This is kinda messy due to trying to support a bunch of
+ // different platforms at once.
+ // The basic idea is that if we are asked to do autodetection (as
+ // opposed to being told to use posixy colours outright), then we
+ // only want to use the colours if we are writing to console.
+ // However, console might be redirected, so we make an attempt at
+ // checking for that on platforms where we know how to do that.
+ bool useColour = stream.isStdout();
+#if defined( CATCH_INTERNAL_HAS_ISATTY ) && \
+ !( defined( __DJGPP__ ) && defined( __STRICT_ANSI__ ) )
ErrnoGuard _; // for isatty
- return
-# if defined( CATCH_PLATFORM_MAC ) || defined( CATCH_PLATFORM_IPHONE )
- !isDebuggerActive() &&
+ useColour = useColour && isatty( STDOUT_FILENO );
# endif
-# if !( defined( __DJGPP__ ) && defined( __STRICT_ANSI__ ) )
- isatty( STDOUT_FILENO )
-# else
- false
+# if defined( CATCH_PLATFORM_MAC ) || defined( CATCH_PLATFORM_IPHONE )
+ useColour = useColour && !isDebuggerActive();
# endif
- ;
+
+ return useColour;
}
private:
@@ -201,8 +211,6 @@ namespace {
} // end anon namespace
} // end namespace Catch
-#endif // Windows/ ANSI/ None
-
namespace Catch {
Detail::unique_ptr<ColourImpl> makeColourImpl(IConfig const* config, IStream const* stream) {
@@ -220,11 +228,11 @@ namespace Catch {
if ( colourMode == UseColour::Auto ) {
createPlatformInstance =
#if defined( CATCH_CONFIG_COLOUR_ANSI )
- PosixColourImpl::useColourOnPlatform()
+ PosixColourImpl::useColourOnPlatform( *stream )
#elif defined( CATCH_CONFIG_COLOUR_WINDOWS )
- Win32ColourImpl::useColourOnPlatform()
+ Win32ColourImpl::useColourOnPlatform( *stream )
#else
- NoColourImpl::useColourOnPlatform()
+ false
#endif
;
}