Tera TermRevision: 9313
https://osdn.net/projects/ttssh2/scm/svn/commits/9313
Author: zmatsuo
Date: 2021-06-20 10:07:40 +0900 (Sun, 20 Jun 2021)
Log Message:
-----------
locale設定を削除
- Cランタイムの文字コードの設定
- 従来Cランタイムの文字コード変換関数を使用していたため必要だった
- wctomb()
- 現在Cランタイムの文字コード変換は使用していないため不要
- OSのAPI WideCharToMultiByte(), MultiByteToWideChar() を使用
- setlocale()を削除
- 不要な locale.h の include を削除
- 設定ダイアログの locale 設定を削除
- IDC_LOCALE_LABEL 削除
- lng 内の DLG_TERM_LOCALE 削除
- ドキュメント locale 設定個所を削除
- iniファイルのlocale読み書きを削除
- r9145
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9145
Modified Paths:
--------------
trunk/doc/en/html/menu/setup-terminal_ja.html
trunk/doc/en/html/menu/setup-terminal_ko.html
trunk/doc/en/html/menu/setup-terminal_utf8.html
trunk/doc/en/html/setup/teraterm-ini.html
trunk/doc/ja/html/menu/setup-terminal.html
trunk/doc/ja/html/menu/setup-terminal_ko.html
trunk/doc/ja/html/menu/setup-terminal_utf8.html
trunk/doc/ja/html/setup/teraterm-ini.html
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
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/commlib.c
trunk/teraterm/teraterm/vtterm.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpcmn/language.c
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpdlg/dlg_res.h
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpdlg/ttpdlg.rc
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-terminal_ja.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_ja.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/en/html/menu/setup-terminal_ja.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -153,12 +153,6 @@
</p>
</dd>
- <dt id="locale">locale</dt>
- <dd>
- Locale setting.
- Refer to <a href="../usage/unicode.html">Unicode</a> for details.
- </dd>
-
</dl>
</body>
</html>
Modified: trunk/doc/en/html/menu/setup-terminal_ko.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_ko.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/en/html/menu/setup-terminal_ko.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -119,12 +119,6 @@
Character code that is sent from client(KS5601 and UTF-8).
</dd>
- <dt id="locale">locale</dt>
- <dd>
- Locale setting.
- Refer to <a href="../usage/unicode.html">Unicode</a> for details.
- </dd>
-
</dl>
</body>
</html>
Modified: trunk/doc/en/html/menu/setup-terminal_utf8.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_utf8.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/en/html/menu/setup-terminal_utf8.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -119,12 +119,6 @@
Character code that is sent from client(UTF-8).
</dd>
- <dt id="locale">locale</dt>
- <dd>
- Locale setting.
- Refer to <a href="../usage/unicode.html">Unicode</a> for details.
- </dd>
-
</dl>
</body>
</html>
Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/en/html/setup/teraterm-ini.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -758,12 +758,6 @@
<td></td>
</tr>
<tr>
- <td id="Locale">Locale</td>
- <td style="width:250px;">*</td>
- <td style="width:250px;">japanese</td>
- <td>* by the installer</td>
- </tr>
- <tr>
<td id="LocalEcho"><a href="../menu/setup-terminal.html#LocalEcho">LocalEcho</a></td>
<td style="width:250px;">off</td>
<td style="width:250px;"><-</td>
Modified: trunk/doc/ja/html/menu/setup-terminal.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/ja/html/menu/setup-terminal.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -154,12 +154,6 @@
</p>
</dd>
- <dt id="locale">locale</dt>
- <dd>
- \x83\x8D\x83P\x81[\x83\x8B\x81B
- \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
- </dd>
-
</dl>
</body>
</html>
Modified: trunk/doc/ja/html/menu/setup-terminal_ko.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_ko.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/ja/html/menu/setup-terminal_ko.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -120,12 +120,6 @@
\x91\x97\x8Fo\x82\xB7\x82镶\x8E\x9A\x83R\x81[\x83h (KS5601, UTF-8 \x82\xCC2\x8E\xED\x97\xDE)\x81B
</dd>
- <dt id="locale">locale</dt>
- <dd>
- \x83\x8D\x83P\x81[\x83\x8B\x81B
- \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
- </dd>
-
</dl>
</body>
</html>
Modified: trunk/doc/ja/html/menu/setup-terminal_utf8.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_utf8.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/ja/html/menu/setup-terminal_utf8.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -120,12 +120,6 @@
\x91\x97\x8Fo\x82\xB7\x82镶\x8E\x9A\x83R\x81[\x83h (UTF-8 \x82\xCC1\x8E\xED\x97\xDE)\x81B
</dd>
- <dt id="locale">locale</dt>
- <dd>
- \x83\x8D\x83P\x81[\x83\x8B\x81B
- \x8Fڍׂ\xCD<a href="../usage/unicode.html">Unicode\x90ݒ\xE8</a>\x82\xF0\x8EQ\x8FƁB
- </dd>
-
</dl>
</body>
</html>
Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/doc/ja/html/setup/teraterm-ini.html 2021-06-20 01:07:40 UTC (rev 9313)
@@ -764,12 +764,6 @@
<td></td>
</tr>
<tr>
- <td id="Locale">Locale</td>
- <td style="width:250px;">\x81\xA6</td>
- <td style="width:250px;">japanese</td>
- <td>\x81\xA6\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82ɂ\xE6\x82\xE9</td>
- </tr>
- <tr>
<td id="LocalEcho"><a href="../menu/setup-terminal.html#LocalEcho">LocalEcho</a></td>
<td style="width:250px;">off</td>
<td style="width:250px;"><-</td>
Modified: trunk/installer/release/lang_utf8/English.lng
===================================================================
--- trunk/installer/release/lang_utf8/English.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/English.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -408,7 +408,6 @@
DLG_TERM_KANASEND=Half-wi&dth kana
DLG_TERM_KIN=Kanji-i&n:
DLG_TERM_KOUT=Kanji-&out:
-DLG_TERM_LOCALE=lo&cale:
DLG_TERM_RUSSCHARSET=Character set
DLG_TERM_RUSSHOST=H&ost:
DLG_TERM_RUSSCLIENT=&Client:
Modified: trunk/installer/release/lang_utf8/French.lng
===================================================================
--- trunk/installer/release/lang_utf8/French.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/French.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -409,7 +409,6 @@
DLG_TERM_KANASEND=Half-wi&dth kana
DLG_TERM_KIN=Kanji-i&n:
DLG_TERM_KOUT=Kanji-&out:
-DLG_TERM_LOCALE=lo&cal:
DLG_TERM_RUSSCHARSET=Jeu de caractères
DLG_TERM_RUSSHOST=Hôte:
DLG_TERM_RUSSCLIENT=&Client:
Modified: trunk/installer/release/lang_utf8/German.lng
===================================================================
--- trunk/installer/release/lang_utf8/German.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/German.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -409,7 +409,6 @@
DLG_TERM_KANASEND=Half-wi&dth kana
DLG_TERM_KIN=Kanji-i&n:
DLG_TERM_KOUT=Kanji-&out:
-DLG_TERM_LOCALE=locale:
DLG_TERM_RUSSCHARSET=Zeichensatz
DLG_TERM_RUSSHOST=H&ost:
DLG_TERM_RUSSCLIENT=&Client:
Modified: trunk/installer/release/lang_utf8/Japanese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Japanese.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/Japanese.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -408,7 +408,6 @@
DLG_TERM_KANASEND=半角カナ(&D)
DLG_TERM_KIN=漢字イン(&N):
DLG_TERM_KOUT=漢字アウト(&O):
-DLG_TERM_LOCALE=ロケール(&C):
DLG_TERM_RUSSCHARSET=文字セット
DLG_TERM_RUSSHOST=ホスト(&O):
DLG_TERM_RUSSCLIENT=クライアント(&C):
Modified: trunk/installer/release/lang_utf8/Korean.lng
===================================================================
--- trunk/installer/release/lang_utf8/Korean.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/Korean.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -409,7 +409,6 @@
DLG_TERM_KANASEND=Half-wi&dth kana
DLG_TERM_KIN=Kanji-i&n:
DLG_TERM_KOUT=Kanji-&out:
-DLG_TERM_LOCALE=lo&cale:
DLG_TERM_RUSSCHARSET=문자세트
DLG_TERM_RUSSHOST=호스트(&O):
DLG_TERM_RUSSCLIENT=클라이언트(&C):
Modified: trunk/installer/release/lang_utf8/Russian.lng
===================================================================
--- trunk/installer/release/lang_utf8/Russian.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/Russian.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -409,7 +409,6 @@
DLG_TERM_KANASEND=Half-wi&dth kana
DLG_TERM_KIN=Kanji-i&n:
DLG_TERM_KOUT=Kanji-&out:
-DLG_TERM_LOCALE=&Расположение:
DLG_TERM_RUSSCHARSET=Кодировка
DLG_TERM_RUSSHOST=&Хост:
DLG_TERM_RUSSCLIENT=&Клиент:
Modified: trunk/installer/release/lang_utf8/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Simplified Chinese.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/Simplified Chinese.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -409,7 +409,6 @@
DLG_TERM_KANASEND=Half-wi&dth 假名
DLG_TERM_KIN=汉字输入(&N)：
DLG_TERM_KOUT=汉字输出(&O)：
-DLG_TERM_LOCALE=地区(&C)：
DLG_TERM_RUSSCHARSET=字符集
DLG_TERM_RUSSHOST=主机端(&O)：
DLG_TERM_RUSSCLIENT=客户端(&C)：
Modified: trunk/installer/release/lang_utf8/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang_utf8/Traditional Chinese.lng 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/installer/release/lang_utf8/Traditional Chinese.lng 2021-06-20 01:07:40 UTC (rev 9313)
@@ -409,7 +409,6 @@
DLG_TERM_KANASEND=Half-wi&dth 假名
DLG_TERM_KIN=中文輸入(&N)：
DLG_TERM_KOUT=中文輸出(&O)：
-DLG_TERM_LOCALE=地區(&C)：
DLG_TERM_RUSSCHARSET=字符集
DLG_TERM_RUSSHOST=主機端(&O)：
DLG_TERM_RUSSCLIENT=客戶端(&C)：
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/common/tttypes.h 2021-06-20 01:07:40 UTC (rev 9313)
@@ -30,7 +30,6 @@
/* Constants and types for Tera Term */
#pragma once
-#include <locale.h>
#include "teraterm.h"
#include "tt-version.h"
#include "../teraterm/unicode_test.h"
@@ -508,8 +507,7 @@
BYTE AlphaBlendInactive;
BYTE reserve_0[2]; // \x96\xA2\x8Eg\x97p
char CygwinDirectory[MAX_PATH];
-#define DEFAULT_LOCALE "japanese"
- char Locale[80];
+ char reserve_Locale[80];
int CodePage;
int DuplicateSession;
char ViewlogEditor[MAX_PATH];
Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/teraterm/commlib.c 2021-06-20 01:07:40 UTC (rev 9313)
@@ -46,7 +46,6 @@
#include <ws2tcpip.h>
#include <stdio.h> /* for _snprintf() */
#include <time.h>
-#include <locale.h>
#include "filesys_log.h"
#include "ttlib.h"
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/teraterm/vtterm.c 2021-06-20 01:07:40 UTC (rev 9313)
@@ -368,7 +368,6 @@
void ResetCharSet()
{
- char *result;
if (ts.Language==IdJapanese) {
Gn[0] = IdASCII;
Gn[1] = IdKatakana;
@@ -407,24 +406,15 @@
cv.KanjiIn = ts.KanjiIn;
cv.KanjiOut = ts.KanjiOut;
- // \x83\x8D\x83P\x81[\x83\x8B\x82̐ݒ\xE8
- // wctomb \x82̂\xBD\x82\xDF
- result = setlocale(LC_ALL, ts.Locale);
- if (result == NULL) {
- // \x82\xA8\x82\xA9\x82\xB5\x82\xC8Locale\x95\xB6\x8E\x9A\x97Z\x83b\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9?
- // default\x82\xF0\x83Z\x83b\x83g\x82\xB5\x82Ă\xA8\x82\xAD
- strcpy(ts.Locale, DEFAULT_LOCALE);
- result = setlocale(LC_ALL, ts.Locale);
- }
- // \x89p\x8C\xEA\x94\xC5Windows\x82ł́Ats.Locale\x82\xAA\x83f\x83t\x83H\x83\x8B\x83g\x82\xCC"japanese"\x82\xBE\x82\xC1\x82\xBD\x8Fꍇ\x81A
- // setlocale\x82\xAA NULL \x82\xF0\x95Ԃ\xB7\x82\xBD\x82߁ATera Term\x82̋N\x93\xAE\x8E\x9E\x82ɗ\x8E\x82\xBF\x82\xE9\x81Bstrrchr\x82\xCC
- // \x91\xE61\x88\xF8\x90\x94\x82ɂ\xCDNULL\x82\xAA\x8Ew\x92\xE8\x82ł\xAB\x82Ȃ\xA2\x82\xBD\x82߁B
- // setlocale \x82ɐ\xAC\x8C\x{1C2D42}\xBD\x8E\x9E\x82̓R\x81[\x83h\x83y\x81[\x83W\x82\xF0\x90ݒ肵\x81A\x8E\xB8\x94s\x82\xB5\x82\xBD\x8E\x9E\x82\xCD
- // ANSI\x83R\x81[\x83h\x83y\x81[\x83W\x82\xF0\x90ݒ肷\x82\xE9\x81B
- if (result)
- ts.CodePage = atoi(strrchr(result, '.')+1);
- else
- ts.CodePage = GetACP();
+ // \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)
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/teraterm/vtwin.cpp 2021-06-20 01:07:40 UTC (rev 9313)
@@ -71,7 +71,6 @@
#include <stdlib.h>
#include <crtdbg.h>
#include <string.h>
-#include <locale.h>
#include <io.h>
#include <errno.h>
@@ -475,9 +474,6 @@
logfile_lock_initialize();
SetMouseCursor(ts.MouseCursorName);
- // \x83\x8D\x83P\x81[\x83\x8B\x82̐ݒ\xE8
- // wctomb \x82̂\xBD\x82\xDF
- setlocale(LC_ALL, ts.Locale);
#ifdef ALPHABLEND_TYPE2
//<!--by AKASI
Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/ttpcmn/language.c 2021-06-20 01:07:40 UTC (rev 9313)
@@ -29,7 +29,6 @@
// TTCMN.DLL character code conversion
-#include <locale.h>
#include "teraterm.h"
#include "tttypes.h"
#include "codemap.h"
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2021-06-20 01:07:40 UTC (rev 9313)
@@ -33,7 +33,6 @@
#include <stdio.h>
#include <windows.h>
#include <setupapi.h>
-#include <locale.h>
#include <htmlhelp.h>
#include <assert.h>
#include <crtdbg.h>
Modified: trunk/teraterm/ttpdlg/dlg_res.h
===================================================================
--- trunk/teraterm/ttpdlg/dlg_res.h 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/ttpdlg/dlg_res.h 2021-06-20 01:07:40 UTC (rev 9313)
@@ -120,7 +120,6 @@
#define IDC_HOSTTCPPROTOCOLLABEL 1019
#define IDC_HOSTTCPPROTOCOL 1020
#define IDC_LOCALE_BOX 1022
-#define IDC_LOCALE_EDIT 1024
#define IDC_TT_VERSION 1027
#define IDC_AUTHOR_URL 1028
#define IDC_FORUM_LABEL 1029
@@ -158,7 +157,6 @@
#define IDC_TERMIDLABEL 1061
#define IDC_TERMKANJILABEL 1062
#define IDC_TERMKANJISENDLABEL 1063
-#define IDC_LOCALE_LABEL 1064
#define IDC_TERMRUSSCHARSET 1065
#define IDC_TERMRUSSHOSTLABEL 1066
#define IDC_TERMRUSSCLIENTLABEL 1067
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2021-06-20 01:07:40 UTC (rev 9313)
@@ -204,7 +204,6 @@
{ IDC_TERMKANASEND, "DLG_TERM_KANASEND" },
{ IDC_TERMKINTEXT, "DLG_TERM_KIN" },
{ IDC_TERMKOUTTEXT, "DLG_TERM_KOUT" },
- { IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
};
SetDlgTexts(Dialog, TextInfosJp, _countof(TextInfosJp), UILanguageFile);
}
@@ -221,7 +220,6 @@
static const DlgTextInfo TextInfosKo[] = {
{ IDC_TERMKANJILABEL, "DLG_TERMK_KANJI" },
{ IDC_TERMKANJISENDLABEL, "DLG_TERMK_KANJISEND" },
- { IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
};
SetDlgTexts(Dialog, TextInfosKo, _countof(TextInfosKo), UILanguageFile);
}
@@ -287,10 +285,6 @@
else {
SetDropDownList(Dialog,IDC_TERMKOUT,KanjiOutList,ts->KanjiOut);
}
-
- // \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X
- SetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale);
- SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0);
}
else if (ts->Language==IdRussian) {
SetDropDownList(Dialog,IDC_TERMRUSSHOST,RussList,ts->RussHost);
@@ -304,18 +298,10 @@
else if (ts->Language==IdKorean) { // HKS
SetDropDownList(Dialog, IDC_TERMKANJI, KoreanList, KanjiCode2List(ts->Language,ts->KanjiCode));
SetDropDownList(Dialog, IDC_TERMKANJISEND, KoreanListSend, KanjiCode2List(ts->Language,ts->KanjiCodeSend));
-
- // \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X
- SetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale);
- SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0);
}
else if (ts->Language==IdUtf8) {
SetDropDownList(Dialog, IDC_TERMKANJI, Utf8List, KanjiCode2List(ts->Language,ts->KanjiCode));
SetDropDownList(Dialog, IDC_TERMKANJISEND, Utf8ListSend, KanjiCode2List(ts->Language,ts->KanjiCodeSend));
-
- // \x83\x8D\x83P\x81[\x83\x8B\x97p\x83e\x83L\x83X\x83g\x83{\x83b\x83N\x83X
- SetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale);
- SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, EM_LIMITTEXT, sizeof(ts->Locale), 0);
}
CenterWindow(Dialog, GetParent(Dialog));
return TRUE;
@@ -392,8 +378,6 @@
if ((w = (WORD)GetCurSel(Dialog, IDC_TERMKOUT)) > 0) {
ts->KanjiOut = w;
}
-
- GetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale, sizeof(ts->Locale));
}
else if (ts->Language==IdRussian) {
if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSHOST)) > 0) {
@@ -419,8 +403,6 @@
ts->JIS7Katakana=0;
ts->KanjiIn = 0;
ts->KanjiOut = 0;
-
- GetDlgItemText(Dialog, IDC_LOCALE_EDIT, ts->Locale, sizeof(ts->Locale));
}
}
Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc 2021-06-20 01:07:40 UTC (rev 9313)
@@ -82,8 +82,6 @@
DEFPUSHBUTTON "OK",IDOK,198,10,40,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,198,30,40,14
PUSHBUTTON "&Help",IDC_TERMHELP,198,54,40,14
- RTEXT "lo&cale:",IDC_LOCALE_LABEL,12,129,44,8
- EDITTEXT IDC_LOCALE_EDIT,59,127,63,13,ES_AUTOHSCROLL
END
IDD_TERMDLGJ DIALOGEX 20, 20, 245, 158
@@ -121,8 +119,6 @@
DEFPUSHBUTTON "OK",IDOK,198,10,40,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,198,30,40,14
PUSHBUTTON "&Help",IDC_TERMHELP,198,54,40,14
- RTEXT "lo&cale:",IDC_LOCALE_LABEL,12,142,44,8
- EDITTEXT IDC_LOCALE_EDIT,59,140,63,13,ES_AUTOHSCROLL
END
IDD_SERIALDLG DIALOGEX 20, 20, 234, 214
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2021-06-20 01:07:22 UTC (rev 9312)
+++ trunk/teraterm/ttpset/ttset.c 2021-06-20 01:07:40 UTC (rev 9313)
@@ -1898,11 +1898,6 @@
GetPrivateProfileString(Section, "ViewlogEditor ", Temp,
ts->ViewlogEditor, sizeof(ts->ViewlogEditor), FName);
- // Locale for UTF-8
- GetPrivateProfileString(Section, "Locale ", DEFAULT_LOCALE,
- Temp, sizeof(Temp), FName);
- strncpy_s(ts->Locale, sizeof(ts->Locale), Temp, _TRUNCATE);
-
// UI language message file (\x91\x8A\x91p\x83X)
hGetPrivateProfileStringW(SectionW, L"UILanguageFile", NULL, FName, &ts->UILanguageFileW_ini);
if (ts->UILanguageFileW_ini == NULL) {
@@ -2637,7 +2632,6 @@
ts->CygwinDirectory, FName);
WritePrivateProfileString(Section, "ViewlogEditor", ts->ViewlogEditor,
FName);
- WritePrivateProfileString(Section, "Locale", ts->Locale, FName);
// ANSI color(2004.9.5 yutaka)
Temp[0] = '\0';