Currently Microsoft's C++ libraries implementation of std::cout/cerr
can't output Unicode characters but only ASCII or ANSI if locale is set
so we implement and use our own ConsoleBuf which can output Unicode
characters to console and it doesn't matter what locale or console's
codepage is set.
---
CMakeLists.txt | 1 +
Source/cmakemain.cxx | 28 +++++++++
Source/kwsys/CMakeLists.txt | 6 +-
Source/kwsys/ConsoleBuf.hxx.in | 131 +++++++++++++++++++++++++++++++++++++++++
bootstrap | 1 +
5 files changed, 166 insertions(+), 1 deletion(-)
create mode 100644 Source/kwsys/ConsoleBuf.hxx.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae5990e..792b5a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,6 +258,7 @@ macro (CMAKE_BUILD_UTILITIES)
set(KWSYS_USE_MD5 1)
set(KWSYS_USE_Process 1)
set(KWSYS_USE_CommandLineArguments 1)
+ set(KWSYS_USE_ConsoleBuf 1)
set(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
set(KWSYS_INSTALL_DOC_DIR "${CMAKE_DOC_DIR}")
add_subdirectory(Source/kwsys)
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 521a5bf..2002e4b 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -26,6 +26,7 @@
#include "cmake.h"
#include "cmcmd.h"
#include <cmsys/Encoding.hxx>
+#include <cmsys/ConsoleBuf.hxx>
#ifdef CMAKE_BUILD_WITH_CMAKE
static const char* cmDocumentationName[][2] = {
@@ -153,6 +154,23 @@ static void cmakemainProgressCallback(const char* m, float
prog,
int main(int ac, char const* const* av)
{
+#if defined(_WIN32)
+ // Replace streambuf so we can output Unicode to console
+ cmsys::ConsoleBuf *cbufio = CM_NULLPTR;
+ cmsys::ConsoleBuf *cbuferr = CM_NULLPTR;
+ std::streambuf *coutbuf = CM_NULLPTR;
+ std::streambuf *cerrbuf = CM_NULLPTR;
+ try {
+ cbufio = new cmsys::ConsoleBuf();
+ coutbuf = std::cout.rdbuf(cbufio);
+ cbuferr = new cmsys::ConsoleBuf(true);
+ cerrbuf = std::cerr.rdbuf(cbuferr);
+ } catch (const std::system_error& ex) {
+ std::cerr << "Failed to create ConsoleBuf!" << std::endl
+ << "Error code: " << ex.code() << std::endl
+ << ex.what() << std::endl;
+ };
+#endif
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(ac, av);
ac = args.argc();
@@ -171,6 +189,16 @@ int main(int ac, char const* const* av)
#ifdef CMAKE_BUILD_WITH_CMAKE
cmDynamicLoader::FlushCache();
#endif
+#if defined(_WIN32)
+ if (cbufio) {
+ delete cbufio;
+ std::cout.rdbuf(coutbuf);
+ }
+ if (cbuferr) {
+ delete cbuferr;
+ std::cerr.rdbuf(cerrbuf);
+ }
+#endif
return ret;
}
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt
index 65203c0..33a97e6 100644
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -123,6 +123,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
SET(KWSYS_USE_FStream 1)
SET(KWSYS_USE_String 1)
SET(KWSYS_USE_SystemInformation 1)
+ SET(KWSYS_USE_ConsoleBuf 1)
ENDIF()
# Enforce component dependencies.
@@ -154,6 +155,9 @@ ENDIF()
IF(KWSYS_USE_FStream)
SET(KWSYS_USE_Encoding 1)
ENDIF()
+IF(KWSYS_USE_ConsoleBuf)
+ SET(KWSYS_USE_Encoding 1)
+ENDIF()
# Setup the large file support default.
IF(KWSYS_LFS_DISABLE)
@@ -668,7 +672,7 @@ SET(KWSYS_HXX_FILES Configure String
# Add selected C++ classes.
SET(cppclasses
Directory DynamicLoader Encoding Glob RegularExpression SystemTools
- CommandLineArguments IOStream FStream SystemInformation
+ CommandLineArguments IOStream FStream SystemInformation ConsoleBuf
)
FOREACH(cpp ${cppclasses})
IF(KWSYS_USE_${cpp})
diff --git a/Source/kwsys/ConsoleBuf.hxx.in b/Source/kwsys/ConsoleBuf.hxx.in
new file mode 100644
index 0000000..90adc03
--- /dev/null
+++ b/Source/kwsys/ConsoleBuf.hxx.in
@@ -0,0 +1,131 @@
+/*============================================================================
+ KWSys - Kitware System Library
+ Copyright 2000-2016 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+============================================================================*/
+#ifndef @KWSYS_NAMESPACE@_ConsoleBuf_hxx
+#define @KWSYS_NAMESPACE@_ConsoleBuf_hxx
+
+#include <@KWSYS_NAMESPACE@/Configure.hxx>
+#include <@KWSYS_NAMESPACE@/Encoding.hxx>
+#include <streambuf>
+
+namespace @KWSYS_NAMESPACE@
+{
+#if defined(_WIN32)
+
+ template<class CharT, class Traits = std::char_traits<CharT>>
+ class @KWSYS_NAMESPACE@_EXPORT BasicConsoleBuf : public
std::basic_streambuf<CharT, Traits> {
+ public:
+ typedef typename Traits::int_type int_type;
+ typedef typename Traits::char_type char_type;
+
+ BasicConsoleBuf(const bool err = false) {
+ m_hInput = ::GetStdHandle(STD_INPUT_HANDLE);
+ if (m_hInput == INVALID_HANDLE_VALUE) {
+ throw std::system_error(::GetLastError(), std::system_category(),
"GetStdHandle(STD_INPUT_HANDLE) returned INVALID_HANDLE_VALUE");
+ }
+ if (err) {
+ m_hOutput = ::GetStdHandle(STD_ERROR_HANDLE);
+ } else {
+ m_hOutput = ::GetStdHandle(STD_OUTPUT_HANDLE);
+ }
+ if (m_hOutput == INVALID_HANDLE_VALUE) {
+ throw std::system_error(::GetLastError(), std::system_category(),
+ std::string("GetStdHandle(") + (err ?
"STD_ERROR_HANDLE" : "STD_OUTPUT_HANDLE") + ") returned INVALID_HANDLE_VALUE");
+ }
+ this->setg((char_type *)m_ibuffer.data(), (char_type
*)m_ibuffer.data(), (char_type *)m_ibuffer.data() + m_ibuffer.size());
+ this->setp((char_type *)m_obuffer.data(), (char_type
*)m_obuffer.data() + m_obuffer.size());
+ }
+
+ ~BasicConsoleBuf() {
+ sync();
+ }
+
+ protected:
+ virtual int sync() {
+ bool success = true;
+ if (m_hInput) {
+ if (::FlushConsoleInputBuffer(m_hInput) == 0) {
+ success = false;
+ }
+ }
+ if (m_hOutput && !m_obuffer.empty()) {
+ const std::wstring &wBuffer = getBuffer(m_obuffer);
+ DWORD charsWritten;
+ if (::WriteConsoleW(m_hOutput, wBuffer.c_str(),
(DWORD)wBuffer.size(), &charsWritten, NULL) == 0) {
+ success = false;
+ }
+ }
+ m_ibuffer.clear();
+ m_obuffer.clear();
+ this->setg((char_type *)m_ibuffer.data(), (char_type
*)m_ibuffer.data(), (char_type *)m_ibuffer.data() + m_ibuffer.size());
+ this->setp((char_type *)m_obuffer.data(), (char_type
*)m_obuffer.data() + m_obuffer.size());
+ return success ? 0 : -1;
+ }
+
+ virtual int_type underflow() {
+ if (this->gptr() >= this->egptr()) {
+ wchar_t wBuffer[128];
+ DWORD charsRead;
+ if (!m_hInput || ::ReadConsoleW(m_hInput, wBuffer,
ARRAYSIZE(wBuffer) - 1, &charsRead, NULL) == 0 || charsRead == 0) {
+ this->setg((char_type *)m_ibuffer.data(), (char_type
*)m_ibuffer.data() + m_ibuffer.size(), (char_type *)m_ibuffer.data() +
m_ibuffer.size());
+ return Traits::eof();
+ }
+ wBuffer[charsRead] = L'\0';
+ setBuffer(wBuffer, m_ibuffer);
+ this->setg((char_type *)m_ibuffer.data(), (char_type
*)m_ibuffer.data(), (char_type *)m_ibuffer.data() + m_ibuffer.size());
+ }
+ return Traits::to_int_type(*this->gptr());
+ }
+
+ virtual int_type overflow(int_type ch = Traits::eof()) {
+ if (!Traits::eq_int_type(ch, Traits::eof())) {
+ char_type chr = Traits::to_char_type(ch);
+ m_obuffer += chr;
+ if ((flush_on_newline && Traits::eq(chr, '\n')) ||
Traits::eq_int_type(ch, 0x00)) {
+ sync();
+ }
+ return ch;
+ }
+ sync();
+ return Traits::eof();
+ }
+
+ public:
+ bool flush_on_newline = true;
+
+ private:
+ HANDLE m_hInput = NULL;
+ HANDLE m_hOutput = NULL;
+ std::basic_string<char_type> m_ibuffer;
+ std::basic_string<char_type> m_obuffer;
+ const std::wstring getBuffer(const std::basic_string<char> buffer) {
+ return Encoding::ToWide(buffer);
+ }
+ const std::wstring &getBuffer(const std::basic_string<wchar_t> &buffer) {
+ return buffer;
+ }
+ void setBuffer(const wchar_t buffer[], std::basic_string<char> &target) {
+ target = Encoding::ToNarrow(buffer);
+ }
+ void setBuffer(const wchar_t buffer[], std::basic_string<wchar_t>
&target) {
+ target = buffer;
+ }
+
+ }; // BasicConsoleBuf class
+
+ typedef BasicConsoleBuf<char> ConsoleBuf;
+ typedef BasicConsoleBuf<wchar_t> WConsoleBuf;
+
+#endif
+} // KWSYS_NAMESPACE
+
+#endif
+
diff --git a/bootstrap b/bootstrap
index ad0c8ec..0411c64 100755
--- a/bootstrap
+++ b/bootstrap
@@ -365,6 +365,7 @@ KWSYS_CXX_SOURCES="\
SystemTools"
KWSYS_FILES="\
+ ConsoleBuf.hxx \
Directory.hxx \
Encoding.h \
Encoding.hxx \
--
2.9.0
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers
