Tera Term

[ttssh2-commit] [9497] RussFontを削除、RussHost を KanjiCode に置き換え

• 前の記事 (スレッド) [ttssh2-commit] [9496] 使用していない RussClient 削除
• 次の記事 (スレッド) [ttssh2-commit] [9498] 使用していない RussPrint 削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9497
          https://osdn.net/projects/ttssh2/scm/svn/commits/9497
Author:   zmatsuo
Date:     2021-10-24 01:09:33 +0900 (Sun, 24 Oct 2021)
Log Message:
-----------
RussFontを削除、RussHost を KanjiCode に置き換え

- tttset.RussFont
- tttset.RussHost
  - tttset.KanjiCodeに置き換え

Modified Paths:
--------------
    trunk/doc/en/html/menu/setup-terminal_ru.html
    trunk/doc/en/html/setup/teraterm-ini.html
    trunk/doc/ja/html/menu/setup-terminal_ru.html
    trunk/doc/ja/html/setup/teraterm-ini.html
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/coding_pp.cpp
    trunk/teraterm/teraterm/commlib.c
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-terminal_ru.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_ru.html	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/doc/en/html/menu/setup-terminal_ru.html	2021-10-23 16:09:33 UTC (rev 9497)
@@ -106,22 +106,6 @@
 	Enables auto switching between VT and TEK emulations.
       </dd>
 
-      <dt id="RussCharSet">Character set</dt>
-      <dd>
-	<dl>
-	  <dt id="RussHost">Host</dt>
-	  <dd>
-	    Russian character set used in the host computer.
-	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5.
-	  </dd>
-
-    <dt id="RussFont">Font</dt>
-    <dd>
-	    Character code set of the specified font, Windows (CP 1251),
-	    KOI8-R, CP 866 or ISO 8859-5.
-    </dd>
-	</dl>
-      </dd>
     </dl>
   </body>
 </html>

Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/doc/en/html/setup/teraterm-ini.html	2021-10-23 16:09:33 UTC (rev 9497)
@@ -1028,18 +1028,6 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="RussFont"><a href="../menu/setup-terminalr.html#RussFont">RussFont</a></td>
-		<td style="width:250px;">Windows</td>
-		<td style="width:250px;"><-</td>
-		<td></td>
-	</tr>
-	<tr>
-		<td id="RussHost"><a href="../menu/setup-terminalr.html#RussHost">RussHost</a></td>
-		<td style="width:250px;">Windows</td>
-		<td style="width:250px;">KOI8-R</td>
-		<td></td>
-	</tr>
-	<tr>
 		<td id="RussKeyb"><a href="../menu/setup-keyboardr.html#RussKeyb">RussKeyb</a></td>
 		<td style="width:250px;">Windows</td>
 		<td style="width:250px;"><-</td>

Modified: trunk/doc/ja/html/menu/setup-terminal_ru.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_ru.html	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/doc/ja/html/menu/setup-terminal_ru.html	2021-10-23 16:09:33 UTC (rev 9497)
@@ -110,22 +110,6 @@
 	TEK window \x82֐\xA7\x8C\xE4\x82\xF0\x88ڂ\xB5\x82܂\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
       </dd>
 
