Tera TermRevision: 9315
https://osdn.net/projects/ttssh2/scm/svn/commits/9315
Author: zmatsuo
Date: 2021-06-20 10:08:06 +0900 (Sun, 20 Jun 2021)
Log Message:
-----------
TTTSet 構造体から CodePage メンバを削除
- Language, KanjiCode から文字コードを判定
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/vtterm.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2021-06-20 01:07:54 UTC (rev 9314)
+++ trunk/teraterm/common/tttypes.h 2021-06-20 01:08:06 UTC (rev 9315)
@@ -508,7 +508,7 @@
BYTE reserve_0[2]; // \x96\xA2\x8Eg\x97p
char CygwinDirectory[MAX_PATH];
char reserve_Locale[80];
- int CodePage;
+ int reserve_CodePage;
int DuplicateSession;
char ViewlogEditor[MAX_PATH];
WORD LogTypePlainText;
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2021-06-20 01:07:54 UTC (rev 9314)
+++ trunk/teraterm/teraterm/vtterm.c 2021-06-20 01:08:06 UTC (rev 9315)
@@ -405,16 +405,6 @@
cv.JIS7KatakanaSend = ts.JIS7KatakanaSend;
cv.KanjiIn = ts.KanjiIn;
cv.KanjiOut = ts.KanjiOut;
-
- // \x83\x8D\x83P\x81[\x83\x8B\x82̐ݒ\xE8(\x8D폜\x82\xB5\x82\xBD) TODO: \x8D폜
- // \x8F]\x97\x88\x82\xCD wctomb()\x8Cn\x82̂\xBD\x82߂\xC9setlocale()\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xBD\x82\xAA
- // \x8C\xBB\x8D݂\xCD wctomb()\x8Cn\x82͎g\x97p\x82\xB5\x82Ȃ\xAD\x82Ȃ\xC1\x82\xBD\x81B
- // ts.Locale[] \x82\xA9\x82\xE7 setlocale() \x82̖߂\xE8\x92l\x82\xC4
- // \x82\xBB\x82\xB1\x82\xA9\x82\xE7\x83R\x81[\x83h\x83y\x81[\x83W\x82\xF0ts.CodePage \x82Ɏ擾\x82\xB5\x82Ă\xA2\x82\xBD\x81B
- //
- // ts.CodePage \x82̒l\x82\xCD cv.CodePage \x82Ɉ\xF8\x82\xAB\x8Cp\x82\xAA\x82\xEA\x82\xC4
- // CommTextOut(),CommTextEcho()@ttcmn.c \x82Ŏg\x97p\x82\xB3\x82\xEA\x82\xE9
- ts.CodePage = GetACP();
}
void ResetKeypadMode(BOOL DisabledModeOnly)
@@ -1047,7 +1037,6 @@
}
else {
assert(FALSE);
- goto default_;
}
break;
case IdChinese:
@@ -1061,13 +1050,10 @@
}
else {
assert(FALSE);
- goto default_;
}
break;
default:
- default_:
assert(FALSE);
- u32 = MBCP_UTF32(Kanji, ts.CodePage);
break;
}
CharAttrTmp.AttrEx = CharAttrTmp.Attr;
@@ -5194,7 +5180,7 @@
unsigned char b;
WORD word;
- if (ts.CodePage == 932) {
+ if (ts.Language == IdJapanese) {
for (i = 0 ; i < len ; i++) {
b = str[i];
if (IS_SJIS(b) || IS_EUC(b)) {