Tera TermRevision: 9526
https://osdn.net/projects/ttssh2/scm/svn/commits/9526
Author: zmatsuo
Date: 2021-11-12 00:30:05 +0900 (Fri, 12 Nov 2021)
Log Message:
-----------
TTXKanjiMenu 受信文字コードUTF-8m を削除
Modified Paths:
--------------
trunk/TTXKanjiMenu/ttxkanjimenu.c
trunk/installer/release/lang_utf8/English.lng
trunk/installer/release/lang_utf8/French.lng
trunk/installer/release/lang_utf8/German.lng
trunk/installer/release/lang_utf8/Japanese.lng
trunk/installer/release/lang_utf8/Korean.lng
trunk/installer/release/lang_utf8/Russian.lng
trunk/installer/release/lang_utf8/Simplified Chinese.lng
trunk/installer/release/lang_utf8/Traditional Chinese.lng
-------------- next part --------------
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.c
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.c 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.c 2021-11-11 15:30:05 UTC (rev 9526)
@@ -34,7 +34,7 @@
#define UpdateRecvMenu(val) \
CheckMenuRadioItem(pvar->hmEncode, \
ID_MI_KANJIRECV + IdSJIS, \
- ID_MI_KANJIRECV + IdUTF8m, \
+ ID_MI_KANJIRECV + IdUTF8, \
ID_MI_KANJIRECV + (val), \
MF_BYCOMMAND)
#define UpdateSendMenu(val) \
@@ -56,7 +56,6 @@
{ ID_MI_KANJIRECV + IdEUC, "Recv: &EUC-JP" },
{ ID_MI_KANJIRECV + IdJIS, "Recv: &JIS" },
{ ID_MI_KANJIRECV + IdUTF8, "Recv: &UTF-8" },
- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m" }
};
// \x8E\xF3\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h (\x8A؍\x91\x8C\xEA)
@@ -63,7 +62,6 @@
static const KmTextInfo MenuNameRecvK[] = {
{ ID_MI_KANJIRECV + IdSJIS, "Recv: &KS5601" },
{ ID_MI_KANJIRECV + IdUTF8, "Recv: &UTF-8" },
- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m" }
};
// \x91\x97\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h (\x93\xFA\x96{\x8C\xEA)
@@ -86,7 +84,6 @@
{ ID_MI_KANJIRECV + IdEUC, "Recv/Send: &EUC-JP" },
{ ID_MI_KANJIRECV + IdJIS, "Recv/Send: &JIS" },
{ ID_MI_KANJIRECV + IdUTF8, "Recv/Send: &UTF-8" },
- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m/Send: UTF-8" }
};
// \x91\x97\x8E\xF3\x90M\x8A\xBF\x8E\x9A\x83R\x81[\x83h (\x8A؍\x91\x8C\xEA)
@@ -93,7 +90,6 @@
static const KmTextInfo MenuNameOneK[] = {
{ ID_MI_KANJIRECV + IdSJIS, "Recv/Send: &KS5601" },
{ ID_MI_KANJIRECV + IdUTF8, "Recv/Send: &UTF-8" },
- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m/Send: UTF-8" }
};
// \x83\x81\x83j\x83\x85\x81[\x8E\xA9\x91̂̍\x91\x8Dۉ\xBB\x97p\x8F\xEE\x95\xF1 (\x93\xFA\x96{\x8C\xEA)
@@ -113,7 +109,6 @@
{ ID_MI_KANJIRECV + IdEUC, "MENU_RECV_EUCJP" },
{ ID_MI_KANJIRECV + IdJIS, "MENU_RECV_JIS" },
{ ID_MI_KANJIRECV + IdUTF8, "MENU_RECV_UTF8" },
- { ID_MI_KANJIRECV + IdUTF8m, "MENU_RECV_UTF8m" },
// \x91\x97\x90M
{ ID_MI_KANJISEND + IdSJIS, "MENU_SEND_SJIS" },
{ ID_MI_KANJISEND + IdEUC, "MENU_SEND_EUCJP" },
@@ -128,7 +123,6 @@
// \x8E\xF3\x90M
{ ID_MI_KANJIRECV + IdSJIS, "MENU_RECV_KS5601" },
{ ID_MI_KANJIRECV + IdUTF8, "MENU_RECV_UTF8" },
- { ID_MI_KANJIRECV + IdUTF8m, "MENU_RECV_UTF8m" },
// \x91\x97\x90M
{ ID_MI_KANJISEND + IdSJIS, "MENU_SEND_KS5601" },
{ ID_MI_KANJISEND + IdUTF8, "MENU_SEND_UTF8" },
@@ -143,7 +137,6 @@
{ ID_MI_KANJIRECV + IdEUC, "MENU_EUCJP" },
{ ID_MI_KANJIRECV + IdJIS, "MENU_JIS" },
{ ID_MI_KANJIRECV + IdUTF8, "MENU_UTF8" },
- { ID_MI_KANJIRECV + IdUTF8m, "MENU_UTF8m" },
// UseOneSetting
{ ID_MI_USEONESETTING, "MENU_USE_ONE_SETTING" }
};
@@ -153,7 +146,6 @@
// \x91\x97\x8E\xF3\x90M
{ ID_MI_KANJIRECV + IdSJIS, "MENU_KS5601" },
{ ID_MI_KANJIRECV + IdUTF8, "MENU_UTF8" },
- { ID_MI_KANJIRECV + IdUTF8m, "MENU_UTF8m" },
// UseOneSetting
{ ID_MI_USEONESETTING, "MENU_USE_ONE_SETTING" }
};
@@ -205,19 +197,11 @@
if (ret) {
if (orgRecvCode == pvar->ts->KanjiCode && orgSendCode != pvar->ts->KanjiCodeSend) {
// \x91\x97\x90M\x83R\x81[\x83h\x82̂ݕύX\x82\xB5\x82\xBD\x8Fꍇ\x82͑\x97\x90M\x83R\x81[\x83h\x82ɍ\x87\x82킹\x82\xE9
- // \x82\xBD\x82\xBE\x82\xB5\x81A\x91\x97\x90M:UTF-8 && \x8E\xF3\x90M:UTF-8m \x82̏ꍇ\x82͑ΏۊO
- if (pvar->ts->KanjiCodeSend != IdUTF8 || pvar->ts->KanjiCode != IdUTF8m) {
- pvar->ts->KanjiCode = pvar->ts->KanjiCodeSend;
- }
+ pvar->ts->KanjiCode = pvar->ts->KanjiCodeSend;
}
else {
// \x82\xBB\x82\xEA\x88ȊO\x82͎\xF3\x90M\x83R\x81[\x83h\x82ɍ\x87\x82킹\x82\xE9
- if (pvar->ts->KanjiCode == IdUTF8m) {
- pvar->ts->KanjiCodeSend = IdUTF8;
- }
- else {
- pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
- }
+ pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
}
}
@@ -231,6 +215,8 @@
* \x90ݒ\xE8\x83_\x83C\x83A\x83\x8D\x83O\x8Cďo\x82̌㏈\x97\x9D\x82݂̂𗘗p\x82\xB7\x82\xE9\x81B
*/
static BOOL PASCAL ResetCharSet(HWND parent, PTTSet ts) {
+ (void)parent;
+ (void)ts;
pvar->NeedResetCharSet = FALSE;
return TRUE;
}
@@ -273,12 +259,7 @@
pvar->UseOneSetting = TRUE;
// UseOneSetting \x82\xAA on \x82̏ꍇ\x82́A\x91\x97\x8E\xF3\x90M\x90ݒ肪\x93\xAF\x82\xB6\x82ɂȂ\xE9\x82悤\x82ɒ\xB2\x90\xAE\x82\xB7\x82\xE9
if (pvar->ts->Language == IdJapanese) {
- if (pvar->ts->KanjiCode == IdUTF8m) {
- pvar->ts->KanjiCodeSend = IdUTF8;
- }
- else {
- pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
- }
+ pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
}
else if (pvar->ts->Language == IdKorean) {
pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
@@ -338,7 +319,7 @@
* UseOneSetting \x82\xAA off \x82̎\x9E\x82Ɏg\x82\xA4
*/
static void InsertSendKcodeMenu(HMENU menu) {
- UINT flag = MF_BYPOSITION | MF_STRING | MF_CHECKED;
+// UINT flag = MF_BYPOSITION | MF_STRING | MF_CHECKED;
int i;
if (pvar->ts->Language == IdJapanese) {
@@ -496,6 +477,7 @@
*/
static void PASCAL TTXModifyPopupMenu(HMENU menu) {
// \x83\x81\x83j\x83\x85\x81[\x82\xAA\x8CĂяo\x82\xB3\x82ꂽ\x82\xE7\x81A\x8DŐV\x82̐ݒ\xE8\x82ɍX\x90V\x82\xB7\x82\xE9\x81B(2007.5.25 yutaka)
+ (void)menu;
UpdateRecvMenu(pvar->ts->KanjiCode);
if (!pvar->UseOneSetting) {
UpdateSendMenu(pvar->ts->KanjiCodeSend);
@@ -510,13 +492,10 @@
static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
WORD val;
- if ((cmd > ID_MI_KANJIRECV) && (cmd <= ID_MI_KANJIRECV+IdUTF8m)) {
+ if ((cmd > ID_MI_KANJIRECV) && (cmd <= ID_MI_KANJIRECV+IdUTF8)) {
val = cmd - ID_MI_KANJIRECV;
pvar->cv->KanjiCodeEcho = pvar->ts->KanjiCode = val;
if (pvar->UseOneSetting) {
- if (val == IdUTF8m) {
- val = IdUTF8;
- }
pvar->cv->KanjiCodeSend = pvar->ts->KanjiCodeSend = val;
}
CallResetCharSet(hWin);
@@ -543,12 +522,7 @@
else {
pvar->UseOneSetting = TRUE;
- if (pvar->ts->KanjiCode == IdUTF8m) {
- val = IdUTF8;
- }
- else {
- val = pvar->ts->KanjiCode;
- }
+ val = pvar->ts->KanjiCode;
pvar->cv->KanjiCodeSend = pvar->ts->KanjiCodeSend = val;
DeleteSendKcodeMenu(pvar->hmEncode);
@@ -593,6 +567,7 @@
int size = sizeof(Exports) - sizeof(exports->size);
/* do version checking if necessary */
/* if (Version!=TTVERSION) return FALSE; */
+ (void)Version;
if (size > exports->size) {
size = exports->size;
@@ -607,6 +582,7 @@
ULONG ul_reason_for_call,
LPVOID lpReserved)
{
+ (void)lpReserved;
switch( ul_reason_for_call ) {
case DLL_THREAD_ATTACH:
/* do thread initialization */
Modified: trunk/installer/release/lang_utf8/English.lng
===================================================================
--- trunk/installer/release/lang_utf8/English.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/English.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1119,7 +1119,6 @@
MENU_RECV_EUCJP=Recv: &EUC-JP
MENU_RECV_JIS=Recv: &JIS
MENU_RECV_UTF8=Recv: &UTF-8
-MENU_RECV_UTF8m=Recv: UTF-8&m
MENU_RECV_KS5601=Recv: &KS5601
MENU_SEND_SJIS=Send: S&hift_JIS
MENU_SEND_EUCJP=Send: EU&C-JP
@@ -1131,7 +1130,6 @@
MENU_EUCJP=Recv/Send: &EUC-JP
MENU_JIS=Recv/Send: &JIS
MENU_UTF8=Recv/Send: &UTF-8
-MENU_UTF8m=Recv: UTF-8&m/Send: UTF-8
MENU_KS5601=Recv/Send: &KS5601
Modified: trunk/installer/release/lang_utf8/French.lng
===================================================================
--- trunk/installer/release/lang_utf8/French.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/French.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1123,7 +1123,6 @@
MENU_RECV_EUCJP=Recep: &EUC-JP
MENU_RECV_JIS=Recep: &JIS
MENU_RECV_UTF8=Recep: &UTF-8
-MENU_RECV_UTF8m=Recep: UTF-8&m
MENU_RECV_KS5601=Recv: &KS5601
MENU_SEND_SJIS=Envoi: S&hift_JIS
MENU_SEND_EUCJP=Envoi: EU&C-JP
@@ -1135,7 +1134,6 @@
MENU_EUCJP=Recep/Envoi: &EUC-JP
MENU_JIS=Recep/Envoi: &JIS
MENU_UTF8=Recv/Send: &UTF-8
-MENU_UTF8m=Recep: UTF-8&m/Send: UTF-8
MENU_KS5601=Recep/Envoi: &KS5601
Modified: trunk/installer/release/lang_utf8/German.lng
===================================================================
--- trunk/installer/release/lang_utf8/German.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/German.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1123,7 +1123,6 @@
MENU_RECV_EUCJP=Recv: &EUC-JP
MENU_RECV_JIS=Recv: &JIS
MENU_RECV_UTF8=Recv: &UTF-8
-MENU_RECV_UTF8m=Recv: UTF-8&m
MENU_RECV_KS5601=Recv: &KS5601
MENU_SEND_SJIS=Send: S&hift_JIS
MENU_SEND_EUCJP=Send: EU&C-JP
@@ -1135,7 +1134,6 @@
MENU_EUCJP=Recv/Send: &EUC-JP
MENU_JIS=Recv/Send: &JIS
MENU_UTF8=Recv/Send: &UTF-8
-MENU_UTF8m=Recv: UTF-8&m/Send: UTF-8
MENU_KS5601=Recv/Send: &KS5601
Modified: trunk/installer/release/lang_utf8/Japanese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Japanese.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/Japanese.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1122,7 +1122,6 @@
MENU_RECV_EUCJP=受信: &EUC-JP
MENU_RECV_JIS=受信: &JIS
MENU_RECV_UTF8=受信: &UTF-8
-MENU_RECV_UTF8m=受信: UTF-8&m
MENU_RECV_KS5601=受信: &KS5601
MENU_SEND_SJIS=送信: S&hift_JIS
MENU_SEND_EUCJP=送信: EU&C-JP
@@ -1134,7 +1133,6 @@
MENU_EUCJP=送受信: &EUC-JP
MENU_JIS=送受信: &JIS
MENU_UTF8=送受信: &UTF-8
-MENU_UTF8m=受信: UTF-8&m/送信: UTF-8
MENU_KS5601=送受信: &KS5601
Modified: trunk/installer/release/lang_utf8/Korean.lng
===================================================================
--- trunk/installer/release/lang_utf8/Korean.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/Korean.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1123,7 +1123,6 @@
MENU_RECV_EUCJP=Recv: &EUC-JP
MENU_RECV_JIS=Recv: &JIS
MENU_RECV_UTF8=Recv: &UTF-8
-MENU_RECV_UTF8m=Recv: UTF-8&m
MENU_RECV_KS5601=Recv: &KS5601
MENU_SEND_SJIS=Send: S&hift_JIS
MENU_SEND_EUCJP=Send: EU&C-JP
@@ -1135,7 +1134,6 @@
MENU_EUCJP=Recv/Send: &EUC-JP
MENU_JIS=Recv/Send: &JIS
MENU_UTF8=Recv/Send: &UTF-8
-MENU_UTF8m=Recv: UTF-8&m/Send: UTF-8
MENU_KS5601=Recv/Send: &KS5601
Modified: trunk/installer/release/lang_utf8/Russian.lng
===================================================================
--- trunk/installer/release/lang_utf8/Russian.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/Russian.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1123,7 +1123,6 @@
MENU_RECV_EUCJP=Прием: &EUC-JP
MENU_RECV_JIS=Прием: &JIS
MENU_RECV_UTF8=Прием: &UTF-8
-MENU_RECV_UTF8m=Прием: UTF-8&m
MENU_RECV_KS5601=Прием: &KS5601
MENU_SEND_SJIS=Передача: S&hift_JIS
MENU_SEND_EUCJP=Передача: EU&C-JP
@@ -1135,7 +1134,6 @@
MENU_EUCJP=Прием/Передача: &EUC-JP
MENU_JIS=Прием/Передача: &JIS
MENU_UTF8=Прием/Передача: &UTF-8
-MENU_UTF8m=Прием: UTF-8&m/Передача: UTF-8
MENU_KS5601=Прием/Передача: &KS5601
Modified: trunk/installer/release/lang_utf8/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Simplified Chinese.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/Simplified Chinese.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1123,7 +1123,6 @@
MENU_RECV_EUCJP=接收：&EUC-JP
MENU_RECV_JIS=接收：&JIS
MENU_RECV_UTF8=接收：&UTF-8
-MENU_RECV_UTF8m=接收：UTF-8&m
MENU_RECV_KS5601=接收：&KS5601
MENU_SEND_SJIS=发送：S&hift_JIS
MENU_SEND_EUCJP=发送：EU&C-JP
@@ -1135,7 +1134,6 @@
MENU_EUCJP=收发：&EUC-JP
MENU_JIS=收发：&JIS
MENU_UTF8=收发：&UTF-8
-MENU_UTF8m=接收：UTF-8&m/发送：UTF-8
MENU_KS5601=收发：&KS5601
Modified: trunk/installer/release/lang_utf8/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Traditional Chinese.lng 2021-11-11 15:29:56 UTC (rev 9525)
+++ trunk/installer/release/lang_utf8/Traditional Chinese.lng 2021-11-11 15:30:05 UTC (rev 9526)
@@ -1120,7 +1120,6 @@
MENU_RECV_EUCJP=接收: &EUC-JP
MENU_RECV_JIS=接收: &JIS
MENU_RECV_UTF8=接收: &UTF-8
-MENU_RECV_UTF8m=接收: UTF-8&m
MENU_RECV_KS5601=接收: &KS5601
MENU_SEND_SJIS=發送: S&hift_JIS
MENU_SEND_EUCJP=發送: EU&C-JP
@@ -1132,7 +1131,6 @@
MENU_EUCJP=收發: &EUC-JP
MENU_JIS=收發: &JIS
MENU_UTF8=收發: &UTF-8
-MENU_UTF8m=接收: UTF-8&m/發送: UTF-8
MENU_KS5601=收發: &KS5601