-      <dt id="RussCharSet">Character set</dt>
-      <dd>
-	<dl>
-	  <dt id="RussHost">Host</dt>
-	  <dd>
-	    \x83z\x83X\x83g\x83R\x83\x93\x83s\x83\x85\x81[\x83^\x82Ŏg\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82郍\x83V\x83A\x8Cꕶ\x8E\x9A\x83Z\x83b\x83g\x81B
-	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82܂\xB7\x81B
-	  </dd>
-
-	  <dt id="RussFont">Font</dt>
-	  <dd>
-	    \x8Ew\x92肳\x82ꂽ\x83t\x83H\x83\x93\x83g\x82̕\xB6\x8E\x9A\x83R\x81[\x83h\x82\xF0\x81AWindows (CP 1251), KOI8-R,
-	    CP 866, ISO 8859-5 \x82̒\x86\x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82܂\xB7\x81B
-	  </dd>
-	</dl>
-      </dd>
     </dl>
   </body>
 </html>

Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/doc/ja/html/setup/teraterm-ini.html	2021-10-23 16:09:33 UTC (rev 9497)
@@ -1034,18 +1034,6 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="RussFont"><a href="../menu/setup-terminalr.html#RussFont">RussFont</a></td>
-		<td style="width:250px;">Windows</td>
-		<td style="width:250px;"><-</td>
-		<td></td>
-	</tr>
-	<tr>
-		<td id="RussHost"><a href="../menu/setup-terminalr.html#RussHost">RussHost</a></td>
-		<td style="width:250px;">Windows</td>
-		<td style="width:250px;">KOI8-R</td>
-		<td></td>
-	</tr>
-	<tr>
 		<td id="RussKeyb"><a href="../menu/setup-keyboardr.html#RussKeyb">RussKeyb</a></td>
 		<td style="width:250px;">Windows</td>
 		<td style="width:250px;"><-</td>

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/installer/release/TERATERM.INI	2021-10-23 16:09:33 UTC (rev 9497)
@@ -176,9 +176,6 @@
 ;	Kanji-out sequence to be transmitted (J/B)
 KanjiOut=B
 
-;	Russian code set used in host
-RussHost=Windows
-
 ;	Window title
 Title=Tera Term
 
@@ -284,9 +281,6 @@
 ;	Font quality(default/non-antialiased/antialiased/cleartype)
 FontQuality=default
 
-;	Russian code set of the font
-RussFont=Windows
-
 ;	Backspace key (BS/DEL)
 BSKey=BS
 ;	transmit DEL by Delete key (on/off)

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/common/tttypes.h	2021-10-23 16:09:33 UTC (rev 9497)
@@ -384,7 +384,7 @@
 	WORD PassThruDelay;
 	WORD PrnConvFF;
 	WORD FontFlag;
-	WORD RussFont;
+	WORD reserve_RussFont;
 	int ScrollThreshold;
 	WORD Debug;
 	WORD LogFlag;
@@ -425,7 +425,7 @@
 	WORD JIS7KatakanaSend;
 	WORD KanjiIn;
 	WORD KanjiOut;
-	WORD RussHost;
+	WORD reserve_RussHost;
 	WORD reserve_RussClient;
 	WORD RussPrint;
 	WORD AutoWinSwitch;
@@ -909,7 +909,7 @@
 	WORD JIS7KatakanaSend;
 	WORD KanjiIn;
 	WORD KanjiOut;
-	WORD RussHost;
+	WORD reserve_RussHost;
 	WORD reserve_RussClient;
 	/* from PortSet */
 	WORD DelayPerChar;

Modified: trunk/teraterm/teraterm/coding_pp.cpp
===================================================================
--- trunk/teraterm/teraterm/coding_pp.cpp	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/teraterm/coding_pp.cpp	2021-10-23 16:09:33 UTC (rev 9497)
@@ -166,8 +166,6 @@
 					ts->JIS7Katakana = 0;
 					ts->KanjiIn = 0;
 					ts->KanjiOut = 0;
-					ts->RussHost = 0;
-					ts->RussFont = 0;
 
 					// \x8E\xF3\x90M\x83R\x81[\x83h
 					int curPos = (int)SendDlgItemMessageA(hWnd, IDC_TERMKANJI, CB_GETCURSEL, 0, 0);
@@ -195,7 +193,6 @@
 					}
 					else if (lang == IdRussian &&
 							 (coding == IdWindows || coding == IdKOI8 || coding == Id866 || coding == IdISO)) {
-						ts->RussHost = coding;
 					}
 					else if (lang == IdKorean && coding == IdKoreanCP51949) {
 						;

Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/teraterm/commlib.c	2021-10-23 16:09:33 UTC (rev 9497)
@@ -316,7 +316,6 @@
 	cv->JIS7KatakanaSend = ts->JIS7KatakanaSend;
 	cv->KanjiIn = ts->KanjiIn;
 	cv->KanjiOut = ts->KanjiOut;
-	cv->RussHost = ts->RussHost;
 	cv->DelayFlag = TRUE;
 	cv->DelayPerChar = ts->DelayPerChar;
 	cv->DelayPerLine = ts->DelayPerLine;

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/teraterm/vtterm.c	2021-10-23 16:09:33 UTC (rev 9497)
@@ -880,7 +880,7 @@
 			break;
 		}
 	} else if (ts.Language == IdRussian) {
-		BYTE c = RussConv(ts.RussHost, IdWindows, b);
+		BYTE c = RussConv(ts.KanjiCode, IdWindows, b);
 		unsigned long u32 = MBCP_UTF32(c, 1251);
 		BuffPutUnicode(u32, CharAttrTmp, InsertMode);
 	} else {

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/teraterm/vtwin.cpp	2021-10-23 16:09:33 UTC (rev 9497)
@@ -1148,9 +1148,6 @@
 //	}
 	cv.CRSend = ts.CRSend;
 
-	// for russian mode
-	cv.RussHost = ts.RussHost;
-
 	if (cv.Ready) {
 		if (cv.TelFlag && (ts.TelEcho>0)) {
 			TelChangeEcho();

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2021-10-23 16:09:33 UTC (rev 9497)
@@ -1207,7 +1207,7 @@
 		if (mb_len != 1) {
 			b = '?';
 		} else {
-			b = RussConv(IdWindows, cv->RussHost, mb_char[0]);
+			b = RussConv(IdWindows, states->KanjiCode, mb_char[0]);
 		}
 		TempStr[TempLen++] = b;
 	} else if (cv->Language == IdKorean || cv->Language == IdChinese) {

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2021-10-23 16:09:33 UTC (rev 9497)
@@ -289,8 +289,6 @@
 				}
 			}
 			else if (ts->Language==IdRussian) {
-				SetDropDownList(Dialog,IDC_TERMRUSSHOST,RussList,ts->RussHost);
-				SetDropDownList(Dialog,IDC_TERMRUSSFONT,RussList,ts->RussFont);
 #if UNICODE_INTERNAL_BUFF
 				EnableWindow(GetDlgItem(Dialog, IDC_TERMRUSSCLIENT),FALSE);
 				EnableWindow(GetDlgItem(Dialog, IDC_TERMRUSSFONT),FALSE);
@@ -381,12 +379,7 @@
 							}
 						}
 						else if (ts->Language==IdRussian) {
-							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSHOST)) > 0) {
-								ts->RussHost = w;
-							}
-							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSFONT)) > 0) {
-								ts->RussFont = w;
-							}
+							;
 						}
 						else if (ts->Language==IdKorean || // HKS
 						         ts->Language==IdUtf8) {

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2021-10-23 16:09:19 UTC (rev 9496)
+++ trunk/teraterm/ttpset/ttset.c	2021-10-23 16:09:33 UTC (rev 9497)
@@ -959,11 +959,6 @@
 	                        Temp, sizeof(Temp), FName);
 	ts->TerminalID = str2id(TermList, Temp, IdVT100);
 
