[Ttssh2-commit] [4253] 言語モードが日本語以外の時に、端末の設定ダイアログで端末IDに VT420 , VT520, VT525 を指定しても実際には VT100 に設定されるのを修正。

アーカイブの一覧に戻る

svnno****@sourc***** svnno****@sourc*****
2010年 12月 23日 (木) 14:36:03 JST


Revision: 4253
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4253
Author:   doda
Date:     2010-12-23 14:36:03 +0900 (Thu, 23 Dec 2010)

Log Message:
-----------
言語モードが日本語以外の時に、端末の設定ダイアログで端末IDに VT420, VT520, VT525 を指定しても実際には VT100 に設定されるのを修正。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/ttpdlg/ttdlg.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-23 03:18:55 UTC (rev 4252)
+++ trunk/doc/en/html/about/history.html	2010-12-23 05:36:03 UTC (rev 4253)
@@ -52,7 +52,8 @@
   <!-- li>Bug fixes
     <ul>
       <li>’[––‚̉¡•‚ª 257 Œ…‚æ‚è‘å‚«‚¢‚Ɛ³í‚É•\Ž¦‚Å‚«‚È‚¢–â‘è‚ðC³‚µ‚½B</li>
-      <li>’[––ID‚ÉVT520,VT525‚ðÝ’肵‚Ä‚¢‚é‚ƁAPrimary DA (DA1) ‚ւ̉ž“š‚ª‰ó‚ê‚Ä‚¢‚½‚Ì‚ðC³‚µ‚½B</li>
+      <li>’[––ID‚ÉVT520,VT525‚ðÝ’肵‚Ä‚¢‚é‚ƁAPrimary DA (DA1) ‚ւ̉ž“š‚ª‰ó‚ê‚Ä‚¢‚½–â‘è‚ðC³‚µ‚½B</li>
+      <li>Œ¾Œêƒ‚[ƒh‚ª“ú–{ŒêˆÈŠO‚ÌŽžA<a href="../menu/setup-terminal.html">Terminal Setup</a> ƒ_ƒCƒAƒƒO‚Å’[––ID‚É VT420, VT520, VT525 ‚ðŽw’肵‚Ä‚àŽÀÛ‚É‚Í VT100 ‚ɐݒ肳‚ê‚é–â‘è‚ðC³‚µ‚½B</li>
     </ul>
   </li -->
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-23 03:18:55 UTC (rev 4252)
+++ trunk/doc/ja/html/about/history.html	2010-12-23 05:36:03 UTC (rev 4253)
@@ -52,7 +52,8 @@
   <li>ƒoƒOC³
     <ul>
       <li>’[––‚̉¡•‚ª 257 Œ…‚æ‚è‘å‚«‚¢‚Ɛ³í‚É•\Ž¦‚Å‚«‚È‚¢–â‘è‚ðC³‚µ‚½B</li>
-      <li>’[––ID‚ÉVT520,VT525‚ðÝ’肵‚Ä‚¢‚é‚ƁAPrimary DA (DA1) ‚ւ̉ž“š‚ª‰ó‚ê‚Ä‚¢‚½‚Ì‚ðC³‚µ‚½B</li>
+      <li>’[––ID‚ÉVT520,VT525‚ðÝ’肵‚Ä‚¢‚é‚ƁAPrimary DA (DA1) ‚ւ̉ž“š‚ª‰ó‚ê‚Ä‚¢‚½–â‘è‚ðC³‚µ‚½B</li>
+      <li>Œ¾Œêƒ‚[ƒh‚ª“ú–{ŒêˆÈŠO‚ÌŽžA<a href="../menu/setup-terminal.html">Terminal Setup</a> ƒ_ƒCƒAƒƒO‚Å’[––ID‚É VT420, VT520, VT525 ‚ðŽw’肵‚Ä‚àŽÀÛ‚É‚Í VT100 ‚ɐݒ肳‚ê‚é–â‘è‚ðC³‚µ‚½B</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2010-12-23 03:18:55 UTC (rev 4252)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2010-12-23 05:36:03 UTC (rev 4253)
@@ -48,12 +48,15 @@
 static PCHAR far NLListRcv[] = {"CR","CR+LF", "LF", NULL};
 static PCHAR far NLList[] = {"CR","CR+LF", NULL};
 static PCHAR far TermList[] =
-	{"VT100","VT101","VT102","VT282","VT320","VT382","VT420","VT520","VT525",NULL};
-static WORD TermJ_Term[] = {1,1,2,3,3,4,4,5,6};
-static WORD Term_TermJ[] = {1,3,4,7,8,9};
+	{"VT100", "VT101", "VT102", "VT282", "VT320", "VT382",
+	 "VT420", "VT520", "VT525", NULL};
+static WORD Term_TermJ[] =
+	{IdVT100, IdVT101, IdVT102, IdVT282, IdVT320, IdVT382,
+	 IdVT420, IdVT520, IdVT525};
+static WORD TermJ_Term[] = {1, 1, 2, 3, 3, 4, 4, 5, 6, 7, 8, 9};
 static PCHAR far TermListJ[] =
-	{"VT100","VT100J","VT101","VT102","VT102J","VT220J",
-	 "VT282","VT320","VT382","VT420","VT520","VT525",NULL};
+	{"VT100", "VT100J", "VT101", "VT102", "VT102J", "VT220J", "VT282",
+	 "VT320", "VT382", "VT420", "VT520", "VT525", NULL};
 static PCHAR far KanjiList[] = {"SJIS","EUC","JIS", "UTF-8", "UTF-8m", NULL};
 static PCHAR far KanjiListSend[] = {"SJIS","EUC","JIS", "UTF-8", NULL};
 static PCHAR far KanjiInList[] = {"^[$@","^[$B",NULL};
@@ -263,7 +266,7 @@
 
 			if ( ts->Language!=IdJapanese ) { /* non-Japanese mode */
 				if ((ts->TerminalID>=1) &&
-					(ts->TerminalID<=9)) {
+					(ts->TerminalID <= sizeof(TermJ_Term)/sizeof(WORD))) {
 					w = TermJ_Term[ts->TerminalID-1];
 				}
 				else {
@@ -372,7 +375,7 @@
 
 						w = (WORD)GetCurSel(Dialog, IDC_TERMID);
 						if ( ts->Language!=IdJapanese ) { /* non-Japanese mode */
-							if ((w==0) || (w>6)) w = 1;
+							if ((w==0) || (w > sizeof(Term_TermJ)/sizeof(WORD))) w = 1;
 							w = Term_TermJ[w-1];
 						}
 						ts->TerminalID = w;



Ttssh2-commit メーリングリストの案内
アーカイブの一覧に戻る