[Ttssh2-commit] [3774] TitleReportSequence で受け付ける値を、accept /ignore/ empty に変更した。 [ttssh2-devel 1623]

svnno****@sourc***** svnno****@sourc*****
2010年 2月 9日 (火) 00:26:07 JST


Revision: 3774
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3774
Author:   doda
Date:     2010-02-09 00:26:07 +0900 (Tue, 09 Feb 2010)

Log Message:
-----------
TitleReportSequence で受け付ける値を、accept/ignore/empty に変更した。[ttssh2-devel 1623]

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-win.html
    trunk/doc/en/html/setup/teraterm.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/setup/teraterm-win.html
    trunk/doc/ja/html/setup/teraterm.html
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/doc/en/html/about/history.html	2010-02-08 15:26:07 UTC (rev 3774)
@@ -47,8 +47,8 @@
       <li>added the <a href="../setup/teraterm-win.html#CursorCtrlSequence">CursorCtrlSequence</a> entry on the Additional Settings dialog.</li>
       <!--li>ƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹/ƒAƒCƒRƒ“ƒ‰ƒxƒ‹•ñ§ŒäƒV[ƒPƒ“ƒX‚ɑ΂µ‚āA‹ó•¶Žš—ñ‚ð‰ž“šo—ˆ‚é‚悤‚É‚µ‚½B
         <ul>
-          <li>teraterm.ini ‚Ì <a href="../setup/teraterm-win.html#TitleReportSequence">TitleReportSequence</a> ƒGƒ“ƒgƒŠ‚Å empty ‚ðŽó‚¯•t‚¯‚é‚悤‚É‚µ‚½B</li>
-          <li>teraterm.ini ‚Ì TitleReportSequence ‚̃fƒtƒHƒ‹ƒg‚ð empty ‚ɕύX‚µ‚½B</li>
+          <li>teraterm.ini ‚Ì <a href="../setup/teraterm-win.html#TitleReportSequence">TitleReportSequence</a> ƒGƒ“ƒgƒŠ‚Ŏ󂯕t‚¯‚é’l‚ð accept, ignore, empty ‚ɕύX‚µ‚½B</li>
+          <li>changed the default value of "TitleReportSequence" to "empty".</li>
         </ul></li-->
       <li>added support for alternate screen buffer.
         <ul>

Modified: trunk/doc/en/html/setup/teraterm-win.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-win.html	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/doc/en/html/setup/teraterm-win.html	2010-02-08 15:26:07 UTC (rev 3774)
@@ -584,22 +584,42 @@
 </pre>
 
 
-<h1><a name="TitleReportSequence">Enable control sequence for window title reporting</a></h1>
+<h1><a name="TitleReportSequence">Change the response to window title reporting request</a></h1>
+<!--p>
+dtterm ‚̃EƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚¨‚æ‚уAƒCƒRƒ“ƒ‰ƒxƒ‹•ñ—v‹‚ɑ΂µ‚āA‚ǂ̂悤‚ɉž“š‚·‚é‚©‚ð•ÏX‚Å‚«‚Ü‚·B
+</p-->
+
 <p>
-This function enables the ddterm control sequence regarding the window title and icon label reporting.
+To ignore a window title reporting request, edit the TitleReportSequence line in the [Tera Term] section of the setup file like the following:
+<!--•ñ—v‹‚ɑ΂µ‚ĉ½‚à‰ž“š‚µ‚È‚¢‚悤‚É‚·‚é‚ɂ́AÝ’èƒtƒ@ƒCƒ‹‚Ì [Tera Term] ƒZƒNƒVƒ‡ƒ“‚Ì TitleReportSequence s‚ðˆÈ‰º‚̂悤‚ɕύX‚µ‚Ä‚­‚¾‚³‚¢B-->
 </p>
 
+<pre>
+TitleReportSequence=ignore
+</pre>
+
 <p>
-If you do not want report title informations to be sent to remote host by some reason such as security, please change the TitleReportSequence entry in the teraterm.ini file as follows:
+Also, Tera Term reports empty string in the following configuration.
+<!-- ‚Ü‚½ˆÈ‰º‚̂悤‚É‚·‚é‚ƁAƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚͋󂾂ƕñ‚·‚é‚悤‚É‚È‚è‚Ü‚·B -->
 </p>
 
 <pre>
-TitleReportSequence=off
+TitleReportSequence=empty
 </pre>
 
+<!--p>
+ˆÈ‰º‚̂悤‚É‚·‚é‚ƁAŒ»Ý‚̃EƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚ð•ñ‚·‚é‚悤‚É‚È‚è‚Ü‚·B<br>
+‚½‚¾‚µAŒ»Ý‚ÌŒ»Ý‚̃EƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚ð•ñ‚·‚é‚̂̓ZƒLƒ…ƒŠƒeƒBãŠëŒ¯‚Å‚·‚̂ŁA–{“–‚É•K—v‚ÈŽž‚Ì‚Ý‚±‚̐ݒè‚ðs‚¤‚悤‚É‚µ
+‚Ä‚­‚¾‚³‚¢B
+</p>
+
 <pre>
+TitleReportSequence=accept
+</pre-->
+
+<pre>
 Default:
-TitleReportSequence=on
+TitleReportSequence=empty
 </pre>
 
 

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/doc/en/html/setup/teraterm.html	2010-02-08 15:26:07 UTC (rev 3774)
@@ -67,7 +67,7 @@
  <li><a href="teraterm-win.html#WindowIcon">Change the window icon</a></li>
  <li><a href="teraterm-win.html#WindowCtrlSequence">Enable the control sequence for the window operation</a></li>
  <li><a href="teraterm-win.html#WindowReportSequence">Enable the control sequence for the window information reporting</a></li>
- <li><a href="teraterm-win.html#TitleReportSequence">Enable the control sequence for the window title reporting</a></li>
+ <li><a href="teraterm-win.html#TitleReportSequence">Change the response to window title reporting request</a></li>
  <li><a href="teraterm-win.html#CursorCtrlSequence">Enable the control sequence for the cursor shape</a></li>
 </ul>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/doc/ja/html/about/history.html	2010-02-08 15:26:07 UTC (rev 3774)
@@ -47,7 +47,7 @@
       <li>Additional Settings ƒ_ƒCƒAƒƒO‚É <a href="../setup/teraterm-win.html#CursorCtrlSequence">CursorCtrlSequence</a> ‚ð’ljÁ‚µ‚½B</li>
       <li>ƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹/ƒAƒCƒRƒ“ƒ‰ƒxƒ‹•ñ§ŒäƒV[ƒPƒ“ƒX‚ɑ΂µ‚āA‹ó•¶Žš—ñ‚ð‰ž“šo—ˆ‚é‚悤‚É‚µ‚½B
         <ul>
-          <li>teraterm.ini ‚Ì <a href="../setup/teraterm-win.html#TitleReportSequence">TitleReportSequence</a> ƒGƒ“ƒgƒŠ‚Å empty ‚ðŽó‚¯•t‚¯‚é‚悤‚É‚µ‚½B</li>
+          <li>teraterm.ini ‚Ì <a href="../setup/teraterm-win.html#TitleReportSequence">TitleReportSequence</a> ƒGƒ“ƒgƒŠ‚Ŏ󂯕t‚¯‚é’l‚ð accept, ignore, empty ‚ɕύX‚µ‚½B</li>
           <li>teraterm.ini ‚Ì TitleReportSequence ‚̃fƒtƒHƒ‹ƒg‚ð empty ‚ɕύX‚µ‚½B</li>
         </ul></li>
       <li>‘ã‘Ö‰æ–ʃoƒbƒtƒ@‚ɑΉž‚µ‚½B

Modified: trunk/doc/ja/html/setup/teraterm-win.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-win.html	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/doc/ja/html/setup/teraterm-win.html	2010-02-08 15:26:07 UTC (rev 3774)
@@ -601,28 +601,37 @@
 </pre>
 
 
-<h1><a name="TitleReportSequence">ƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹•ñ‚̐§ŒäƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></h1>
+<h1><a name="TitleReportSequence">ƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹•ñ—v‹‚ւ̉ž“š•û–@‚ð•ÏX‚·‚é</a></h1>
 <p>
-‚±‚̐ݒ肪 on ‚É‚È‚Á‚Ä‚¢‚é‚ƁAdtterm‚̃EƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹•ñ‚¨‚æ‚уAƒCƒRƒ“ƒ‰ƒxƒ‹•ñ‚̐§ŒäƒV[ƒPƒ“ƒX‚ª—LŒø‚É‚È‚è‚Ü‚·B
+dtterm ‚̃EƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚¨‚æ‚уAƒCƒRƒ“ƒ‰ƒxƒ‹•ñ—v‹‚ɑ΂µ‚āA‚ǂ̂悤‚ɉž“š‚·‚é‚©‚ð•ÏX‚Å‚«‚Ü‚·B
 </p>
 
 <p>
-ƒZƒLƒ…ƒŠƒeƒBã‚Ì——R“™‚ŃEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚ð•ñ‚µ‚½‚­‚È‚¢ê‡‚́AÝ’èƒtƒ@ƒCƒ‹‚Ì [Tera Term] ƒZƒNƒVƒ‡ƒ“‚Ì TitleReportSequence s‚ðˆÈ‰º‚̂悤‚ɕύX‚µ‚Ä‚­‚¾‚³‚¢B
+•ñ—v‹‚ɑ΂µ‚ĉ½‚à‰ž“š‚µ‚È‚¢‚悤‚É‚·‚é‚ɂ́AÝ’èƒtƒ@ƒCƒ‹‚Ì [Tera Term] ƒZƒNƒVƒ‡ƒ“‚Ì TitleReportSequence s‚ðˆÈ‰º‚̂悤‚ɕύX‚µ‚Ä‚­‚¾‚³‚¢B
 </p>
 
 <pre>
-TitleReportSequence=off
+TitleReportSequence=ignore
 </pre>
 
 <p>
-‚Ü‚½AˆÈ‰º‚̂悤‚É‚·‚é‚ƁAí‚ɃEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚͋󂾂ƕñ‚·‚é‚悤‚É‚È‚è‚Ü‚·B
+‚Ü‚½ˆÈ‰º‚̂悤‚É‚·‚é‚ƁAƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚͋󂾂ƕñ‚·‚é‚悤‚É‚È‚è‚Ü‚·B
 </p>
 
 <pre>
 TitleReportSequence=empty
 </pre>
 
+<p>
+ˆÈ‰º‚̂悤‚É‚·‚é‚ƁAŒ»Ý‚̃EƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚ð•ñ‚·‚é‚悤‚É‚È‚è‚Ü‚·B<br>
+‚½‚¾‚µAŒ»Ý‚ÌŒ»Ý‚̃EƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹‚ð•ñ‚·‚é‚̂̓ZƒLƒ…ƒŠƒeƒBãŠëŒ¯‚Å‚·‚̂ŁA–{“–‚É•K—v‚ÈŽž‚Ì‚Ý‚±‚̐ݒè‚ðs‚¤‚悤‚É‚µ‚Ä‚­‚¾‚³‚¢B
+</p>
+
 <pre>
+TitleReportSequence=accept
+</pre>
+
+<pre>
 È—ªŽž:
 TitleReportSequence=empty
 </pre>

Modified: trunk/doc/ja/html/setup/teraterm.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm.html	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/doc/ja/html/setup/teraterm.html	2010-02-08 15:26:07 UTC (rev 3774)
@@ -69,7 +69,7 @@
  <li><a href="teraterm-win.html#WindowIcon">ƒEƒBƒ“ƒhƒEƒAƒCƒRƒ“‚ð•ÏX‚·‚é</a></li>
  <li><a href="teraterm-win.html#WindowCtrlSequence">ƒEƒBƒ“ƒhƒE‘€ì‚̐§ŒäƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li>
  <li><a href="teraterm-win.html#WindowReportSequence">ƒEƒBƒ“ƒhƒEî•ñ•ñ‚̐§ŒäƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li>
- <li><a href="teraterm-win.html#TitleReportSequence">ƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹•ñ‚̐§ŒäƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li>
+ <li><a href="teraterm-win.html#TitleReportSequence">ƒEƒBƒ“ƒhƒEƒ^ƒCƒgƒ‹•ñ—v‹‚ւ̉ž“š•û–@‚ð•ÏX‚·‚é</a></li>
  <li><a href="teraterm-win.html#CursorCtrlSequence">ƒJ[ƒ\ƒ‹Œ`ó‚𐧌䂷‚éƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li>
 </ul>
 

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/installer/release/TERATERM.INI	2010-02-08 15:26:07 UTC (rev 3774)
@@ -499,7 +499,7 @@
 ; format ID: 61(111101) <host:tcpport/port:baud> - <title> VT/TEK
 TitleFormat=61
 
-; Allow the sequences related to title report (on/off/empty)
+; Allow the sequences related to title report (accept/ignore/empty)
 TitleReportSequence=empty
 
 ; Translate mouse wheel to cursor key when application cursor mode

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/teraterm/common/tttypes.h	2010-02-08 15:26:07 UTC (rev 3774)
@@ -223,8 +223,8 @@
 #define WF_TITLEREPORT   24 // (8 | 16)
 
 // Title Reporting Type
-#define IdTitleReportOff    0
-#define IdTitleReportOn     8
+#define IdTitleReportIgnore 0
+#define IdTitleReportAccept 8
 #define IdTitleReportEmpty  24
 
 // iconf flags (used in ts.VTIcon and ts.TEKIcon)

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/teraterm/teraterm/vtterm.c	2010-02-08 15:26:07 UTC (rev 3774)
@@ -1897,10 +1897,10 @@
 	break;
       case 20: // Report icon label
         switch (ts.WindowFlag & WF_TITLEREPORT) {
-	  case IdTitleReportOff:
+	  case IdTitleReportIgnore:
 	    // nothing to do
 	    break;
-	  case IdTitleReportOn:
+	  case IdTitleReportAccept:
 	    switch (ts.AcceptTitleChangeRequest) {
 	      case IdTitleChangeRequestOff:
 	        len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "L%s", CLocale, ts.Title);
@@ -1928,10 +1928,10 @@
         break;
       case 21: // Report window title
         switch (ts.WindowFlag & WF_TITLEREPORT) {
-	  case IdTitleReportOff:
+	  case IdTitleReportIgnore:
 	    // nothing to do
 	    break;
-	  case IdTitleReportOn:
+	  case IdTitleReportAccept:
 	    switch (ts.AcceptTitleChangeRequest) {
 	      case IdTitleChangeRequestOff:
 	        len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "l%s", CLocale, ts.Title);

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2010-02-08 14:06:56 UTC (rev 3773)
+++ trunk/teraterm/ttpset/ttset.c	2010-02-08 15:26:07 UTC (rev 3774)
@@ -1324,9 +1324,9 @@
 
 	// Title report sequence
 	GetPrivateProfileString(Section, "TitleReportSequence", "Empty", Temp, sizeof(Temp), FName);
-	if (_stricmp(Temp, "on") == 0)
-		ts->WindowFlag |= IdTitleReportOn;
-	else if (_stricmp(Temp, "off") == 0)
+	if (_stricmp(Temp, "accept") == 0)
+		ts->WindowFlag |= IdTitleReportAccept;
+	else if (_stricmp(Temp, "ignore") == 0 || _stricmp(Temp, "off") == 0)
 		ts->WindowFlag &= ~WF_TITLEREPORT;
 	else // empty
 		ts->WindowFlag |= IdTitleReportEmpty;
@@ -2319,11 +2319,11 @@
 
 	// Title report sequence
 	switch (ts->WindowFlag & WF_TITLEREPORT) {
-	case IdTitleReportOff:
-		WritePrivateProfileString(Section, "TitleReportSequence", "off", FName);
+	case IdTitleReportIgnore:
+		WritePrivateProfileString(Section, "TitleReportSequence", "ignore", FName);
 		break;
-	case IdTitleReportOn:
-		WritePrivateProfileString(Section, "TitleReportSequence", "on", FName);
+	case IdTitleReportAccept:
+		WritePrivateProfileString(Section, "TitleReportSequence", "accept", FName);
 		break;
 	default: // IdTitleReportEmpty
 		WritePrivateProfileString(Section, "TitleReportSequence", "empty", FName);



Ttssh2-commit メーリングリストの案内