ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1825 from shygoo/memview-ansi 

[Debugger] Use better charset for memory viewer's text
This commit is contained in:
zilmar 2020-06-19 15:13:01 +09:30 committed by GitHub
parent 9fb02e5322 e1b2fee7af
commit 05dd64b9a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Project64/UserInterface/WTLControls/HexEditCtrl.cpp
View File

@ -508,7 +508,7 @@ bool CHexEditCtrl::UpdateCaretUI(bool bEnsureVisible, bool bTop)
void CHexEditCtrl::Text(int x, int y, const char *text, COLORREF bg, COLORREF fg, CRect *rcOut) void CHexEditCtrl::Text(int x, int y, const char *text, COLORREF bg, COLORREF fg, CRect *rcOut)
{ {
std::wstring textOuput = stdstr(text).ToUTF16(); std::wstring textOuput = stdstr(text).ToUTF16(CP_ACP);
size_t length = textOuput.length(); size_t length = textOuput.length();
int calcWidth = length * m_CharWidth; int calcWidth = length * m_CharWidth;
@ -657,38 +657,17 @@ void CHexEditCtrl::GetAsciiCellPos(int index, CRect* rc)
char CHexEditCtrl::ByteAscii(uint8_t value) char CHexEditCtrl::ByteAscii(uint8_t value)
{ {
if (value <= 0x1F) // ISO 8859-1
{ if ((value >= 0x20 && value <= 0x7E) || value >= 0xA1)
return '.';
}
if (value >= 0x20 && value <= 0x7E)
{ {
return (char)value; return (char)value;
} }
switch (value) return '.';
{
case 0x7F:
case 0x81:
case 0x8D:
case 0x8F:
case 0x90:
case 0x9D:
// undefined in windows-1252
return '.';
}
return (char)value;
} }
uint8_t CHexEditCtrl::HexCharValue(char c) uint8_t CHexEditCtrl::HexCharValue(char c)
{ {
if (!isxdigit(c))
{
return 0;
}
if (c >= '0' && c <= '9') return (c - '0'); if (c >= '0' && c <= '9') return (c - '0');
if (c >= 'A' && c <= 'F') return (c - 'A') + 0x0A; if (c >= 'A' && c <= 'F') return (c - 'A') + 0x0A;
if (c >= 'a' && c <= 'f') return (c - 'a') + 0x0A; if (c >= 'a' && c <= 'f') return (c - 'a') + 0x0A;