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

console encoding patch

Browse Source
This commit is contained in:
Пелипенко Иван
2022-04-26 22:49:31 +03:00
parent 5ae1cfae87
commit 2f4e73ef13
4 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/main/console/pikbdlistener.cpp
View File

@@ -323,12 +323,18 @@ void PIKbdListener::readKeyboard() {
for (int i = 0; i < PRIVATE->ret; ++i)
PICout(0) << PICoutManipulators::Hex << int(((uchar * )&rc)[i]) << ' ';
PICout(0) << "\n";
std::cout << PRIVATE->ret << " chars ";
for (int i = 0; i < PRIVATE->ret; ++i)
cout << "'" << (char)(rc[i]) << "' ";
cout << endl;*/
std::cout << "'" << (char)(rc[i]) << "' " << (int)(uchar)(rc[i]);
std::cout << std::endl;*/
if (rc[0] == 0) {piMSleep(10); return;}
if (PRIVATE->ret < 0 || PRIVATE->ret > 7) {piMSleep(10); return;}
if (PRIVATE->ret == 1) ke.key = PIChar::fromConsole(rc[0]).unicode16Code();
if (PRIVATE->ret == 1) {
if (rc[0] == 8)
ke.key = Backspace;
else
ke.key = PIChar::fromConsole(rc[0]).unicode16Code();
}
int mod(0);
// 2 - shift 1
// 3 - alt 2

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

@@ -22,6 +22,10 @@
#include "pistack.h"
#include "piobject.h"
#include "pistring_std.h"
#ifdef HAS_LOCALE
# include <locale>
# include <codecvt>
#endif
#ifdef WINDOWS
# include <windows.h>
# include <wingdi.h>
@@ -147,6 +151,9 @@ 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
@@ -539,8 +546,13 @@ 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::Buffer)) PICout::__string__().append(s);
}

8
libs/main/core/piinit.cpp
View File

@@ -152,12 +152,15 @@ PIInit::PIInit() {
}
# endif //WINDOWS
# ifdef HAS_LOCALE
//cout << "has locale" << endl;
//std::cout << "has locale" << std::endl;
if (currentLocale_t != 0) {
freelocale(currentLocale_t);
currentLocale_t = 0;
}
currentLocale_t = newlocale(LC_ALL, setlocale(LC_ALL, ""), 0);
//std::ios_base::sync_with_stdio(false);
//std::locale utf8( std::locale(), new std::codecvt_utf8<wchar_t> );
//std::wcout.imbue(utf8);
# else //HAS_LOCALE
setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
@@ -212,9 +215,6 @@ PIInit::PIInit() {
if (gethostname(cbuff, 1023) == 0) {
sinfo->hostname = cbuff;
}
// std::ios_base::sync_with_stdio(false);
// std::locale utf8( std::locale(), new std::codecvt_utf8<wchar_t> );
// std::wcout.imbue(utf8);
#ifdef WINDOWS
SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo);