tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-06 21:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add more items and HTML Hexadecilmal column to ASCII panel

Browse Source 
Fix #13347, close #13348
This commit is contained in:
ozone10 2023-02-05 12:48:04 +01:00 committed by Don Ho
parent 7f54a4b959
commit 9b67c93ef9
4 changed files with 155 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/installer/nativeLang/english.xml
View File

@ -1467,8 +1467,9 @@ Do you want to save your changes before switching themes?"/> <!-- HowToReproduce
<ColumnVal name="Value"/> <ColumnVal name="Value"/>
<ColumnHex name="Hex"/> <ColumnHex name="Hex"/>
<ColumnChar name="Character"/> <ColumnChar name="Character"/>
<ColumnHtmlNumber name="HTML Number"/> <ColumnHtmlName name="HTML Name"/>
<ColumnHtmlName name="HTML Code"/> <ColumnHtmlNumber name="HTML Decimal"/>
<ColumnHtmlHexNb name="HTML Hexadecimal"/>
</AsciiInsertion> </AsciiInsertion>
<DocumentMap> <DocumentMap>
<PanelTitle name="Document Map"/> <PanelTitle name="Document Map"/>

5
PowerEditor/installer/nativeLang/english_customizable.xml
View File

@ -1457,8 +1457,9 @@ Do you want to save your changes before switching themes?"/> <!-- HowToReproduce
<ColumnVal name="Value"/> <ColumnVal name="Value"/>
<ColumnHex name="Hex"/> <ColumnHex name="Hex"/>
<ColumnChar name="Character"/> <ColumnChar name="Character"/>
<ColumnHtmlNumber name="HTML Number"/> <ColumnHtmlName name="HTML Name"/>
<ColumnHtmlName name="HTML Code"/> <ColumnHtmlNumber name="HTML Decimal"/>
<ColumnHtmlHexNb name="HTML Hexadecimal"/>
</AsciiInsertion> </AsciiInsertion>
<DocumentMap> <DocumentMap>
<PanelTitle name="Document Map"/> <PanelTitle name="Document Map"/>

20
PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp
View File

