[ttssh2-commit] [9496] 使用していない RussClient 削除

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2021年 10月 24日 (日) 01:09:19 JST


Revision: 9496
          https://osdn.net/projects/ttssh2/scm/svn/commits/9496
Author:   zmatsuo
Date:     2021-10-24 01:09:19 +0900 (Sun, 24 Oct 2021)
Log Message:
-----------
使用していない RussClient 削除

- tttset.RussClient

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/vtterm.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:05 UTC (rev 9495)
+++ trunk/doc/en/html/menu/setup-terminal_ru.html	2021-10-23 16:09:19 UTC (rev 9496)
@@ -115,18 +115,11 @@
 	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5.
 	  </dd>
 
-	  <dt id="RussClient">Client</dt>
-	  <dd>
-	    Russian character set used in your PC. Windows (CP 1251),
-	    KOI8-R, CP 866 or ISO 8859-5. If you are using Russian version
-	    of Windows, you should select Windows.
-	  </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>
+    <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>

Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/doc/en/html/setup/teraterm-ini.html	2021-10-23 16:09:19 UTC (rev 9496)
@@ -1028,12 +1028,6 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="RussClient"><a href="../menu/setup-terminalr.html#RussClient">RussClient</a></td>
-		<td style="width:250px;">Windows</td>
-		<td style="width:250px;"><-</td>
-		<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>

Modified: trunk/doc/ja/html/menu/setup-terminal_ru.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_ru.html	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/doc/ja/html/menu/setup-terminal_ru.html	2021-10-23 16:09:19 UTC (rev 9496)
@@ -119,14 +119,6 @@
 	    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="RussClient">Client</dt>
-	  <dd>
-	    \x82\xA0\x82Ȃ\xBD\x82\xCC PC \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, ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82܂\xB7\x81B
-	    \x82\xE0\x82\xB5\x82\xA0\x82Ȃ\xBD\x82\xAA\x83\x8D\x83V\x83A\x8C\xEA Windows \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82Ȃ\xE7\x81AWindows
-	    \x82\xF0\x91I\x91\xF0\x82\xB7\x82ׂ\xAB\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,

Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/doc/ja/html/setup/teraterm-ini.html	2021-10-23 16:09:19 UTC (rev 9496)
@@ -1034,12 +1034,6 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="RussClient"><a href="../menu/setup-terminalr.html#RussClient">RussClient</a></td>
-		<td style="width:250px;">Windows</td>
-		<td style="width:250px;"><-</td>
-		<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>

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/installer/release/TERATERM.INI	2021-10-23 16:09:19 UTC (rev 9496)
@@ -178,8 +178,6 @@
 
 ;	Russian code set used in host
 RussHost=Windows
-;	Russian code set used in PC
-RussClient=Windows
 
 ;	Window title
 Title=Tera Term

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/teraterm/common/tttypes.h	2021-10-23 16:09:19 UTC (rev 9496)
@@ -426,7 +426,7 @@
 	WORD KanjiIn;
 	WORD KanjiOut;
 	WORD RussHost;
-	WORD RussClient;
+	WORD reserve_RussClient;
 	WORD RussPrint;
 	WORD AutoWinSwitch;
 	WORD TerminalID;

Modified: trunk/teraterm/teraterm/coding_pp.cpp
===================================================================
--- trunk/teraterm/teraterm/coding_pp.cpp	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/teraterm/teraterm/coding_pp.cpp	2021-10-23 16:09:19 UTC (rev 9496)
@@ -167,7 +167,6 @@
 					ts->KanjiIn = 0;
 					ts->KanjiOut = 0;
 					ts->RussHost = 0;
-					ts->RussClient = 0;
 					ts->RussFont = 0;
 
 					// \x8E\xF3\x90M\x83R\x81[\x83h

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/teraterm/teraterm/vtterm.c	2021-10-23 16:09:19 UTC (rev 9496)
@@ -6282,12 +6282,7 @@
 // returns if b is processed
 {
 	if (b>=128) {
-#if !UNICODE_INTERNAL_BUFF
-		b = RussConv(ts.RussHost,ts.RussClient,b);
 		PutChar(b);
-#else
-		PutChar(b);
-#endif
 		return TRUE;
 	}
 	return FALSE;

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2021-10-23 16:09:19 UTC (rev 9496)
@@ -290,7 +290,6 @@
 			}
 			else if (ts->Language==IdRussian) {
 				SetDropDownList(Dialog,IDC_TERMRUSSHOST,RussList,ts->RussHost);
-				SetDropDownList(Dialog,IDC_TERMRUSSCLIENT,RussList,ts->RussClient);
 				SetDropDownList(Dialog,IDC_TERMRUSSFONT,RussList,ts->RussFont);
 #if UNICODE_INTERNAL_BUFF
 				EnableWindow(GetDlgItem(Dialog, IDC_TERMRUSSCLIENT),FALSE);
@@ -385,9 +384,6 @@
 							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSHOST)) > 0) {
 								ts->RussHost = w;
 							}
-							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSCLIENT)) > 0) {
-								ts->RussClient = w;
-							}
 							if ((w = (WORD)GetCurSel(Dialog, IDC_TERMRUSSFONT)) > 0) {
 								ts->RussFont = w;
 							}

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2021-10-23 16:09:05 UTC (rev 9495)
+++ trunk/teraterm/ttpset/ttset.c	2021-10-23 16:09:19 UTC (rev 9496)
@@ -964,11 +964,6 @@
 	                        Temp, sizeof(Temp), FName);
 	ts->RussHost = str2id(RussList, Temp, IdKOI8);
 
-	/* Russian character set (client) */
-	GetPrivateProfileString(Section, "RussClient", "",
-	                        Temp, sizeof(Temp), FName);
-	ts->RussClient = str2id(RussList, Temp, IdWindows);
-
 	/* Title String */
 	GetPrivateProfileString(Section, "Title", "Tera Term",
 	                        ts->Title, sizeof(ts->Title), FName);
@@ -2538,10 +2533,6 @@
 	id2str(RussList, ts->RussHost, IdKOI8, Temp, sizeof(Temp));
 	WritePrivateProfileString(Section, "RussHost", Temp, FName);
 
-	/* Russian character set (client)  */
-	id2str(RussList, ts->RussClient, IdWindows, Temp, sizeof(Temp));
-	WritePrivateProfileString(Section, "RussClient", Temp, FName);
-
 	/* Title text */
 	WritePrivateProfileString(Section, "Title", ts->Title, FName);
 


ttssh2-commit メーリングリストの案内
Back to archive index