Tera TermRevision: 9528
https://osdn.net/projects/ttssh2/scm/svn/commits/9528
Author: zmatsuo
Date: 2021-11-12 00:30:24 +0900 (Fri, 12 Nov 2021)
Log Message:
-----------
受信文字コードUTF-8m を削除
Modified Paths:
--------------
trunk/teraterm/common/tttypes_charset.h
trunk/teraterm/teraterm/vtterm.c
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes_charset.h
===================================================================
--- trunk/teraterm/common/tttypes_charset.h 2021-11-11 15:30:14 UTC (rev 9527)
+++ trunk/teraterm/common/tttypes_charset.h 2021-11-11 15:30:24 UTC (rev 9528)
@@ -49,7 +49,6 @@
#define IdEUC 2
#define IdJIS 3
#define IdUTF8 4 // IdUtf8 (\x8F\xAC\x95\xB6\x8E\x9A)\x82\xCD ts.Language \x97p
-#define IdUTF8m 5
// ts.Language == IdRussian
// Russian code sets
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2021-11-11 15:30:14 UTC (rev 9527)
+++ trunk/teraterm/teraterm/vtterm.c 2021-11-11 15:30:24 UTC (rev 9528)
@@ -4369,7 +4369,7 @@
int CheckUTF8Seq(BYTE b, int utf8_stat)
{
- if (ts.Language == IdUtf8 || (ts.Language==IdJapanese && (ts.KanjiCode==IdUTF8 || ts.KanjiCode==IdUTF8m))) {
+ if (ts.Language == IdUtf8 || (ts.Language==IdJapanese && ts.KanjiCode==IdUTF8)) {
if (utf8_stat > 0) {
if (b >= 0x80 && b < 0xc0) {
utf8_stat -= 1;
@@ -5219,8 +5219,6 @@
} else if (ts.KanjiCode == IdUTF8) {
- } else if (ts.KanjiCode == IdUTF8m) {
-
} else {
}
@@ -5285,7 +5283,7 @@
case 1: /* Change icon name */
case 2: /* Change window title */
if (StrBuff && ts.AcceptTitleChangeRequest) {
- if ((ts.KanjiCode == IdUTF8 || ts.KanjiCode == IdUTF8m) || ts.Language == IdUtf8) {
+ if (ts.KanjiCode == IdUTF8 || ts.Language == IdUtf8) {
char *titleTmp;
titleTmp = ToCharU8(StrBuff);
@@ -5787,7 +5785,7 @@
ConvJIS = FALSE;
if (ts.KanjiCode==IdSJIS ||
- (ts.FallbackToCP932 && (ts.KanjiCode==IdUTF8 || ts.KanjiCode==IdUTF8m))) {
+ (ts.FallbackToCP932 && ts.KanjiCode==IdUTF8)) {
if ((0x80<b) && (b<0xa0) || (0xdf<b) && (b<0xfd)) {
Fallbacked = TRUE;
return TRUE; // SJIS kanji
@@ -5904,7 +5902,6 @@
}
break;
case IdUTF8:
- case IdUTF8m:
PutChar('?');
break;
default:
@@ -5920,7 +5917,6 @@
}
break;
case IdUTF8:
- case IdUTF8m:
PutChar('?');
break;
default:
@@ -6252,11 +6248,6 @@
return;
}
break;
- case IdUTF8m:
- if (ParseFirstUTF8(b)) {
- return;
- }
- break;
default:
if (ParseFirstJP(b)) {
return;
@@ -6271,11 +6262,6 @@
return;
}
break;
- case IdUTF8m:
- if (ParseFirstUTF8(b)) {
- return;
- }
- break;
default:
if (ParseFirstKR(b)) {
return;
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2021-11-11 15:30:14 UTC (rev 9527)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2021-11-11 15:30:24 UTC (rev 9528)
@@ -102,7 +102,7 @@
static const char *TermListJ[] =
{"VT100", "VT100J", "VT101", "VT102", "VT102J", "VT220J", "VT282",
"VT320", "VT382", "VT420", "VT520", "VT525", NULL};
-static const char *KanjiList[] = {"SJIS","EUC","JIS", "UTF-8", "UTF-8m", NULL};
+static const char *KanjiList[] = {"SJIS","EUC","JIS", "UTF-8", NULL};
static const char *KanjiListSend[] = {"SJIS","EUC","JIS", "UTF-8", NULL};
static const char *KanjiInList[] = {"^[$@","^[$B",NULL};
static const char *KanjiOutList[] = {"^[(B","^[(J",NULL};
@@ -112,11 +112,11 @@
static const char *MetaList2[] = {"off", "on", NULL};
// HKS
-static const char *KoreanList[] = {"KS5601", "UTF-8", "UTF-8m", NULL};
+static const char *KoreanList[] = {"KS5601", "UTF-8", NULL};
static const char *KoreanListSend[] = {"KS5601", "UTF-8", NULL};
// UTF-8
-static const char *Utf8List[] = {"UTF-8", "UTF-8m", NULL};
+static const char *Utf8List[] = {"UTF-8", NULL};
static const char *Utf8ListSend[] = {"UTF-8", NULL};
static const char *BaudList[] =
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2021-11-11 15:30:14 UTC (rev 9527)
+++ trunk/teraterm/ttpset/ttset.c 2021-11-11 15:30:24 UTC (rev 9528)
@@ -3878,10 +3878,13 @@
}
else if ((_wcsnicmp(Temp, L"/KR=", 4) == 0) ||
(_wcsnicmp(Temp, L"/KT=", 4) == 0)) { /* kanji code */
+#if 1
if (_wcsicmp(&Temp[4], L"UTF8m") == 0 ||
_wcsicmp(&Temp[4], L"UTF-8m") == 0)
- c = IdUTF8m;
- else if (_wcsicmp(&Temp[4], L"UTF8") == 0 ||
+ c = IdUTF8;
+ else
+#endif
+ if (_wcsicmp(&Temp[4], L"UTF8") == 0 ||
_wcsicmp(&Temp[4], L"UTF-8") == 0)
c = IdUTF8;
else if (_wcsicmp(&Temp[4], L"SJIS") == 0 ||