SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

locale changes, piscreen

Browse Source
This commit is contained in:
Пелипенко Иван
2022-04-27 12:41:38 +03:00
parent 2f4e73ef13
commit c1c47b4869
6 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/main/core/picout.cpp
View File

@@ -151,9 +151,6 @@ PRIVATE_DEFINITION_START(PICout)
static WORD dattr;
static DWORD smode;
#endif
#ifdef HAS_LOCALE
std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> utf8conv;
#endif
PRIVATE_DEFINITION_END(PICout)
#ifdef WINDOWS
@@ -546,20 +543,24 @@ PICout & PICout::writePIString(const PIString & s) {
if (buffer_) {
buffer_->append(s);
} else {
if (PICout::isOutputDeviceActive(PICout::StdOut)) {
#ifdef HAS_LOCALE
std::cout << PRIVATE->utf8conv.to_bytes((char16_t*)&(const_cast<PIString&>(s).front()), (char16_t*)&(const_cast<PIString&>(s).front()) + s.size());
#else
for (PIChar c: s) std::wcout.put(c.toWChar());
#endif
}
if (PICout::isOutputDeviceActive(PICout::StdOut))
stdoutPIString(s);
if (PICout::isOutputDeviceActive(PICout::Buffer)) PICout::__string__().append(s);
}
return *this;
}
void PICout::stdoutPIString(const PIString & s) {
#ifdef HAS_LOCALE
std::wstring_convert<std::codecvt_utf8<char16_t>, char16_t> utf8conv;
std::cout << utf8conv.to_bytes((char16_t*)&(const_cast<PIString&>(s).front()), (char16_t*)&(const_cast<PIString&>(s).front()) + s.size());
#else
for (PIChar c: s) std::wcout.put(c.toWChar());
#endif
}
void PICout::init() {
#ifdef WINDOWS
if (__Private__::hOut == 0) {