@ -36,14 +36,16 @@ intptr_t CALLBACK AnsiCharPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM
generic_string valStr = pNativeSpeaker->getAttrNameStr(TEXT("Value"), "AsciiInsertion", "ColumnVal"); generic_string valStr = pNativeSpeaker->getAttrNameStr(TEXT("Value"), "AsciiInsertion", "ColumnVal");
generic_string hexStr = pNativeSpeaker->getAttrNameStr(TEXT("Hex"), "AsciiInsertion", "ColumnHex"); generic_string hexStr = pNativeSpeaker->getAttrNameStr(TEXT("Hex"), "AsciiInsertion", "ColumnHex");
generic_string charStr = pNativeSpeaker->getAttrNameStr(TEXT("Character"), "AsciiInsertion", "ColumnChar"); generic_string charStr = pNativeSpeaker->getAttrNameStr(TEXT("Character"), "AsciiInsertion", "ColumnChar");
generic_string htmlNumberStr = pNativeSpeaker->getAttrNameStr(TEXT("HTML Number"), "AsciiInsertion", "ColumnHtmlNumber"); generic_string htmlNameStr = pNativeSpeaker->getAttrNameStr(L"HTML Name", "AsciiInsertion", "ColumnHtmlName");
generic_string htmlNameStr = pNativeSpeaker->getAttrNameStr(TEXT("HTML Name"), "AsciiInsertion", "ColumnHtmlName"); generic_string htmlNumberStr = pNativeSpeaker->getAttrNameStr(L"HTML Decimal", "AsciiInsertion", "ColumnHtmlNumber");
generic_string htmlHexNbStr = pNativeSpeaker->getAttrNameStr(L"HTML Hexadecimal", "AsciiInsertion", "ColumnHtmlHexNb");
_listView.addColumn(columnInfo(valStr, nppParam._dpiManager.scaleX(45))); _listView.addColumn(columnInfo(valStr, nppParam._dpiManager.scaleX(45)));
_listView.addColumn(columnInfo(hexStr, nppParam._dpiManager.scaleX(45))); _listView.addColumn(columnInfo(hexStr, nppParam._dpiManager.scaleX(45)));
_listView.addColumn(columnInfo(charStr, nppParam._dpiManager.scaleX(70))); _listView.addColumn(columnInfo(charStr, nppParam._dpiManager.scaleX(70)));
_listView.addColumn(columnInfo(htmlNumberStr, nppParam._dpiManager.scaleX(100)));
_listView.addColumn(columnInfo(htmlNameStr, nppParam._dpiManager.scaleX(90))); _listView.addColumn(columnInfo(htmlNameStr, nppParam._dpiManager.scaleX(90)));
_listView.addColumn(columnInfo(htmlNumberStr, nppParam._dpiManager.scaleX(100)));
_listView.addColumn(columnInfo(htmlHexNbStr, nppParam._dpiManager.scaleX(120)));
_listView.init(_hInst, _hSelf); _listView.init(_hInst, _hSelf);
int codepage = (*_ppEditView)->getCurrentBuffer()->getEncoding(); int codepage = (*_ppEditView)->getCurrentBuffer()->getEncoding();
@ -76,14 +78,14 @@ intptr_t CALLBACK AnsiCharPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM
case NM_DBLCLK: case NM_DBLCLK:
{ {
LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE) lParam; LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE) lParam;
LVHITTESTINFO pInfo; LVHITTESTINFO pInfo{};
pInfo.pt = lpnmitem->ptAction; pInfo.pt = lpnmitem->ptAction;
ListView_SubItemHitTest(_listView.getHSelf(), &pInfo); ListView_SubItemHitTest(_listView.getHSelf(), &pInfo);
int i = pInfo.iItem; int i = pInfo.iItem;
int j = pInfo.iSubItem; int j = pInfo.iSubItem;
wchar_t buffer[10]; wchar_t buffer[10]{};
LVITEM item; LVITEM item{};
item.mask = LVIF_TEXT | LVIF_PARAM; item.mask = LVIF_TEXT | LVIF_PARAM;
item.iItem = i; item.iItem = i;
item.iSubItem = j; item.iSubItem = j;
@ -144,11 +146,11 @@ intptr_t CALLBACK AnsiCharPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM
void AnsiCharPanel::insertChar(unsigned char char2insert) const void AnsiCharPanel::insertChar(unsigned char char2insert) const
{ {
char charStr[2]; char charStr[2]{};
charStr[0] = char2insert; charStr[0] = char2insert;
charStr[1] = '\0'; charStr[1] = '\0';
wchar_t wCharStr[10]; wchar_t wCharStr[10]{};
char multiByteStr[10]; char multiByteStr[10]{};
int codepage = (*_ppEditView)->getCurrentBuffer()->getEncoding(); int codepage = (*_ppEditView)->getCurrentBuffer()->getEncoding();
if (codepage == -1) if (codepage == -1)
{ {

149
PowerEditor/src/WinControls/AnsiCharPanel/asciiListView.cpp
View File

@ -104,8 +104,8 @@ generic_string AsciiListView::getAscii(unsigned char value)
return TEXT("DEL"); return TEXT("DEL");
default: default:
{ {
TCHAR charStr[10]; wchar_t charStr[10]{};
char ascii[2]; char ascii[2]{};
ascii[0] = value; ascii[0] = value;
ascii[1] = '\0'; ascii[1] = '\0';
MultiByteToWideChar(_codepage, 0, ascii, -1, charStr, _countof(charStr)); MultiByteToWideChar(_codepage, 0, ascii, -1, charStr, _countof(charStr));
@ -119,16 +119,124 @@ generic_string AsciiListView::getHtmlName(unsigned char value)
{ {
switch (value) switch (value)
{ {
case 33:
return TEXT("&excl;");
case 34: case 34:
return TEXT("&quot;"); return TEXT("&quot;");
case 35:
return TEXT("&num;");
case 36:
return TEXT("&dollar;");
case 37:
return TEXT("&percnt;");
case 38: case 38:
return TEXT("&amp;"); return TEXT("&amp;");
case 39:
return TEXT("&apos;");
case 40:
return TEXT("&lpar;");
case 41:
return TEXT("&rpar;");
case 42:
return TEXT("&ast;");
case 43:
return TEXT("&plus;");
case 44:
return TEXT("&comma;");
case 45:
return TEXT("&minus;");
case 46:
return TEXT("&period;");
case 47:
return TEXT("&sol;");
case 58:
return TEXT("&colon;");
case 59:
return TEXT("&semi;");
case 60: case 60:
return TEXT("&lt;"); return TEXT("&lt;");
case 61:
return TEXT("&equals;");
case 62: case 62:
return TEXT("&gt;"); return TEXT("&gt;");
case 63:
return TEXT("&quest;");
case 64:
return TEXT("&commat;");
case 91:
return TEXT("&lbrack;");
case 92:
return TEXT("&bsol;");
case 93:
return TEXT("&rbrack;");
case 94:
return TEXT("&Hat;");
case 95:
return TEXT("&lowbar;");
case 96:
return TEXT("&grave;");
case 123:
return TEXT("&lbrace;");
case 124:
return TEXT("&vert;");
case 125:
return TEXT("&rbrace;");
case 126:
return TEXT(""); // ascii tilde
case 128: case 128:
return TEXT("&euro;"); return TEXT("&euro;");
case 130:
return TEXT("&sbquo;");
case 131:
return TEXT("&fnof;");
case 132:
return TEXT("&bdquo;");
case 133:
return TEXT("&hellip;");
case 134:
return TEXT("&dagger;");
case 135:
return TEXT("&Dagger;");
case 136:
return TEXT("&circ;");
case 137:
return TEXT("&permil;");
case 138:
return TEXT("&Scaron;");
case 139:
return TEXT("&lsaquo;");
case 140:
return TEXT("&OElig;");
case 142:
return TEXT("&Zcaron;");
case 145:
return TEXT("&lsquo;");
case 146:
return TEXT("&rsquo;");
case 147:
return TEXT("&ldquo;");
case 148:
return TEXT("&rdquo;");
case 149:
return TEXT("&bull;");
case 150:
return TEXT("&ndash;");
case 151:
return TEXT("&mdash;");
case 152:
return TEXT("&tilde;");
case 153:
return TEXT("&trade;");
case 154:
return TEXT("&scaron;");
case 155:
return TEXT("&rsaquo;");
case 156:
return TEXT("&oelig;");
case 158:
return TEXT("&zcaron;");
case 159:
return TEXT("&Yuml;");
case 160: case 160:
return TEXT("&nbsp;"); return TEXT("&nbsp;");
case 161: case 161:
@ -325,7 +433,6 @@ generic_string AsciiListView::getHtmlName(unsigned char value)
{ {
return TEXT(""); return TEXT("");
} }
} }
} }
@ -333,6 +440,8 @@ int AsciiListView::getHtmlNumber(unsigned char value)
{ {
switch (value) switch (value)
{ {
case 45:
return 8722;
case 128: case 128:
return 8364; return 8364;
case 130: case 130:
@ -347,12 +456,18 @@ int AsciiListView::getHtmlNumber(unsigned char value)
return 8224; return 8224;
case 135: case 135:
return 8225; return 8225;
case 136:
return 710;
case 137: case 137:
return 8240; return 8240;
case 138: case 138:
return 352; return 352;
case 139:
return 8249;
case 140: case 140:
return 338; return 338;
case 142:
return 381;
case 145: case 145:
return 8216; return 8216;
case 146: case 146:
@ -367,19 +482,24 @@ int AsciiListView::getHtmlNumber(unsigned char value)
return 8211; return 8211;
case 151: case 151:
return 8212; return 8212;
case 152:
return 732;
case 153: case 153:
return 8482; return 8482;
case 154: case 154:
return 353; return 353;
case 155:
return 8250;
case 156: case 156:
return 339; return 339;
case 158:
return 382;
case 159: case 159:
return 376; return 376;
default: default:
{ {
return -1; return -1;
} }
} }
} }
@ -390,9 +510,11 @@ void AsciiListView::setValues(int codepage)
for (int i = 0 ; i < 256 ; ++i) for (int i = 0 ; i < 256 ; ++i)
{ {
constexpr size_t bufSize = 8; constexpr size_t bufSize = 8;
TCHAR dec[bufSize]; constexpr size_t bufSizeHex = 9;
TCHAR hex[bufSize]; wchar_t dec[bufSize]{};
TCHAR htmlNumber[bufSize]; wchar_t hex[bufSize]{};
wchar_t htmlNumber[bufSize]{};
wchar_t htmlHexNumber[bufSizeHex]{};
generic_string htmlName; generic_string htmlName;
swprintf(dec, bufSize, TEXT("%d"), i); swprintf(dec, bufSize, TEXT("%d"), i);
swprintf(hex, bufSize, TEXT("%02X"), i); swprintf(hex, bufSize, TEXT("%02X"), i);
@ -400,20 +522,23 @@ void AsciiListView::setValues(int codepage)
if (codepage == 0 || codepage == 1252) if (codepage == 0 || codepage == 1252)
{ {
if ((i >= 32 && i <= 126) || (i >= 160 && i <= 255)) if ((i >= 32 && i <= 126 && i != 45) || (i >= 160 && i <= 255))
{ {
swprintf(htmlNumber, bufSize, TEXT("&#%d"), i); swprintf(htmlNumber, bufSize, TEXT("&#%d;"), i);
swprintf(htmlHexNumber, bufSize, TEXT("&#x%x;"), i);
} }
else else
{ {
int n = getHtmlNumber(static_cast<unsigned char>(i)); int n = getHtmlNumber(static_cast<unsigned char>(i));
if (n > -1) if (n > -1)
{ {
swprintf(htmlNumber, bufSize, TEXT("&#%d"), n); swprintf(htmlNumber, bufSize, TEXT("&#%d;"), n);
swprintf(htmlHexNumber, bufSizeHex, TEXT("&#x%x;"), n);
} }
else else
{ {
swprintf(htmlNumber, bufSize, TEXT("")); swprintf(htmlNumber, bufSize, TEXT(""));
swprintf(htmlHexNumber, bufSizeHex, TEXT(""));
} }
} }
@ -422,6 +547,7 @@ void AsciiListView::setValues(int codepage)
else else
{ {
swprintf(htmlNumber, bufSize, TEXT("")); swprintf(htmlNumber, bufSize, TEXT(""));
swprintf(htmlHexNumber, bufSizeHex, TEXT(""));
htmlName = TEXT(""); htmlName = TEXT("");
} }
@ -430,8 +556,9 @@ void AsciiListView::setValues(int codepage)
values2Add.push_back(dec); values2Add.push_back(dec);
values2Add.push_back(hex); values2Add.push_back(hex);
values2Add.push_back(s); values2Add.push_back(s);
values2Add.push_back(htmlNumber);
values2Add.push_back(htmlName); values2Add.push_back(htmlName);
values2Add.push_back(htmlNumber);
values2Add.push_back(htmlHexNumber);
addLine(values2Add); addLine(values2Add);
} }