-	/* Russian character set (host) */
-	GetPrivateProfileString(Section, "RussHost", "",
-	                        Temp, sizeof(Temp), FName);
-	ts->RussHost = str2id(RussList, Temp, IdKOI8);
-
 	/* Title String */
 	GetPrivateProfileString(Section, "Title", "Tera Term",
 	                        ts->Title, sizeof(ts->Title), FName);
@@ -1150,11 +1145,6 @@
 	if (GetOnOff(Section, "EnableBold", FName, TRUE))
 		ts->FontFlag |= FF_BOLD;
 
-	/* Russian character set (font) */
-	GetPrivateProfileString(Section, "RussFont", "",
-	                        Temp, sizeof(Temp), FName);
-	ts->RussFont = str2id(RussList, Temp, IdWindows);
-
 	/* TEK Font */
 	ReadFont(Section, "TEKFont", "Courier,0,-13,0", FName,
 			 ts->TEKFont, _countof(ts->TEKFont),
@@ -2529,10 +2519,6 @@
 	id2str(TermList, ts->TerminalID, IdVT100, Temp, sizeof(Temp));
 	WritePrivateProfileString(Section, "TerminalID", Temp, FName);
 
-	/* Russian character set (host)  */
-	id2str(RussList, ts->RussHost, IdKOI8, Temp, sizeof(Temp));
-	WritePrivateProfileString(Section, "RussHost", Temp, FName);
-
 	/* Title text */
 	WritePrivateProfileString(Section, "Title", ts->Title, FName);
 
@@ -2708,10 +2694,6 @@
 	WriteOnOff(Section, "EnableBold", FName,
 		(WORD) (ts->FontFlag & FF_BOLD));
 
-	/* Russian character set (font) */
-	id2str(RussList, ts->RussFont, IdWindows, Temp, sizeof(Temp));
-	WritePrivateProfileString(Section, "RussFont", Temp, FName);
-
 	/* TEK Font */
 	WriteFont(Section, "TEKFont", FName,
 	          ts->TEKFont, ts->TEKFontSize.x, ts->TEKFontSize.y,

• 前の記事 (スレッド) [ttssh2-commit] [9496] 使用していない RussClient 削除
• 次の記事 (スレッド) [ttssh2-commit] [9498] 使用していない RussPrint 削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]