From f7858cb5bd8a9c40bdf8e29d586d3d8e7ac1e514 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 2 Mar 2020 13:44:18 +0100 Subject: [PATCH 1/5] adding core/isatty --- CMakeLists.txt | 1 + src/core/isatty.cpp | 21 +++++++++++++++++++++ src/core/isatty.h | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 src/core/isatty.cpp create mode 100644 src/core/isatty.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 7965612..2bf1e4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,7 @@ set (PROGRAM_SOURCE src/core/file.cpp src/core/dictionary.cpp src/core/string.cpp + src/core/isatty.cpp src/crypto/base58.cpp src/crypto/WIF.cpp src/console.cpp diff --git a/src/core/isatty.cpp b/src/core/isatty.cpp new file mode 100644 index 0000000..e32fe19 --- /dev/null +++ b/src/core/isatty.cpp @@ -0,0 +1,21 @@ +#if _WIN32 +#include +#else +#include +#define _isatty isatty +#define _fileno fileno +#endif +#include "isatty.h" + +namespace eoskeygen { + +bool isatty(int fd) { + return ::_isatty(fd); +} + +bool isatty(FILE* fd) { + // fileno() segfaults if fd is null. + return fd ? isatty(_fileno(fd)) : false; +} + +} // namespace eoskeygen diff --git a/src/core/isatty.h b/src/core/isatty.h new file mode 100644 index 0000000..0cf40c9 --- /dev/null +++ b/src/core/isatty.h @@ -0,0 +1,37 @@ +/** + * MIT License + * + * Copyright (c) 2019-2020 EOS Sw/eden + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef EOSIOKEYGEN_CORE_ISATTY_H +#define EOSIOKEYGEN_CORE_ISATTY_H + +#include + +namespace eoskeygen { + +bool isatty(int fd); + +bool isatty(FILE* fd); + +} // namespace eoskeygen + +#endif /* EOSIOKEYGEN_CORE_ISATTY_H */ From f676f2e7ca2fcce76ac7b50fed2b92ad3004da19 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 2 Mar 2020 14:36:41 +0100 Subject: [PATCH 2/5] console: add isColorsSupported() --- src/console.cpp | 18 ++++++++++++++++++ src/console.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/console.cpp b/src/console.cpp index c685541..99472f3 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -21,10 +21,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include +#include "core/isatty.h" #include "console.h" namespace eoskeygen { namespace console { bool disable_color = false; +FILE* _getFileFromStream(const std::ostream& os) { + + if (&os == &std::cout) { + return stdout; + } else if (&os == &std::cerr) { + return stderr; + } + return NULL; +} + +bool isColorsSupported(const std::ostream& os) { + + FILE* fd = _getFileFromStream(os); + return disable_color == false && isatty(fd); +} + } } // namespace eoskeygen::console diff --git a/src/console.h b/src/console.h index bd7f0fd..65da9aa 100644 --- a/src/console.h +++ b/src/console.h @@ -63,6 +63,8 @@ namespace console { italic }; + bool isColorsSupported(const std::ostream& os); + // Resets all colors/attributes std::ostream& reset(std::ostream& os); From f630a8344cd13a31d59ee71c693f5a239f096d35 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 2 Mar 2020 14:38:08 +0100 Subject: [PATCH 3/5] console_ansi.cpp: use isColorsSupported() instead of disable_color --- src/console_ansi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/console_ansi.cpp b/src/console_ansi.cpp index 0398d84..2d34980 100644 --- a/src/console_ansi.cpp +++ b/src/console_ansi.cpp @@ -30,7 +30,7 @@ namespace console { std::ostream& reset(std::ostream& os) { - if (disable_color) { + if (!isColorsSupported(os)) { return os; } return os << "\033[0m"; @@ -42,7 +42,7 @@ std::ostream& operator<<(std::ostream& os, const fg& obj) { int attr; int code; - if (disable_color) { + if (!isColorsSupported(os)) { return os; } From 26b96add301b3b3c13e48b6ce8ca24d46b00d5f2 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 2 Mar 2020 14:38:25 +0100 Subject: [PATCH 4/5] console_win32.cpp: use isColorsSupported() instead of disable_color --- src/console_win32.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/console_win32.cpp b/src/console_win32.cpp index 24e38fa..af99a2a 100644 --- a/src/console_win32.cpp +++ b/src/console_win32.cpp @@ -50,7 +50,7 @@ namespace console { std::ostream& reset(std::ostream& os) { - if (disable_color == false) { + if (isColorsSupported(os)) { ::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), FG_DEFAULT); } return os; @@ -61,7 +61,7 @@ std::ostream& operator<<(std::ostream& os, const fg& obj) { int code; - if (disable_color == false) { + if (isColorsSupported(os)) { switch(obj._color) { case black : code = FG_BLACK; break; From 53fcc9df534f6fd60e2a58f4745db4094c99f0c0 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Mon, 2 Mar 2020 14:44:53 +0100 Subject: [PATCH 5/5] src/console_win32.cpp: define _getNativeHandle() and use that instead of hard coded stdout. --- src/console_win32.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/console_win32.cpp b/src/console_win32.cpp index af99a2a..d3b1614 100644 --- a/src/console_win32.cpp +++ b/src/console_win32.cpp @@ -48,10 +48,20 @@ namespace eoskeygen { namespace console { +HANDLE _getNativeHandle(const std::ostream& os) { + + if (&os == &std::cout) { + return ::GetStdHandle(STD_OUTPUT_HANDLE); + } else if (&os == &std::cerr) { + return ::GetStdHandle(STD_ERROR_HANDLE); + } + return NULL; +} + std::ostream& reset(std::ostream& os) { if (isColorsSupported(os)) { - ::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), FG_DEFAULT); + ::SetConsoleTextAttribute(_getNativeHandle(os), FG_DEFAULT); } return os; } @@ -84,7 +94,7 @@ std::ostream& operator<<(std::ostream& os, const fg& obj) { code = FG_DEFAULT; } - ::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), code); + ::SetConsoleTextAttribute(_getNativeHandle(os), code); } // WinAPI does not support text attributes in the console.