CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

+ remove internal codepage support for Chinese, Japan, Korean DBCS use generalized UTF-8 codepage instead

Browse Source 
(conversions do not work as expected within scintilla lib)
This commit is contained in:
Rainer Kottenhoff 2017-08-30 12:35:07 +02:00
parent 059be6c8c2
commit d3e17140e4
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Edit.c
View File

@ -1114,24 +1114,32 @@ BOOL Encoding_IsANSI(int iEncoding)
UINT Encoding_SciGetCodePage(HWND hwnd)
{
UINT cp = (UINT)SendMessage(hwnd,SCI_GETCODEPAGE,0,0);
if (cp == (UINT)CP_UTF8 || cp == 932U || cp == 936U || cp == 949U || cp == 950U) {
// remove internal support for Chinese, Japan, Korean DBCS use UTF-8 instead
/*
int cp = (UINT)SendMessage(hwnd,SCI_GETCODEPAGE,0,0);
if (cp == 932 || cp == 936 || cp == 949 || cp == 950) {
return cp;
}
return (UINT)CP_UTF8; // CP_ACP;
return (cp == 0) ? CP_ACP : CP_UTF8;
*/
UNUSED(hwnd);
return CP_UTF8;
}
int Encoding_SciMappedCodePage(int iEncoding)
{
// remove internal support for Chinese, Japan, Korean DBCS use UTF-8 instead
/*
if (Encoding_IsValid(iEncoding)) {
// check for Chinese, Japan, Korean DBCS code pages and switch accordingly
int cp = (int)mEncoding[iEncoding].uCodePage;
if (cp == 932 || cp == 936 || cp == 949 || cp == 950) {
return cp;
return cp;
}
}
*/
UNUSED(iEncoding);
return SC_CP_UTF8;
}

3
src/Notepad3.c
View File

@ -6072,6 +6072,8 @@ void LoadSettings()
// define scintilla internal code page
int iSciDefaultCodePage = SC_CP_UTF8; // default UTF8
// remove internal support for Chinese, Japan, Korean DBCS use UTF-8 instead
/*
if (iDefaultEncoding == CPI_ANSI_DEFAULT)
{
// check for Chinese, Japan, Korean DBCS code pages and switch accordingly
@ -6081,6 +6083,7 @@ void LoadSettings()
}
iDefaultEncoding = Encoding_GetByCodePage(iSciDefaultCodePage);
}
*/
// set flag for encoding default
mEncoding[iDefaultEncoding].uFlags |= NCP_DEFAULT;