From svnnotify ＠ sourceforge.jp  Sat Dec  4 19:58:40 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 04 Dec 2010 19:58:40 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDBdICDjgrXjg7Pjg5fjg6vjgrPjg7w=?=
 =?utf-8?b?44OJ44Gu6L+95Yqg44CC?=
Message-ID: <1291460320.136181.10959.nullmailer@users.sourceforge.jp>

Revision: 4200
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4200
Author:   yutakapon
Date:     2010-12-04 19:58:40 +0900 (Sat, 04 Dec 2010)

Log Message:
-----------
?泣?????潟????菴遵???cf.
http://logmett.com/forum/viewtopic.php?f=3&t=1521

Modified Paths:
--------------
    trunk/doc/en/html/macro/command/dispstr.html
    trunk/doc/ja/html/macro/command/dispstr.html


-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/dispstr.html
===================================================================
--- trunk/doc/en/html/macro/command/dispstr.html	2010-11-30 13:19:27 UTC (rev 4199)
+++ trunk/doc/en/html/macro/command/dispstr.html	2010-12-04 10:58:40 UTC (rev 4200)
@@ -49,6 +49,22 @@
 dispstr #$1B"[3;100;200t"
 </pre>
 
+<pre class="macro-example">
+; Change terminal size to 80x24
+dispstr #$1b"[8;24;80t"
+ 
+; demo
+for y 24 30
+  x = 80
+  while x < 100
+    sprintf #$1b"[8;%d;%dt" y x
+    dispstr inputstr
+    x = x + 5
+    pause 1
+  endwhile
+next 
+</pre>
+
 <h2>Note</h2>
 
 <p>

Modified: trunk/doc/ja/html/macro/command/dispstr.html
===================================================================
--- trunk/doc/ja/html/macro/command/dispstr.html	2010-11-30 13:19:27 UTC (rev 4199)
+++ trunk/doc/ja/html/macro/command/dispstr.html	2010-12-04 10:58:40 UTC (rev 4200)
@@ -48,6 +48,22 @@
 dispstr #$1B"[3;100;200t"
 </pre>
 
+<pre class="macro-example">
+; Change terminal size to 80x24
+dispstr #$1b"[8;24;80t"
+ 
+; demo
+for y 24 30
+  x = 80
+  while x < 100
+    sprintf #$1b"[8;%d;%dt" y x
+    dispstr inputstr
+    x = x + 5
+    pause 1
+  endwhile
+next 
+</pre>
+
 <h2>??</h2>
 
 <p>

From svnnotify ＠ sourceforge.jp  Sat Dec  4 20:41:06 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 04 Dec 2010 20:41:06 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDFdICDoi7HoqLPjgpLov73liqDjgII=?=
Message-ID: <1291462866.313900.14318.nullmailer@users.sourceforge.jp>

Revision: 4201
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4201
Author:   yutakapon
Date:     2010-12-04 20:41:06 +0900 (Sat, 04 Dec 2010)

Log Message:
-----------
?沿┳??申???

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/resize.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-04 10:58:40 UTC (rev 4200)
+++ trunk/doc/en/html/about/history.html	2010-12-04 11:41:06 UTC (rev 4201)
@@ -41,10 +41,10 @@
         </ul></li>
       <li>added support for the DECERA (Erase Rectangular Area) control sequence.</li>
       <li>added support for the DA3 (Tertiary Device Attribute) control sequence.</li>
-      <!-- li>?? ID ????VT420, VT520, VT525 ??????
+      <li>added support for the VT420, VT520 and VT525 on the terminal ID settings.
         <ul>
-          <li>DECSCL(?????????)?????????VT???5(vt500????)??????</li>
-        </ul></li -->
+          <li>The DECSCL(terminal mode setting) control sequence can support the VT level 5(vt500 series).</li>
+        </ul></li>
       <li>A single character to indicate the window status can be shown on the "Window" menu and "Windows list" dialog. See below.
         <ul type="disc">
           <li>+ Normal window</li>
@@ -67,7 +67,7 @@
       <li><a href="../setup/teraterm-term.html#beep">Beep setting</a> does not work.</li>
       <li>The scroll region can not be cleared by using the DECALN (DEC Screen Alignment Test) control sequence.</li>
       <li>An empty string can not reply by using the window title and icon label reporting request.</li>
-      <!-- li>IO-8256 ???????A?????????????V?????????????????????C????</li -->
+      <li>The rectangle erasing, color changing and line drawing can not work well in the IO-8256 terminal.</li>
     </ul>
   </li>
 
@@ -2384,7 +2384,7 @@
 
 <h3><a name="ttproxy_1.0.0.17">2010.xx.xx (Ver 1.0.0.17)</a></h3>
 <ul class="history">
-      <!--li>Bug fix: ??????5????????????????????????B</li-->
+      <li>Bug fix: When the port number is specified by the five-figure numeric, the application fault would occur.</li>
 </ul>
 
 <h3><a name="ttproxy_1.0.0.16">2009.11.10 (Ver 1.0.0.16)</a></h3>

Modified: trunk/doc/en/html/menu/resize.html
===================================================================
--- trunk/doc/en/html/menu/resize.html	2010-12-04 10:58:40 UTC (rev 4200)
+++ trunk/doc/en/html/menu/resize.html	2010-12-04 11:41:06 UTC (rev 4201)
@@ -10,16 +10,15 @@
 
   <body>
     <h1>[Resize] menu</h1>
-    <!--p>
-      <a href="../usage/resizemenu.html">??</a>?????????????????ｦ?????<br>
-      ??????????????????VT ?????????????????
+    <p>
+      The <a href="../usage/resizemenu.html">registered window list</a> are shown on the menu bar.<br>
+      When the entry is selected, the Tera Term window is automatically resized.
     </p>
 
-    <h2 id="notes">?</h2>
+    <h2 id="notes">NOTICE</h2>
     <ul>
-      <li>TTXResizeMenu ???????????????????</li>
-      <li>???????????????????A[Resize] ??????ｦ?????????????<a href="../usage/resizemenu.html">?????????</a>??????????
-    </ul-->
+      <li>This feature can be only used by using the TTXResizeMenu plugin.</li>
+      <li>When no one menu entry is registered, the [Resize] menu can not be displayed. <a href="../usage/resizemenu.html">A user must register the menu entry.</a></ul>
 
   </body>
 </html>

From svnnotify ＠ sourceforge.jp  Sat Dec  4 20:58:02 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 04 Dec 2010 20:58:02 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDJdICDoi7HoqLPjgpLov73liqDjgII=?=
Message-ID: <1291463882.798629.6848.nullmailer@users.sourceforge.jp>

Revision: 4202
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4202
Author:   yutakapon
Date:     2010-12-04 20:58:02 +0900 (Sat, 04 Dec 2010)

Log Message:
-----------
?沿┳??申???

Modified Paths:
--------------
    trunk/doc/en/html/setup/lng.html


-------------- next part --------------
Modified: trunk/doc/en/html/setup/lng.html
===================================================================
--- trunk/doc/en/html/setup/lng.html	2010-12-04 11:41:06 UTC (rev 4201)
+++ trunk/doc/en/html/setup/lng.html	2010-12-04 11:58:02 UTC (rev 4202)
@@ -22,31 +22,30 @@
 And also, the installer will write the language file name into the UILanguageFile entry in the TERATERM.INI file.
 </p>
 
-<!--
-<h2>???????</h2>
+<h2>Font Settings</h2>
 
 <p>
-???????????????????????????? Default.lng ????????<br>
-??????????????????????????
+The installer copies the Default.lng file into the lang directory.<br>
+The font settings are as follows:
 </p>
 
 <pre>
-; ???????
+; A big font
 DLG_SYSTEM_FONT=System,12,0
-; ???t???
+; A small font
 DLG_TAHOMA_FONT=Tahoma,8,0
 </pre>
 
 <p>
-?????????????????
+Describe a font name in the first entry.
 </p>
 
 <p>
-??????????????????????
+Describe a font size in the second entry.
 </p>
 
 <p>
-????????????????????????????
+Describe a font character set in the third entry.
 <pre>
 0   ANSI
 1   Default charset
@@ -68,9 +67,10 @@
 238 Central European
 255 OEM/DOS
 </pre>
-????msdn ?????? <a href="http://msdn.microsoft.com/en-us/library/bb773327(VS.85).aspx">LOGFONT ???</a>? lfCharset ????????????B
-</p>-->
 
+Refer to the lfCharSet member of the <a href="http://msdn.microsoft.com/en-us/library/bb773327(VS.85).aspx">LOGFONT Structure</a> for complete information.
+</p>
 
+
 </BODY>
 </HTML>

From svnnotify ＠ sourceforge.jp  Sun Dec  5 00:46:51 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 05 Dec 2010 00:46:51 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDNdICDoi7HoqLPjgpLov73liqDjgII=?=
Message-ID: <1291477611.429550.18681.nullmailer@users.sourceforge.jp>

Revision: 4203
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4203
Author:   yutakapon
Date:     2010-12-05 00:46:51 +0900 (Sun, 05 Dec 2010)

Log Message:
-----------
?沿┳??申???

Modified Paths:
--------------
    trunk/doc/en/html/usage/resizemenu.html


-------------- next part --------------
Modified: trunk/doc/en/html/usage/resizemenu.html
===================================================================
--- trunk/doc/en/html/usage/resizemenu.html	2010-12-04 11:58:02 UTC (rev 4202)
+++ trunk/doc/en/html/usage/resizemenu.html	2010-12-04 15:46:51 UTC (rev 4203)
@@ -11,25 +11,26 @@
 
 <h1>Window resize plugin</h1>
 
-<!--p>Tera Term ?????? <a href="../menu/resize.html">[Resize] ????</a>??????</p>
+<p><a href="../menu/resize.html">[Resize] menu</a> on Tera Term top menu bar</p>
 
-<h2>??</h2>
+<h2>Feature</h2>
 
 <p>
-TTXResizeMenu ???????????Tera Term ?????? [Resize] ???????????????B<br>
-[Resize] ?????????????????????? Tera Term ? VT ?????????????????
+A user can add the [Resize] menu on the top menu bar by using the TTXResizeMenu plugin.<br>
+When the [Resize] menu entry is selected, Tera Term window is automatically resized by the specified size.
 </p>
 
 
-<h2>????</h2>
+<h2>Usage</h2>
 
 <p>
-????????????? [Resize] ??????ｦ??????<br>
-??????????????????????????<br><br>
+Basically, the [Resize] menu does not display after the plugin is installed.<br>
+Next, a user must register the menu entry in the teraterm.ini file.
+<br><br>
 
-?????????????????ATERATERM.INI ? [Resize Menu] ??????????"ResizeMenuN = X, Y" ??ｮ?????????N  ? 1 ????????<br>
-X ??? Y ?????? 0 ???????????????????? 0, 37 ???????????????37 ????????<br>
-???????????? 20 ???
+Add a [Resize Menu] section in the teraterm.ini file, and describe the "ResizeMenuN = X, Y" entry. N is an 1-origin number.<br>
+When X or Y equals zero, the value is not changed. For example, (X, Y)=(0, 37) means that the width is not changed and the height is changed into 37 lines.<br>
+These value maximum is 20.
 </p>
 
 <h2>Example</h2>
@@ -42,18 +43,18 @@
 ; normal VT size
 ResizeMenu2 =  80, 24
 ;
-; ????????????2?????
+; Width is not changed, Height is changed to 52 lines.
 ResizeMenu3 =   0, 52
 ;
-; ????X???????132?????(VT?132????(DECCOLM)??)
+; Height is not changed, Width is changed to 132 columns(DECCOLM equivalence).
 ResizeMenu4 = 132,  0
 </pre>
 
 <h2>ToDo</h2>
 
 <ul>
-  <li>?????????????????????????????</li>
-</ul-->
+  <li>The Resize menu value can be changed by the dialog box.</li>
+</ul>
 
 </body>
 </html>

From svnnotify ＠ sourceforge.jp  Tue Dec  7 14:16:13 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 07 Dec 2010 14:16:13 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDRdICDjg5Djg7zjgrjjg6fjg7Pmm7Q=?=
 =?utf-8?b?5paw?=
Message-ID: <1291698973.203539.18869.nullmailer@users.sourceforge.jp>

Revision: 4204
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4204
Author:   maya
Date:     2010-12-07 14:16:13 +0900 (Tue, 07 Dec 2010)

Log Message:
-----------
????吾??恰???
Modified Paths:
--------------
    trunk/TTProxy/TTProxy.rc
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/installer/teraterm.iss
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/ttpmacro/ttpmacro.rc
    trunk/ttssh2/ttxssh/ttxssh.rc


-------------- next part --------------
Modified: trunk/TTProxy/TTProxy.rc
===================================================================
--- trunk/TTProxy/TTProxy.rc	2010-12-04 15:46:51 UTC (rev 4203)
+++ trunk/TTProxy/TTProxy.rc	2010-12-07 05:16:13 UTC (rev 4204)
@@ -28,7 +28,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// ??? resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
 #ifdef _WIN32
@@ -82,8 +82,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,16
- PRODUCTVERSION 1,0,0,16
+ FILEVERSION 1,0,0,17
+ PRODUCTVERSION 1,0,0,17
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -101,12 +101,12 @@
             VALUE "Comments", "???????????????????????"
             VALUE "CompanyName", "TeraTerm Project, ?????"
             VALUE "FileDescription", "?????????"
-            VALUE "FileVersion", "1, 0, 0, 16"
+            VALUE "FileVersion", "1, 0, 0, 17"
             VALUE "InternalName", "TTProxy"
             VALUE "LegalCopyright", "(C)TeraTerm Project 2006-2009, Copyright (C) 2003-2006 ?????"
             VALUE "OriginalFilename", "TTXProxy.dll"
             VALUE "ProductName", "???????????????
-            VALUE "ProductVersion", "1, 0, 0, 16"
+            VALUE "ProductVersion", "1, 0, 0, 17"
         END
     END
     BLOCK "VarFileInfo"
@@ -115,12 +115,12 @@
     END
 END
 
-#endif    // Japanese resources
+#endif    // ??? resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// ?? (??) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
@@ -134,8 +134,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,16
- PRODUCTVERSION 1,0,0,16
+ FILEVERSION 1,0,0,17
+ PRODUCTVERSION 1,0,0,17
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -153,12 +153,12 @@
             VALUE "Comments", "Plug-in that supports communication by way of proxy"
             VALUE "CompanyName", "TeraTerm Project, Yebisuya Hompo"
             VALUE "FileDescription", "Proxy plug-in"
-            VALUE "FileVersion", "1, 0, 0, 16"
+            VALUE "FileVersion", "1, 0, 0, 17"
             VALUE "InternalName", "TTProxy"
             VALUE "LegalCopyright", "(C)TeraTerm Project 2006-2009, Copyright (C) 2003-2006 Yebisuya Hompo"
             VALUE "OriginalFilename", "TTXProxy.dll"
             VALUE "ProductName", "Proxy plug-in collection of Yebisuya Hompo"
-            VALUE "ProductVersion", "1, 0, 0, 16"
+            VALUE "ProductVersion", "1, 0, 0, 17"
         END
     END
     BLOCK "VarFileInfo"
@@ -270,7 +270,7 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (U.S.) resources
+#endif    // ?? (??) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-04 15:46:51 UTC (rev 4203)
+++ trunk/doc/en/html/about/history.html	2010-12-07 05:16:13 UTC (rev 4204)
@@ -31,7 +31,7 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.68">2010.xx.xx (Ver 4.68 unreleased)</a></h3>
+<h3><a name="teraterm_4.68">2010.12.7 (Ver 4.68)</a></h3>
 <ul class="history">
   <li>Changes
     <ul>
@@ -54,9 +54,9 @@
         </ul></li>
       <li>Extended the maximum number of Tera Term window from 50 to 256.</li>
       <li>Extended the maximum number of Tera Term plugins from 16 to 32.</li>
+      <li>added an argument of the "<a href="../macro/command/beep.html">beep</a>" macro command.</li>
       <li>The WSAAsyncGetAddrInfo function can be hooked by using plugin.</li>
       <li>The freeaddrinfo function can be hooked by using plugin.</li>
-      <li>added an argument of the "<a href="../macro/command/beep.html">beep</a>" macro command.</li>
     </ul>
   </li>
 
@@ -1584,7 +1584,7 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
-<h3><a name="ttssh_2.55">2010.x.xx (Ver 2.55 unreleased)</a></h3>
+<h3><a name="ttssh_2.55">2010.12.7 (Ver 2.55)</a></h3>
 <ul class="history">
   <li>Changes
     <ul>
@@ -2361,8 +2361,9 @@
       <li>The initial version was released.</li>
 </ul>
 
+
 <h2><a name="cyglaunch">cyglaunch</a></h2>
-<h3><a name="cyglaunch_1.02">2010.xx.xx (Ver 1.02)</a></h3>
+<h3><a name="cyglaunch_1.02">2010.12.7 (Ver 1.02)</a></h3>
 <ul class="history">
       <li>Security fix: The current directory changes to the cyglaunch.exe existing directory, and launches the cygterm.exe program.</li>
 </ul>
@@ -2382,7 +2383,7 @@
 
       <!--li>Bug fix: The IPv6 address can not be specified at the proxy server.</li-->
 
-<h3><a name="ttproxy_1.0.0.17">2010.xx.xx (Ver 1.0.0.17)</a></h3>
+<h3><a name="ttproxy_1.0.0.17">2010.12.7 (Ver 1.0.0.17)</a></h3>
 <ul class="history">
       <li>Bug fix: When the port number is specified by the five-figure numeric, the application fault would occur.</li>
 </ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-04 15:46:51 UTC (rev 4203)
+++ trunk/doc/ja/html/about/history.html	2010-12-07 05:16:13 UTC (rev 4204)
@@ -31,7 +31,7 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.68">2010.xx.xx (Ver 4.68 unreleased)</a></h3>
+<h3><a name="teraterm_4.68">2010.12.7 (Ver 4.68)</a></h3>
 <ul class="history">
   <li>??
     <ul>
@@ -54,9 +54,9 @@
         </ul></li>
       <li>????????????? 50 ?? 256 ??????</li>
       <li>????????????? 16 ?? 32 ??????</li>
+      <li>??????? "<a href="../macro/command/beep.html">beep</a>" ?????????</li>
       <li>WSAAsyncGetAddrInfo ???????????????????B</li>
       <li>freeaddrinfo ???????????????????B</li>
-      <li>??????? "<a href="../macro/command/beep.html">beep</a>" ?????????</li>
     </ul>
   </li>
 
@@ -1586,7 +1586,7 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
-<h3><a name="ttssh_2.55">2010.x.xx (Ver 2.55 unreleased)</a></h3>
+<h3><a name="ttssh_2.55">2010.12.7 (Ver 2.55)</a></h3>
 <ul class="history">
   <li>??
     <ul>
@@ -2366,7 +2366,7 @@
 
 
 <h2><a name="cyglaunch">cyglaunch</a></h2>
-<h3><a name="cyglaunch_1.02">2010.xx.xx (Ver 1.02)</a></h3>
+<h3><a name="cyglaunch_1.02">2010.12.7 (Ver 1.02)</a></h3>
 <ul class="history">
       <li>???????? ??????????? cyglaunch.exe ???????????????? cygterm.exe ???????????</li>
 </ul>
@@ -2386,7 +2386,7 @@
 
       <!--li>???????? IPv6 ??????????????????B</li-->
 
-<h3><a name="ttproxy_1.0.0.17">2010.xx.xx (Ver 1.0.0.17)</a></h3>
+<h3><a name="ttproxy_1.0.0.17">2010.12.7 (Ver 1.0.0.17)</a></h3>
 <ul class="history">
       <li>??????5????????????????????????B</li>
 </ul>

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2010-12-04 15:46:51 UTC (rev 4203)
+++ trunk/installer/teraterm.iss	2010-12-07 05:16:13 UTC (rev 4204)
@@ -1,5 +1,5 @@
 #define AppName "Tera Term"
-#define AppVer "4.68-RC1"
+#define AppVer "4.68"
 ; #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [Setup]

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2010-12-04 15:46:51 UTC (rev 4203)
+++ trunk/teraterm/teraterm/ttermpro.rc	2010-12-07 05:16:13 UTC (rev 4204)
@@ -13,7 +13,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// ?? (??) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
@@ -370,8 +370,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,67,0,0
- PRODUCTVERSION 4,67,0,0
+ FILEVERSION 4,68,0,0
+ PRODUCTVERSION 4,68,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -388,12 +388,12 @@
         BEGIN
             VALUE "CompanyName", "TeraTerm Project T. Teranishi"
             VALUE "FileDescription", "Tera Term"
-            VALUE "FileVersion", "4, 67, 0, 0"
+            VALUE "FileVersion", "4, 68, 0, 0"
             VALUE "InternalName", "TTERMPRO"
             VALUE "LegalCopyright", "(C)TeraTerm Project 2004-2010, (C)T. Teranishi 1994-1998"
             VALUE "OriginalFilename", "TTERMPRO.EXE"
             VALUE "ProductName", "Tera Term"
-            VALUE "ProductVersion", "4, 67, 0, 0"
+            VALUE "ProductVersion", "4, 68, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
@@ -585,7 +585,7 @@
 //
 
 1                       RT_MANIFEST             "teraterm.manifest"
-#endif    // English (U.S.) resources
+#endif    // ?? (??) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

Modified: trunk/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.rc	2010-12-04 15:46:51 UTC (rev 4203)
+++ trunk/teraterm/ttpmacro/ttpmacro.rc	2010-12-07 05:16:13 UTC (rev 4204)
@@ -13,7 +13,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// ?? (??) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
@@ -104,8 +104,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,67,0,0
- PRODUCTVERSION 4,67,0,0
+ FILEVERSION 4,68,0,0
+ PRODUCTVERSION 4,68,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -122,12 +122,12 @@
         BEGIN
             VALUE "CompanyName", "T. Teranishi"
             VALUE "FileDescription", "TTPMACRO"
-            VALUE "FileVersion", "4, 67, 0, 0"
+            VALUE "FileVersion", "4, 68, 0, 0"
             VALUE "InternalName", "TTPMACRO"
             VALUE "LegalCopyright", "Copyright (C) TeraTerm Project 2004-2010, T. Teranishi 1994-1998"
             VALUE "OriginalFilename", "TTPMACRO.EXE"
             VALUE "ProductName", "TTPMACRO"
-            VALUE "ProductVersion", "4, 67, 0, 0"
+            VALUE "ProductVersion", "4, 68, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
@@ -145,7 +145,7 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_TTMACRO             ICON                    "ttmacro.ico"
-#endif    // English (U.S.) resources
+#endif    // ?? (??) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2010-12-04 15:46:51 UTC (rev 4203)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2010-12-07 05:16:13 UTC (rev 4204)
@@ -491,8 +491,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,54,0,0
- PRODUCTVERSION 2,54,0,0
+ FILEVERSION 2,55,0,0
+ PRODUCTVERSION 2,55,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -508,12 +508,12 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "TTXSSH"
-            VALUE "FileVersion", "2, 54, 0, 0"
+            VALUE "FileVersion", "2, 55, 0, 0"
             VALUE "InternalName", "TTXSSH"
             VALUE "LegalCopyright", "(C)2004-2010 TeraTerm Project, (C)1998-1999 Robert O'Callahan"
             VALUE "OriginalFilename", "TTXSSH.dll"
             VALUE "ProductName", "TTSSH"
-            VALUE "ProductVersion", "2, 54, 0, 0"
+            VALUE "ProductVersion", "2, 55, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

From svnnotify ＠ sourceforge.jp  Tue Dec  7 14:16:53 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 07 Dec 2010 14:16:53 +0900
Subject: [Ttssh2-commit] [4205] Release 4.68
Message-ID: <1291699013.422046.19150.nullmailer@users.sourceforge.jp>

Revision: 4205
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4205
Author:   maya
Date:     2010-12-07 14:16:53 +0900 (Tue, 07 Dec 2010)

Log Message:
-----------
Release 4.68

Added Paths:
-----------
    tags/teraterm-4_68/


-------------- next part --------------


From svnnotify ＠ sourceforge.jp  Tue Dec  7 14:59:14 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 07 Dec 2010 14:59:14 +0900
Subject: [Ttssh2-commit] [4206] code unfrozen
Message-ID: <1291701554.484925.13461.nullmailer@users.sourceforge.jp>

Revision: 4206
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4206
Author:   maya
Date:     2010-12-07 14:59:14 +0900 (Tue, 07 Dec 2010)

Log Message:
-----------
code unfrozen

Modified Paths:
--------------
    trunk/installer/teraterm.iss


-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2010-12-07 05:16:53 UTC (rev 4205)
+++ trunk/installer/teraterm.iss	2010-12-07 05:59:14 UTC (rev 4206)
@@ -1,6 +1,6 @@
 #define AppName "Tera Term"
 #define AppVer "4.68"
-; #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
 
 [Setup]
 AppCopyright=TeraTerm Project
@@ -705,5 +705,5 @@
 
 [InnoIDE_PreCompile]
 Name: makechm.bat
-Name: build.bat; Parameters: rebuild
-; Name: build.bat
+; Name: build.bat; Parameters: rebuild
+Name: build.bat

From svnnotify ＠ sourceforge.jp  Wed Dec  8 23:28:39 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 08 Dec 2010 23:28:39 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDddICDoi7HoqLPpgJTkuK0=?=
Message-ID: <1291818519.311356.10264.nullmailer@users.sourceforge.jp>

Revision: 4207
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4207
Author:   yutakapon
Date:     2010-12-08 23:28:39 +0900 (Wed, 08 Dec 2010)

Log Message:
-----------
?沿┳??賢

Modified Paths:
--------------
    trunk/doc/en/html/usage/tips/forwarding-files.html


-------------- next part --------------
Modified: trunk/doc/en/html/usage/tips/forwarding-files.html
===================================================================
--- trunk/doc/en/html/usage/tips/forwarding-files.html	2010-12-07 05:59:14 UTC (rev 4206)
+++ trunk/doc/en/html/usage/tips/forwarding-files.html	2010-12-08 14:28:39 UTC (rev 4207)
@@ -3,7 +3,7 @@
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-<TITLE>?????????????????????t?????</TITLE>
+<TITLE>Transfer the file via the intermediate server</TITLE>
 <META http-equiv="Content-Style-Type" content="text/css">
 <link rel="stylesheet" href="../../style.css" type="text/css">
 </HEAD>
@@ -15,32 +15,32 @@
 When a user logins to a remote host and continuously login to another host, a file transfer will be failure by using any method(Kermit, XMODEM, ZMODEM, B-PLUS and Quick-VAN).
 </p>
 
-<!--
-
 <p>
-Tera Term ?ﾒ??????????t?????????????????????(???[????????????????????????????/?????????ftp ??????)?????????????
+It is recommended to directly transfer the file to the intermediate server.
 </p>
 
 <p>
-??????????????????????????????????????B
+If the transfer fails, it has many possible causes in the following:
 </p>
 
-<h2>1) Tera Term &lt;-&gt; ????? ??? ????? &lt;-&gt; ?[?????????????????????</h2>
+<h2>1) The flow control between Tera Term and the intermediate server, or between the intermediate server and the remote host may not work well.</h2>
 
 <div class="indent1">
 <p>
-??? TCP/IP (??????? PPP ???)???????????????????????
-???????(???+?????? PPP(??????)???)??????A??????????????????
+When the connection type is the TCP/IP and dial-up PPP, the flow control will work well. Otherwise when the type is the serial port and the modem port, the flow control will not work well. Setup the flow control correctly.
 </p>
 </div>
 
-<h2>2) Tera Term &lt;-&gt; ????? ??? ????? &lt;-&gt; ?[????????????ｸ????</h2>
+<h2>2) A part of the control code will lost between Tera Term and the intermediate server, or between the intermediate server and the remote host.</h2>
 
 <div class="indent1">
 <p>
-Telnet ?????A????????????????????????B
+When the connection type is the TELNET, a user should connect by using the binary mode.
 </p>
 
+<!--
+
+
 <p>
 Kermit ?????????????????BB-Plus ? ZMODEM ???????????????????????????????????????????????????XMODEM ? Quick-VAN ??????? 8-bit ??????????????????????????????
 </p>
@@ -48,15 +48,15 @@
 <p>
 ??????? telnet ??????[??????????ATera Term ???????????????z??? telnet ?????????????????[????????????????????????????telnet ? "echo", "escape", "erase", "flushoutput", "interrupt", "kill", "quit", "areyouthere" ??????????????????????????????????????????????????????????????A?????????????????\?????????????????? telnet ?????????????????????????????A?????q???? ZMODEM ? B-Plus ?????????????G??????????????????? telnet ??????????????????????????????????????????B
 </p>
+-->
+
 </div>
 
 <p>
-?????????z?? &lt;-&gt; ?[??????????? Tera Term ???????????????<br>
-???????????????????????????ATera Term ?ﾒ?????ｿ???????????????????B<br>
-?L?????????????????(?L??????????)???A???????????????
+In each case, Tera Term can not configure the communication setting between the intermediate server and the remote host.<br>
+This transferring problem is difficult. Unfornately, Tera Term developer team may not be able to resolve the problem.<br>
+The problem can not be resolved through a trial and error process, please give up your problem solving.
 </p>
 
--->
-
 </BODY>
 </HTML>

From svnnotify ＠ sourceforge.jp  Thu Dec  9 19:19:18 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 09 Dec 2010 19:19:18 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDhdICDmlrDopo/jgqTjg7Pjgrnjg4g=?=
 =?utf-8?b?44O844Or5pmC44CB44K744OD44OI44Ki44OD44OX44Gu6KiA6Kqe44GM5pel?=
 =?utf-8?b?5pys6Kqe44Gn44KCIFVJIOOBruiogOiqnuOBjOiLseiqnuOBq+OBquOBow==?=
 =?utf-8?b?44Gm44GX44G+44Gj44Gm44GE44Gf44Gu44KS5L+u5q2j44CC?=
Message-ID: <1291889958.618616.27347.nullmailer@users.sourceforge.jp>

Revision: 4208
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4208
Author:   doda
Date:     2010-12-09 19:19:18 +0900 (Thu, 09 Dec 2010)

Log Message:
-----------
新規インストール時、セットアップの言語が日本語でも UI の言語が英語になってしまっていたのを修正。
http://slashdot.jp/comments.pl?sid=516076&cid=1870912

Modified Paths:
--------------
    trunk/installer/teraterm.iss


-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2010-12-08 14:28:39 UTC (rev 4207)
+++ trunk/installer/teraterm.iss	2010-12-09 10:19:18 UTC (rev 4208)
@@ -572,15 +572,18 @@
     wpSelectComponents:
       begin
 
-        iniFile := GetIniString('Tera Term', 'UILanguageFile', '', GetDefaultIniFilename());
-        if iniFile = 'lang\Japanese.lng' then
-          UILangFilePage.SelectedValueIndex := 1
-        else if iniFile = 'lang\German.lng' then
-          UILangFilePage.SelectedValueIndex := 2
-        else if iniFile = 'lang\French.lng' then
-          UILangFilePage.SelectedValueIndex := 3
-        else
-          UILangFilePage.SelectedValueIndex := 0;
+        if FileExists(GetDefaultIniFileName()) then
+        begin
+          iniFile := GetIniString('Tera Term', 'UILanguageFile', '', GetDefaultIniFilename());
+          if iniFile = 'lang\Japanese.lng' then
+            UILangFilePage.SelectedValueIndex := 1
+          else if iniFile = 'lang\German.lng' then
+            UILangFilePage.SelectedValueIndex := 2
+          else if iniFile = 'lang\French.lng' then
+            UILangFilePage.SelectedValueIndex := 3
+          else
+            UILangFilePage.SelectedValueIndex := 0;
+        end;
 
       end;
   end;

From svnnotify ＠ sourceforge.jp  Thu Dec  9 19:46:43 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 09 Dec 2010 19:46:43 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMDldICDjg5XjgqHjgqTjg6vlkI3jga4=?=
 =?utf-8?b?5aSn5paH5a2XIC8g5bCP5paH5a2X44Gu6YGV44GE44Gr5b2x6Z+/44GV44KM?=
 =?utf-8?b?44Gq44GE44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1291891603.332686.10772.nullmailer@users.sourceforge.jp>

Revision: 4209
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4209
Author:   doda
Date:     2010-12-09 19:46:43 +0900 (Thu, 09 Dec 2010)

Log Message:
-----------
ファイル名の大文字/小文字の違いに影響されないようにした。

Modified Paths:
--------------
    trunk/installer/teraterm.iss


-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2010-12-09 10:19:18 UTC (rev 4208)
+++ trunk/installer/teraterm.iss	2010-12-09 10:46:43 UTC (rev 4209)
@@ -574,12 +574,12 @@
 
         if FileExists(GetDefaultIniFileName()) then
         begin
-          iniFile := GetIniString('Tera Term', 'UILanguageFile', '', GetDefaultIniFilename());
-          if iniFile = 'lang\Japanese.lng' then
+          iniFile := Lowercase(GetIniString('Tera Term', 'UILanguageFile', '', GetDefaultIniFilename()));
+          if iniFile = 'lang\japanese.lng' then
             UILangFilePage.SelectedValueIndex := 1
-          else if iniFile = 'lang\German.lng' then
+          else if iniFile = 'lang\german.lng' then
             UILangFilePage.SelectedValueIndex := 2
-          else if iniFile = 'lang\French.lng' then
+          else if iniFile = 'lang\french.lng' then
             UILangFilePage.SelectedValueIndex := 3
           else
             UILangFilePage.SelectedValueIndex := 0;

From svnnotify ＠ sourceforge.jp  Thu Dec  9 20:09:33 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 09 Dec 2010 20:09:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTBdICDjgrPjg6Hjg7Pjg4jov73liqA=?=
Message-ID: <1291892973.579034.17732.nullmailer@users.sourceforge.jp>

Revision: 4210
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4210
Author:   maya
Date:     2010-12-09 20:09:33 +0900 (Thu, 09 Dec 2010)

Log Message:
-----------
?潟??潟?菴遵?

Modified Paths:
--------------
    trunk/installer/teraterm.iss


-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2010-12-09 10:46:43 UTC (rev 4209)
+++ trunk/installer/teraterm.iss	2010-12-09 11:09:33 UTC (rev 4210)
@@ -524,6 +524,7 @@
   case ActiveLanguage of
     'ja':
       UILangFilePage.SelectedValueIndex := 1;
+    // ??????????????????A?????????
     else
       UILangFilePage.SelectedValueIndex := 0;
   end;

From svnnotify ＠ sourceforge.jp  Fri Dec 10 14:41:50 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 10 Dec 2010 14:41:50 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTFdICDjg5vjgrnjg4jlsaXmrbTjga4=?=
 =?utf-8?b?44Ko44Oz44OI44Oq44KS5pW055CG44CC?=
Message-ID: <1291959710.660077.21443.nullmailer@users.sourceforge.jp>

Revision: 4211
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4211
Author:   doda
Date:     2010-12-10 14:41:50 +0900 (Fri, 10 Dec 2010)

Log Message:
-----------
ホスト履歴のエントリを整理。
・ドメイン,アドレスを可能な限り Documentation 用のものに置き換え
・URL形式等の例を追加

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI


-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2010-12-09 11:09:33 UTC (rev 4210)
+++ trunk/installer/release/TERATERM.INI	2010-12-10 05:41:50 UTC (rev 4211)
@@ -681,24 +681,31 @@
 ;	You can edit this list in the [Setup] TCP/IP dialog box.
 ;[Hosts]
 ;	Host name
-;Host1=myhost.mydomain
-;	IP address
-;Host2=111.11.1.1
+;Host1=myhost.example.com
+;	IPv4 address
+;Host2=192.0.2.1
+;	IPv6 address
+;Host3=[2001:db8:1:2:8401:02ff:fe03:0405]
+;	IPv6 address with interface number
+;Host4=[fe80::8401:02ff:fe03:0405%3]
 ;	Host name with option
-;Host3=myhost.mydomain /F=myhost.ini
+;Host5=myhost.example.com /F=myhost.ini
+;	Host name with user, port and option
+;Host6=user ＠ myhost.example.com:10022 /ssh
+;	URL
+;Host7=ssh://user ＠ myhost.example.com
 ;	COM1 port
-;Host4=/C=1
+;Host8=/C=1
 ;	Replay a file
-;Host5=/R=readme.txt
+;Host9=/R=readme.txt
 
 [Hosts]
-Host1=192.168.1.3
-Host2=sleep.mat-yan.jp
-Host3=shell.sourceforge.jp
-Host4=[fe80::201:80ff:fe36:cc7b%5]
-Host5=cgi3.tky.3web.ne.jp
-Host6=myhost.mydomain
-Host7=111.11.1.1
-Host8=myhost.mydomain /F=myhost.ini
-Host9=/C=1 ;serial port
-Host10=/R=readme.txt ;replay a file
+Host1=myhost.example.com
+Host2=192.0.2.1
+Host3=[2001:db8:1:2:8401:2ff:fe03:405]
+Host4=[fe80::8401:2ff:fe03:405%3]
+Host5=myhost.example.com /F=myhost.ini
+Host6=user ＠ myhost.example.com:10022 /ssh
+Host7=ssh://user ＠ myhost.example.com
+Host8=/C=1 ;serial port
+Host9=/R=readme.txt ;replay a file

From svnnotify ＠ sourceforge.jp  Fri Dec 10 16:58:34 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 10 Dec 2010 16:58:34 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTJdICDlkITmmpflj7fmlrnlvI/jga4=?=
 =?utf-8?b?44Ko44Op44O844Oh44OD44K744O844K444KS5YWx6YCa44Gr44GX44Gf44CC?=
Message-ID: <1291967914.979883.23939.nullmailer@users.sourceforge.jp>

Revision: 4212
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4212
Author:   doda
Date:     2010-12-10 16:58:34 +0900 (Fri, 10 Dec 2010)

Log Message:
-----------
????傑?綣???????＜??祉??吾??演???????
# 筝??筝??????с???????????????? ??????????????????

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/ttssh2/ttxssh/crypt.c


-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2010-12-10 05:41:50 UTC (rev 4211)
+++ trunk/installer/release/lang/English.lng	2010-12-10 07:58:34 UTC (rev 4212)
@@ -632,26 +632,10 @@
 DLG_UNKNOWNHOST_ADD=&Add this machine and its key to the known hosts list
 
 ; crypt.c
-MSG_AES128_ENCRYPT_ERROR1=AES128/192/256 encrypt error(1): bytes %d (%d)
-MSG_AES128_ENCRYPT_ERROR2=AES128/192/256 encrypt error(2)
-MSG_AES128_DECRYPT_ERROR1=AES128/192/256 decrypt error(1): bytes %d (%d)
-MSG_AES128_DECRYPT_ERROR2=AES128/192/256 decrypt error(2)
-MSG_3DESCBC_ENCRYPT_ERROR1=3DES-CBC encrypt error(1): bytes %d (%d)
-MSG_3DESCBC_ENCRYPT_ERROR2=3DES-CBC encrypt error(2)
-MSG_3DESCBC_DECRYPT_ERROR1=3DES-CBC decrypt error(1): bytes %d (%d)
-MSG_3DESCBC_DECRYPT_ERROR2=3DES-CBC decrypt error(2)
-MSG_BLOWFISH_ENCRYPT_ERROR1=Blowfish encrypt error(1): bytes %d (%d)
-MSG_BLOWFISH_ENCRYPT_ERROR2=Blowfish encrypt error(2)
-MSG_BLOWFISH_DECRYPT_ERROR1=Blowfish decrypt error(1): bytes %d (%d)
-MSG_BLOWFISH_DECRYPT_ERROR2=Blowfish decrypt error(2)
-MSG_ARCFOUR_ENCRYPT_ERROR1=Arcfour encrypt error(1): bytes %d (%d)
-MSG_ARCFOUR_ENCRYPT_ERROR2=Arcfour encrypt error(2)
-MSG_ARCFOUR_DECRYPT_ERROR1=Arcfour decrypt error(1): bytes %d (%d)
-MSG_ARCFOUR_DECRYPT_ERROR2=Arcfour decrypt error(2)
-MSG_CAST128_ENCRYPT_ERROR1=CAST128 encrypt error(1): bytes %d (%d)
-MSG_CAST128_ENCRYPT_ERROR2=CAST128 encrypt error(2)
-MSG_CAST128_DECRYPT_ERROR1=CAST128 decrypt error(1): bytes %d (%d)
-MSG_CAST128_DECRYPT_ERROR2=CAST128 decrypt error(2)
+MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d)
+MSG_ENCRYPT_ERROR2=%s encrypt error(2)
+MSG_DECRYPT_ERROR1=%s decrypt error(1): bytes %d (%d)
+MSG_DECRYPT_ERROR2=%s decrypt error(2)
 MSG_CIPHER_INIT_ERROR=Cipher initialize error(%d)
 MSG_RSAKEY_SETUP_ERROR=Error setting up RSA keys
 MSG_UNAVAILABLE_CIPHERS_ERROR=The server does not support any of the TTSSH encryption algorithms.\nA secure connection cannot be made in the TTSSH-to-server direction.\nThe connection will be closed.

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2010-12-10 05:41:50 UTC (rev 4211)
+++ trunk/installer/release/lang/French.lng	2010-12-10 07:58:34 UTC (rev 4212)
@@ -631,26 +631,10 @@
 DLG_UNKNOWNHOST_ADD=&Ajouter cette machine et sa cl??la liste des h?es connus
 
 ; crypt.c
-MSG_AES128_ENCRYPT_ERROR1=AES128/192/256 erreur cryptage(1): octets %d (%d)
-MSG_AES128_ENCRYPT_ERROR2=AES128/192/256 erreur cryptage(2)
-MSG_AES128_DECRYPT_ERROR1=AES128/192/256 erreur d?ryptage(1): octets %d (%d)
-MSG_AES128_DECRYPT_ERROR2=AES128/192/256 erreur d?ryptage(2)
-MSG_3DESCBC_ENCRYPT_ERROR1=3DES-CBC erreur cryptage(1): octets %d (%d)
-MSG_3DESCBC_ENCRYPT_ERROR2=3DES-CBC erreur cryptage(2)
-MSG_3DESCBC_DECRYPT_ERROR1=3DES-CBC erreur d?ryptage(1): octets %d (%d)
-MSG_3DESCBC_DECRYPT_ERROR2=3DES-CBC erreur d?ryptage(2)
-MSG_BLOWFISH_ENCRYPT_ERROR1=Blowfish erreur cryptage(1): octets %d (%d)
-MSG_BLOWFISH_ENCRYPT_ERROR2=Blowfish erreur cryptage(2)
-MSG_BLOWFISH_DECRYPT_ERROR1=Blowfish erreur d?ryptage(1): octets %d (%d)
-MSG_BLOWFISH_DECRYPT_ERROR2=Blowfish erreur d?ryptage(2)
-MSG_ARCFOUR_ENCRYPT_ERROR1=Arcfour erreur cryptage(1): octets %d (%d)
-MSG_ARCFOUR_ENCRYPT_ERROR2=Arcfour erreur cryptage(2)
-MSG_ARCFOUR_DECRYPT_ERROR1=Arcfour erreur d?ryptage(1): octets %d (%d)
-MSG_ARCFOUR_DECRYPT_ERROR2=Arcfour erreur d?ryptage(2)
-MSG_CAST128_ENCRYPT_ERROR1=CAST128 erreur cryptage(1): octets %d (%d)
-MSG_CAST128_ENCRYPT_ERROR2=CAST128 erreur cryptage(2)
-MSG_CAST128_DECRYPT_ERROR1=CAST128 erreur d?ryptage(1): octets %d (%d)
-MSG_CAST128_DECRYPT_ERROR2=CAST128 erreur d?ryptage(2)
+MSG_ENCRYPT_ERROR1=%s erreur cryptage(1): octets %d (%d)
+MSG_ENCRYPT_ERROR2=%s erreur cryptage(2)
+MSG_DECRYPT_ERROR1=%s erreur d?ryptage(1): octets %d (%d)
+MSG_DECRYPT_ERROR2=%s erreur d?ryptage(2)
 MSG_CIPHER_INIT_ERROR=Erreur initialisation chiffrement(%d)
 MSG_RSAKEY_SETUP_ERROR=Erreur configurations cl? RSA
 MSG_UNAVAILABLE_CIPHERS_ERROR=Le serveur ne suppote aucun des algorithmes de cryptage TTSSH.\nUne connexion s?uris? ne peut ?re ?ablie avec le serveur.\nLa connexion va ?re ferm?.

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2010-12-10 05:41:50 UTC (rev 4211)
+++ trunk/installer/release/lang/German.lng	2010-12-10 07:58:34 UTC (rev 4212)
@@ -629,26 +629,10 @@
 DLG_UNKNOWNHOST_ADD=Den Server zur "known hosts"-Liste hinzuf?en.
 
 ; crypt.c
-MSG_AES128_ENCRYPT_ERROR1=AES128/192/256 encrypt error(1): bytes %d (%d)
-MSG_AES128_ENCRYPT_ERROR2=AES128/192/256 encrypt error(2)
-MSG_AES128_DECRYPT_ERROR1=AES128/192/256 decrypt error(1): bytes %d (%d)
-MSG_AES128_DECRYPT_ERROR2=AES128/192/256 decrypt error(2)
-MSG_3DESCBC_ENCRYPT_ERROR1=3DES-CBC encrypt error(1): bytes %d (%d)
-MSG_3DESCBC_ENCRYPT_ERROR2=3DES-CBC encrypt error(2)
-MSG_3DESCBC_DECRYPT_ERROR1=3DES-CBC decrypt error(1): bytes %d (%d)
-MSG_3DESCBC_DECRYPT_ERROR2=3DES-CBC decrypt error(2)
-MSG_BLOWFISH_ENCRYPT_ERROR1=Blowfish encrypt error(1): bytes %d (%d)
-MSG_BLOWFISH_ENCRYPT_ERROR2=Blowfish encrypt error(2)
-MSG_BLOWFISH_DECRYPT_ERROR1=Blowfish decrypt error(1): bytes %d (%d)
-MSG_BLOWFISH_DECRYPT_ERROR2=Blowfish decrypt error(2)
-MSG_ARCFOUR_ENCRYPT_ERROR1=Arcfour encrypt error(1): bytes %d (%d)
-MSG_ARCFOUR_ENCRYPT_ERROR2=Arcfour encrypt error(2)
-MSG_ARCFOUR_DECRYPT_ERROR1=Arcfour decrypt error(1): bytes %d (%d)
-MSG_ARCFOUR_DECRYPT_ERROR2=Arcfour decrypt error(2)
-MSG_CAST128_ENCRYPT_ERROR1=CAST128 encrypt error(1): bytes %d (%d)
-MSG_CAST128_ENCRYPT_ERROR2=CAST128 encrypt error(2)
-MSG_CAST128_DECRYPT_ERROR1=CAST128 decrypt error(1): bytes %d (%d)
-MSG_CAST128_DECRYPT_ERROR2=CAST128 decrypt error(2)
+MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d)
+MSG_ENCRYPT_ERROR2=%s encrypt error(2)
+MSG_DECRYPT_ERROR1=%s decrypt error(1): bytes %d (%d)
+MSG_DECRYPT_ERROR2=%s decrypt error(2)
 MSG_CIPHER_INIT_ERROR=Cipher initialize error(%d)
 MSG_RSAKEY_SETUP_ERROR=Error setting up RSA keys
 MSG_UNAVAILABLE_CIPHERS_ERROR=The server does not support any of the TTSSH encryption algorithms.\nA secure connection cannot be made in the TTSSH-to-server direction.\nThe connection will be closed.

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2010-12-10 05:41:50 UTC (rev 4211)
+++ trunk/installer/release/lang/Japanese.lng	2010-12-10 07:58:34 UTC (rev 4212)
@@ -632,26 +632,10 @@
 DLG_UNKNOWNHOST_ADD=??????known hosts????????(&A)
 
 ; crypt.c
-MSG_AES128_ENCRYPT_ERROR1=AES128/192/256??????(1): bytes %d (%d)
-MSG_AES128_ENCRYPT_ERROR2=AES128/192/256??????(2)
-MSG_AES128_DECRYPT_ERROR1=AES128/192/256?????(1): bytes %d (%d)
-MSG_AES128_DECRYPT_ERROR2=AES128/192/256?????(2)
-MSG_3DESCBC_ENCRYPT_ERROR1=3DES-CBC??????(1): bytes %d (%d)
-MSG_3DESCBC_ENCRYPT_ERROR2=3DES-CBC??????(2)
-MSG_3DESCBC_DECRYPT_ERROR1=3DES-CBC?????(1): bytes %d (%d)
-MSG_3DESCBC_DECRYPT_ERROR2=3DES-CBC?????(2)
-MSG_BLOWFISH_ENCRYPT_ERROR1=Blowfish??????(1): bytes %d (%d)
-MSG_BLOWFISH_ENCRYPT_ERROR2=Blowfish??????(2)
-MSG_BLOWFISH_DECRYPT_ERROR1=Blowfish?????(1): bytes %d (%d)
-MSG_BLOWFISH_DECRYPT_ERROR2=Blowfish?????(2)
-MSG_ARCFOUR_ENCRYPT_ERROR1=Arcfour??????(1): bytes %d (%d)
-MSG_ARCFOUR_ENCRYPT_ERROR2=Arcfour??????(2)
-MSG_ARCFOUR_DECRYPT_ERROR1=Arcfour?????(1): bytes %d (%d)
-MSG_ARCFOUR_DECRYPT_ERROR2=Arcfour?????(2)
-MSG_CAST128_ENCRYPT_ERROR1=CAST128??????(1): bytes %d (%d)
-MSG_CAST128_ENCRYPT_ERROR2=CAST128??????(2)
-MSG_CAST128_DECRYPT_ERROR1=CAST128?????(1): bytes %d (%d)
-MSG_CAST128_DECRYPT_ERROR2=CAST128?????(2)
+MSG_ENCRYPT_ERROR1=%s??????(1): bytes %d (%d)
+MSG_ENCRYPT_ERROR2=%s??????(2)
+MSG_DECRYPT_ERROR1=%s?????(1): bytes %d (%d)
+MSG_DECRYPT_ERROR2=%s?????(2)
 MSG_CIPHER_INIT_ERROR=?????G??(%d)
 MSG_RSAKEY_SETUP_ERROR=RSA ??????
 MSG_UNAVAILABLE_CIPHERS_ERROR=??????TTSSH ???????????????????.\nTTSSH?????????????????????.\n???????.

Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c	2010-12-10 05:41:50 UTC (rev 4211)
+++ trunk/ttssh2/ttxssh/crypt.c	2010-12-10 07:58:34 UTC (rev 4212)
@@ -221,6 +221,7 @@
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -230,19 +231,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_AES128_ENCRYPT_ERROR1", pvar,
-		                  "AES128/192/256 encrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
-		            pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR1", pvar,
+		                  "%s encrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "AES128/192/256", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_AES128_ENCRYPT_ERROR2", pvar,
-		                  "AES128/192/256 encrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "AES128/192/256");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -268,6 +269,7 @@
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -277,18 +279,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_AES128_DECRYPT_ERROR1", pvar,
-		                  "AES128/192/256 decrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR1", pvar,
+		                  "%s decrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "AES128/192/256", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_IN], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_AES128_DECRYPT_ERROR2", pvar,
-		                  "AES128/192/256 decrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "AES128/192/256");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -310,13 +313,13 @@
 }
 
 
-
 // for SSH2(yutaka)
 static void c3DES_encrypt2(PTInstVar pvar, unsigned char FAR * buf,
-                              int bytes)
+                           int bytes)
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -326,19 +329,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_3DESCBC_ENCRYPT_ERROR1", pvar,
-		                  "3DES-CBC encrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
-		            pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR1", pvar,
+		                  "%s encrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "3DES-CBC", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_3DESCBC_ENCRYPT_ERROR2", pvar,
-		                  "3DES-CBC encrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "3DES-CBC");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -360,10 +363,11 @@
 }
 
 static void c3DES_decrypt2(PTInstVar pvar, unsigned char FAR * buf,
-                              int bytes)
+                           int bytes)
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -373,18 +377,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_3DESCBC_DECRYPT_ERROR1", pvar,
-		                  "3DES-CBC decrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR1", pvar,
+		                  "%s decrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "3DES-CBC", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_IN], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_3DESCBC_DECRYPT_ERROR2", pvar,
-		                  "3DES-CBC decrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "3DES-CBC");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -411,6 +416,7 @@
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -420,19 +426,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_BLOWFISH_ENCRYPT_ERROR1", pvar,
-		                  "Blowfish encrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
-		            pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR1", pvar,
+		                  "%s encrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Blowfish", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_BLOWFISH_ENCRYPT_ERROR2", pvar,
-		                  "Blowfish encrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Blowfish");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -449,6 +455,7 @@
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -458,18 +465,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_BLOWFISH_DECRYPT_ERROR1", pvar,
-		                  "Blowfish decrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR1", pvar,
+		                  "%s decrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Blowfish", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_IN], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_BLOWFISH_DECRYPT_ERROR2", pvar,
-		                  "Blowfish decrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Blowfish");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -481,11 +489,13 @@
 	free(newbuf);
 }
 
+
 static void cArcfour_encrypt(PTInstVar pvar, unsigned char FAR * buf,
-                               int bytes)
+                             int bytes)
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -495,19 +505,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_ARCFOUR_ENCRYPT_ERROR1", pvar,
-		                  "Arcfour encrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
-		            pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR1", pvar,
+		                  "%s encrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Arcfour", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_ARCFOUR_ENCRYPT_ERROR2", pvar,
-		                  "Arcfour encrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Arcfour");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -520,10 +530,11 @@
 }
 
 static void cArcfour_decrypt(PTInstVar pvar, unsigned char FAR * buf,
-                               int bytes)
+                             int bytes)
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -533,18 +544,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_ARCFOUR_DECRYPT_ERROR1", pvar,
-		                  "Arcfour decrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR1", pvar,
+		                  "%s decrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Arcfour", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_IN], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_ARCFOUR_DECRYPT_ERROR2", pvar,
-		                  "Arcfour decrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "Arcfour");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -556,11 +568,13 @@
 	free(newbuf);
 }
 
+
 static void cCast128_encrypt(PTInstVar pvar, unsigned char FAR * buf,
                              int bytes)
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -570,19 +584,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_CAST128_ENCRYPT_ERROR1", pvar,
-		                  "CAST128 encrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
-		            pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR1", pvar,
+		                  "%s encrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "CAST128", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_CAST128_ENCRYPT_ERROR2", pvar,
-		                  "CAST128 encrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "CAST128");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -599,6 +613,7 @@
 {
 	unsigned char *newbuf = malloc(bytes);
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
+	char tmp[80];
 
 	// ???????????????????????????A0???????(2004.11.7 yutaka)
 	if (bytes == 0)
@@ -608,18 +623,19 @@
 		return;
 
 	if (bytes % block_size) {
-		char tmp[80];
-		UTIL_get_lang_msg("MSG_CAST128_DECRYPT_ERROR1", pvar,
-		                  "CAST128 decrypt error(1): bytes %d (%d)");
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg, bytes, block_size);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR1", pvar,
+		                  "%s decrypt error(1): bytes %d (%d)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "CAST128", bytes, block_size);
 		notify_fatal_error(pvar, tmp);
 		goto error;
 	}
 
 	if (EVP_Cipher(&pvar->evpcip[MODE_IN], newbuf, buf, bytes) == 0) {
-		UTIL_get_lang_msg("MSG_CAST128_DECRYPT_ERROR2", pvar,
-		                  "CAST128 decrypt error(2)");
-		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
+		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
+		            "CAST128");
+		notify_fatal_error(pvar, tmp);
 		goto error;
 
 	} else {
@@ -632,7 +648,6 @@
 }
 
 
-
 static void c3DES_encrypt(PTInstVar pvar, unsigned char FAR * buf,
                           int bytes)
 {

From svnnotify ＠ sourceforge.jp  Sat Dec 11 00:01:59 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 11 Dec 2010 00:01:59 +0900
Subject: [Ttssh2-commit] [4213] typo fix
Message-ID: <1291993319.755012.1222.nullmailer@users.sourceforge.jp>

Revision: 4213
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4213
Author:   maya
Date:     2010-12-11 00:01:59 +0900 (Sat, 11 Dec 2010)

Log Message:
-----------
typo fix

Modified Paths:
--------------
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/ja/html/reference/develop.txt


-------------- next part --------------
Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2010-12-10 07:58:34 UTC (rev 4212)
+++ trunk/doc/en/html/reference/develop.txt	2010-12-10 15:01:59 UTC (rev 4213)
@@ -259,4 +259,4 @@
        (3) TTSSH Changelog http://logmett.com/forum/viewtopic.php?f=5&t=29
            Added current modification.
 
-  9. Delete spanshots.
+  10. Delete spanshots.

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2010-12-10 07:58:34 UTC (rev 4212)
+++ trunk/doc/ja/html/reference/develop.txt	2010-12-10 15:01:59 UTC (rev 4213)
@@ -271,4 +271,4 @@
        (3) TTSSH Changelog http://logmett.com/forum/viewtopic.php?f=5&t=29
            ??????????
 
-  9. ?????????????+  10. ?????????????
From svnnotify ＠ sourceforge.jp  Sat Dec 11 00:08:57 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 11 Dec 2010 00:08:57 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTRdICDmm7jjgY3lv5jjgozjgZ/lsaU=?=
 =?utf-8?b?5q2044KS6L+95Yqg?=
Message-ID: <1291993737.465546.11933.nullmailer@users.sourceforge.jp>

Revision: 4214
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4214
Author:   maya
Date:     2010-12-11 00:08:57 +0900 (Sat, 11 Dec 2010)

Log Message:
-----------
?吾?綽????吋罩眼?菴遵?

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-10 15:01:59 UTC (rev 4213)
+++ trunk/doc/en/html/about/history.html	2010-12-10 15:08:57 UTC (rev 4214)
@@ -55,6 +55,7 @@
       <li>Extended the maximum number of Tera Term window from 50 to 256.</li>
       <li>Extended the maximum number of Tera Term plugins from 16 to 32.</li>
       <li>added an argument of the "<a href="../macro/command/beep.html">beep</a>" macro command.</li>
+      <!--li><ins>box ????????? special ????????</ins></li-->
       <li>The WSAAsyncGetAddrInfo function can be hooked by using plugin.</li>
       <li>The freeaddrinfo function can be hooked by using plugin.</li>
     </ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-10 15:01:59 UTC (rev 4213)
+++ trunk/doc/ja/html/about/history.html	2010-12-10 15:08:57 UTC (rev 4214)
@@ -55,6 +55,7 @@
       <li>????????????? 50 ?? 256 ??????</li>
       <li>????????????? 16 ?? 32 ??????</li>
       <li>??????? "<a href="../macro/command/beep.html">beep</a>" ?????????</li>
+      <li><ins>box ????????? special ????????</ins></li>
       <li>WSAAsyncGetAddrInfo ???????????????????B</li>
       <li>freeaddrinfo ???????????????????B</li>
     </ul>

From svnnotify ＠ sourceforge.jp  Sun Dec 12 21:47:05 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 12 Dec 2010 21:47:05 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTVdICDoi7HoqLPjgpLov73liqDjgII=?=
Message-ID: <1292158025.490549.15659.nullmailer@users.sourceforge.jp>

Revision: 4215
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4215
Author:   yutakapon
Date:     2010-12-12 21:47:05 +0900 (Sun, 12 Dec 2010)

Log Message:
-----------
?沿┳??申???

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/usage/tips/forwarding-files.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-10 15:08:57 UTC (rev 4214)
+++ trunk/doc/en/html/about/history.html	2010-12-12 12:47:05 UTC (rev 4215)
@@ -55,7 +55,7 @@
       <li>Extended the maximum number of Tera Term window from 50 to 256.</li>
       <li>Extended the maximum number of Tera Term plugins from 16 to 32.</li>
       <li>added an argument of the "<a href="../macro/command/beep.html">beep</a>" macro command.</li>
-      <!--li><ins>box ????????? special ????????</ins></li-->
+      <li><ins>Deleted the special argument of the box-style macro command.</ins></li>
       <li>The WSAAsyncGetAddrInfo function can be hooked by using plugin.</li>
       <li>The freeaddrinfo function can be hooked by using plugin.</li>
     </ul>

Modified: trunk/doc/en/html/usage/tips/forwarding-files.html
===================================================================
--- trunk/doc/en/html/usage/tips/forwarding-files.html	2010-12-10 15:08:57 UTC (rev 4214)
+++ trunk/doc/en/html/usage/tips/forwarding-files.html	2010-12-12 12:47:05 UTC (rev 4215)
@@ -38,17 +38,13 @@
 When the connection type is the TELNET, a user should connect by using the binary mode.
 </p>
 
-<!--
-
-
 <p>
-Kermit ?????????????????BB-Plus ? ZMODEM ???????????????????????????????????????????????????XMODEM ? Quick-VAN ??????? 8-bit ??????????????????????????????
+By using the kermit protocol, it has no problem. By using the B-Plus and ZMODEM protocol, it may have no problem when all control characters are escaped. By using the XMODEM and Quick-VAN protocol, it has no problem when all 8bit characters can pass through.
 </p>
 
 <p>
-??????? telnet ??????[??????????ATera Term ???????????????z??? telnet ?????????????????[????????????????????????????telnet ? "echo", "escape", "erase", "flushoutput", "interrupt", "kill", "quit", "areyouthere" ??????????????????????????????????????????????????????????????A?????????????????\?????????????????? telnet ?????????????????????????????A?????q???? ZMODEM ? B-Plus ?????????????G??????????????????? telnet ??????????????????????????????????????????B
+When a user connects from the intermediate server to the remote host by using the telnet command, a part of the control characters Tera Term sending will lost. These characters will be assigned to the telnet features such as the "echo", "escape", "erase", "flushoutput", "interrupt", "kill", "quit" and "areyouthere". If a user can download the file from the remote server but can not upload the file to the server, it has the above possible cause. To resolve this problem, cancel the control character feature or esacpe all control characters by using the B-Plus and ZMODEM protocol. However, it will not work well by using the telnet protocol.
 </p>
--->
 
 </div>
 

From svnnotify ＠ sourceforge.jp  Tue Dec 14 01:10:52 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 14 Dec 2010 01:10:52 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTZdICBTQ1Ag6YCB5L+h44GnIDJHQiA=?=
 =?utf-8?b?44KS6LaF44GI44KL44OV44Kh44Kk44Or44KS5q2j44GX44GP5omx44GI44Gq?=
 =?utf-8?b?44GE44Gu44KS5L+u5q2j44CC?=
Message-ID: <1292256652.016181.27597.nullmailer@users.sourceforge.jp>

Revision: 4216
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4216
Author:   doda
Date:     2010-12-14 01:10:51 +0900 (Tue, 14 Dec 2010)

Log Message:
-----------
SCP ??拭??2GB ??????????ゃ????????宴???????篆????
Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/ssh.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-12 12:47:05 UTC (rev 4215)
+++ trunk/doc/en/html/about/history.html	2010-12-13 16:10:51 UTC (rev 4216)
@@ -31,6 +31,28 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.69">2011.xx.xx (Ver 4.69)</a></h3>
+<ul class="history">
+  <!-- li>Changes
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!-- li>Bug fixes
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <li>Misc
+    <ul>
+      <li>upgraded TTSSH version supporting SSH2 to <a href="#ttssh_2.56">2.56</a></li>
+    </ul>
+  </li>
+
+</ul>
+
 <h3><a name="teraterm_4.68">2010.12.7 (Ver 4.68)</a></h3>
 <ul class="history">
   <li>Changes
@@ -1585,6 +1607,27 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.56">2011.xx.xx (Ver 2.56)</a></h3>
+<ul class="history">
+  <!-- li>Changes
+    <ul>
+     <li></li>
+    </ul>
+  </li -->
+
+  <!-- li>Bug fixes
+    <ul>
+      <li>SCP ????????2GB????????????????????????B</li>
+    </ul>
+  </li -->
+
+  <li>Misc
+    <ul>
+      <li>upgraded OpenSSL to 1.0.0c</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.55">2010.12.7 (Ver 2.55)</a></h3>
 <ul class="history">
   <li>Changes

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-12 12:47:05 UTC (rev 4215)
+++ trunk/doc/ja/html/about/history.html	2010-12-13 16:10:51 UTC (rev 4216)
@@ -31,6 +31,28 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.69">2011.xx.xx (Ver 4.69)</a></h3>
+<ul class="history">
+  <!-- li>??
+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <!-- li>????+    <ul>
+      <li></li>
+    </ul>
+  </li -->
+
+  <li>???
+    <ul>
+      <li><a href="#ttssh_2.56">SSH2??TTSSH(2.56)</a>???????</li>
+    </ul>
+  </li>
+
+</ul>
+
 <h3><a name="teraterm_4.68">2010.12.7 (Ver 4.68)</a></h3>
 <ul class="history">
   <li>??
@@ -1587,6 +1609,27 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.56">2011.xx.xx (Ver 2.56)</a></h3>
+<ul class="history">
+  <!-- li>??
+    <ul>
+     <li></li>
+    </ul>
+  </li -->
+
+  <li>????+    <ul>
+      <li>SCP ????????2GB????????????????????????B</li>
+    </ul>
+  </li>
+
+  <li>???
+    <ul>
+      <li>OpenSSL 1.0.0c??????</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.55">2010.12.7 (Ver 2.55)</a></h3>
 <ul class="history">
   <li>??

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2010-12-12 12:47:05 UTC (rev 4215)
+++ trunk/ttssh2/ttxssh/ssh.c	2010-12-13 16:10:51 UTC (rev 4216)
@@ -91,7 +91,7 @@
 	char localfilefull[MAX_PATH];  // local filename fullpath
 	char remotefile[MAX_PATH];     // remote filename
 	FILE *localfp;                 // file pointer for local file
-	struct _stat filestat;         // file status information
+	struct __stat64 filestat;      // file status information
 	HWND progress_window;
 	HANDLE thread;
 	unsigned int thread_id;
@@ -3740,7 +3740,7 @@
 	int len;
 	Channel_t *c = NULL;
 	FILE *fp = NULL;
-	struct _stat st;
+	struct __stat64 st;
 
 	// ??????????????????????B
 	if (pvar->socket == INVALID_SOCKET)
@@ -3776,7 +3776,7 @@
 		}
 		c->scp.localfp = fp;     // file pointer
 
-		if (_stat(c->scp.localfilefull, &st) == 0) {
+		if (_stat64(c->scp.localfilefull, &st) == 0) {
 			c->scp.filestat = st;
 		} else {
 			goto error;
@@ -3880,7 +3880,7 @@
 	int len;
 	Channel_t *c = NULL;
 //	FILE *fp = NULL;
-//	struct _stat st;
+//	struct __stat64 st;
 
 	// ??????????????????????B
 	if (pvar->socket == INVALID_SOCKET)
@@ -8363,7 +8363,7 @@
 
 		total_size += ret;
 
-		_snprintf_s(s, sizeof(s), _TRUNCATE, "%lld / %lld (%d%%)", total_size, (long long)c->scp.filestat.st_size, 
+		_snprintf_s(s, sizeof(s), _TRUNCATE, "%lld / %lld (%d%%)", total_size, c->scp.filestat.st_size, 
 			(100 * total_size / c->scp.filestat.st_size)%100 );
 		SendMessage(GetDlgItem(hWnd, IDC_PROGRESS), WM_SETTEXT, 0, (LPARAM)s);
 
@@ -8407,7 +8407,7 @@
 		char buf[128];
 
 		_snprintf_s(buf, sizeof(buf), _TRUNCATE, "C0644 %lld %s\n", 
-			(long long)c->scp.filestat.st_size, c->scp.localfile);
+			c->scp.filestat.st_size, c->scp.localfile);
 
 		c->scp.state = SCP_FILEINFO;
 		SSH2_send_channel_data(pvar, c, buf, strlen(buf));

From svnnotify ＠ sourceforge.jp  Thu Dec 16 18:39:48 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 16 Dec 2010 18:39:48 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTddICDnq6/mnKsgVUlEIOOCkuiorQ==?=
 =?utf-8?b?5a6a44Gn44GN44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1292492388.130328.31371.nullmailer@users.sourceforge.jp>

Revision: 4217
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4217
Author:   doda
Date:     2010-12-16 18:39:48 +0900 (Thu, 16 Dec 2010)

Log Message:
-----------
端末 UID を設定できるようにした。

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2010-12-13 16:10:51 UTC (rev 4216)
+++ trunk/installer/release/TERATERM.INI	2010-12-16 09:39:48 UTC (rev 4217)
@@ -502,6 +502,9 @@
 TCPLocalEcho=off
 TCPCRSend=
 
+; Terminal Unique ID
+TerminalUID=FFFFFFFF
+
 ; Title format
 ; format ID:  5(000101) <title> - <host/port> VT/TEK
 ; format ID: 13(001101) <host/port> - <title> VT/TEK

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2010-12-13 16:10:51 UTC (rev 4216)
+++ trunk/teraterm/common/tttypes.h	2010-12-16 09:39:48 UTC (rev 4217)
@@ -502,6 +502,7 @@
 	WORD LogBinary;
 	WORD DisableMenuDuplicateSession;
 	WORD DisableMenuNewConnection;
+	char TerminalUID[9];
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -937,6 +938,9 @@
  * Increment the number of this macro value
  * when you change TMap or member of TMap.
  *
+ * - At version 4.69, ttset_memfilemap was replaced with ttset_memfilemap_15.
+ *   added tttset.TerminalUID.
+ *
  * - At version 4.68, ttset_memfilemap was replaced with ttset_memfilemap_14.
  *   increase WinList(MAXNWIN) size.
  *
@@ -1028,4 +1032,4 @@
  *   added tttset.VTCompatTab.
  */
 
-#define TT_FILEMAPNAME "ttset_memfilemap_14"
+#define TT_FILEMAPNAME "ttset_memfilemap_15"

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-13 16:10:51 UTC (rev 4216)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-16 09:39:48 UTC (rev 4217)
@@ -2112,10 +2112,14 @@
 
   void CSEQ(BYTE b)
   {
+    char Report[16];
+    int len;
+
     switch (b) {
       case 'c': /* Tertiary terminal report (Tertiary DA) */
 	if (Param[1] < 1) {
-	  SendDCSstr("!|FFFFFFFF", 0);
+	  len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "!|%8s", CLocale, ts.TerminalUID);
+	  SendDCSstr(Report, len);
 	}
 	break;
     }

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2010-12-13 16:10:51 UTC (rev 4216)
+++ trunk/teraterm/ttpset/ttset.c	2010-12-16 09:39:48 UTC (rev 4217)
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <direct.h>
+#include <ctype.h>
 #include "ttlib.h"
 #include "tt_res.h"
 
@@ -1363,6 +1364,28 @@
 	// IME status related cursor style
 	if (GetOnOff(Section, "IMERelatedCursor", FName, FALSE))
 		ts->WindowFlag |= WF_IMECURSORCHANGE;
+
+	// Terminal Unique ID
+	GetPrivateProfileString(Section, "TerminalUID", "FFFFFFFF", Temp, sizeof(Temp), FName);
+	if (strlen(Temp) == 8) {
+		for (i=0; i<8 && isxdigit(Temp[i]); i++) {
+			if (islower(Temp[i])) {
+				ts->TerminalUID[i] = toupper(Temp[i]);
+			}
+			else {
+				ts->TerminalUID[i] = Temp[i];
+			}
+		}
+		if (i == 8) {
+			ts->TerminalUID[i] = 0;
+		}
+		else {
+			strncpy_s(ts->TerminalUID, sizeof(ts->TerminalUID), "FFFFFFFF", _TRUNCATE);
+		}
+	}
+	else {
+		strncpy_s(ts->TerminalUID, sizeof(ts->TerminalUID), "FFFFFFFF", _TRUNCATE);
+	}
 }
 
 void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2380,6 +2403,9 @@
 	// IME status related cursor style
 	WriteOnOff(Section, "IMERelatedCursor", FName,
 		ts->WindowFlag & WF_IMECURSORCHANGE);
+
+	// Terminal Unique ID
+	WritePrivateProfileString(Section, "TerminalUID", ts->TerminalUID, FName);
 }
 
 #define VTEditor "VT editor keypad"

From svnnotify ＠ sourceforge.jp  Fri Dec 17 13:00:58 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 13:00:58 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMThdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?=
 =?utf-8?b?5pu05paw44CCICgg56uv5pyrIFVJRCDplqLpgKMgKQ==?=
Message-ID: <1292558458.588390.29642.nullmailer@users.sourceforge.jp>

Revision: 4218
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4218
Author:   doda
Date:     2010-12-17 13:00:58 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
????ャ??潟??贋???腴?? UID ?∫?)

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-term.html
    trunk/doc/en/html/setup/teraterm.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/setup/teraterm-term.html
    trunk/doc/ja/html/setup/teraterm.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-16 09:39:48 UTC (rev 4217)
+++ trunk/doc/en/html/about/history.html	2010-12-17 04:00:58 UTC (rev 4218)
@@ -35,7 +35,10 @@
 <ul class="history">
   <!-- li>Changes
     <ul>
-      <li></li>
+      <li>DA3 ???????????????????ID???????????B
+        <ul>
+          <li>added the <a href="../setup/teraterm-term.html#TerminalUID">TerminalUID</a> entry in the teraterm.ini file. The default value is FFFFFFFF.</li>
+        </ul></li>
     </ul>
   </li -->
 

Modified: trunk/doc/en/html/setup/teraterm-term.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-term.html	2010-12-16 09:39:48 UTC (rev 4217)
+++ trunk/doc/en/html/setup/teraterm-term.html	2010-12-17 04:00:58 UTC (rev 4218)
@@ -362,5 +362,24 @@
 AlternateScreenBuffer=on
 </pre>
 
+<h1><a name="TerminalUID">Terminal unique ID <!--????ID?????--></a></h1>
+
+<!-- p>
+Tera Term ? DA3 ??????????????????? ID ?????????? ID ? 8 ?? 16 ????????2 ???????A??? 6 ????????[?????????????????
+</p>
+
+<p>
+DA3 ??????????????????? ID ???????? 01234567 ?????????A??????? [Tera Term] ?????? TerminalUID ???????????????
+</p -->
+
+<pre>
+TerminalUID=01234567
+</pre>
+
+<pre>
+Default:
+TerminalUID=FFFFFFFF
+</pre>
+
 </BODY>
 </HTML>

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2010-12-16 09:39:48 UTC (rev 4217)
+++ trunk/doc/en/html/setup/teraterm.html	2010-12-17 04:00:58 UTC (rev 4218)
@@ -43,6 +43,7 @@
  <li><a href="teraterm-term.html#StrictKeyMapping">Mapping of the function key</a></li>
  <li><a href="teraterm-term.html#Meta8Bit">Sending MSB set character with Alt key</a></li>
  <li><a href="teraterm-term.html#AltScr">Disabling the alternate screen buffer</a></li>
+ <li><a href="teraterm-term.html#TerminalUID">Terminal unique ID <!-- ???? ID ?????--></a></li>
 </ul>
 
 <h3>Window</h3>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-16 09:39:48 UTC (rev 4217)
+++ trunk/doc/ja/html/about/history.html	2010-12-17 04:00:58 UTC (rev 4218)
@@ -33,11 +33,15 @@
 
 <h3><a name="teraterm_4.69">2011.xx.xx (Ver 4.69)</a></h3>
 <ul class="history">
-  <!-- li>??
+  <li>??
     <ul>
-      <li></li>
+      <li>DA3 ???????????????????ID???????????B
+        <ul>
+          <li>teraterm.ini ? <a href="../setup/teraterm-term.html#TerminalUID">TerminalUID</a> ???????????????? FFFFFFFF?</li>
+          <li></li>
+        </ul></li>
     </ul>
-  </li -->
+  </li>
 
   <!-- li>????     <ul>

Modified: trunk/doc/ja/html/setup/teraterm-term.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-term.html	2010-12-16 09:39:48 UTC (rev 4217)
+++ trunk/doc/ja/html/setup/teraterm-term.html	2010-12-17 04:00:58 UTC (rev 4218)
@@ -428,5 +428,24 @@
 AlternateScreenBuffer=on
 </pre>
 
+<h1><a name="TerminalUID">????ID?????</a></h1>
+
+<p>
+Tera Term ? DA3 ??????????????????? ID ?????????? ID ? 8 ?? 16 ????????2 ???????A??? 6 ????????[?????????????????
+</p>
+
+<p>
+DA3 ??????????????????? ID ???????? 01234567 ?????????A??????? [Tera Term] ?????? TerminalUID ???????????????
+</p>
+
+<pre>
+TerminalUID=01234567
+</pre>
+
+<pre>
+???
+TerminalUID=FFFFFFFF
+</pre>
+
 </BODY>
 </HTML>

Modified: trunk/doc/ja/html/setup/teraterm.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm.html	2010-12-16 09:39:48 UTC (rev 4217)
+++ trunk/doc/ja/html/setup/teraterm.html	2010-12-17 04:00:58 UTC (rev 4218)
@@ -45,6 +45,7 @@
  <li><a href="teraterm-term.html#StrictKeyMapping">???????????????????</a></li>
  <li><a href="teraterm-term.html#Meta8Bit">Alt???MSB??????????????</a></li>
  <li><a href="teraterm-term.html#AltScr">??????????????</a></li>
+ <li><a href="teraterm-term.html#TerminalUID">????ID?????</a></li>
 </ul>
 
 <h3>?????</h3>

From svnnotify ＠ sourceforge.jp  Fri Dec 17 13:02:29 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 13:02:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMTldICDkvZnoqIjjgarlj6XngrnjgpI=?=
 =?utf-8?b?5YmK6Zmk44CC?=
Message-ID: <1292558549.603788.32221.nullmailer@users.sourceforge.jp>

Revision: 4219
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4219
Author:   doda
Date:     2010-12-17 13:02:29 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
篏??????????ゃ?

Modified Paths:
--------------
    trunk/doc/ja/html/setup/teraterm.html


-------------- next part --------------
Modified: trunk/doc/ja/html/setup/teraterm.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm.html	2010-12-17 04:00:58 UTC (rev 4218)
+++ trunk/doc/ja/html/setup/teraterm.html	2010-12-17 04:02:29 UTC (rev 4219)
@@ -43,7 +43,7 @@
  <li><a href="teraterm-term.html#UnknownUnicodeCharacterAsWide">???????Unicode???????????????????</a></li>
  <li><a href="teraterm-term.html#UnicodeDecSpMapping">Unicode??DEC????????????????</a></li>
  <li><a href="teraterm-term.html#StrictKeyMapping">???????????????????</a></li>
- <li><a href="teraterm-term.html#Meta8Bit">Alt???MSB??????????????</a></li>
+ <li><a href="teraterm-term.html#Meta8Bit">Alt???MSB?????????????</a></li>
  <li><a href="teraterm-term.html#AltScr">??????????????</a></li>
  <li><a href="teraterm-term.html#TerminalUID">????ID?????</a></li>
 </ul>

From svnnotify ＠ sourceforge.jp  Fri Dec 17 13:04:10 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 13:04:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjBdICDkvZnliIbjgarjgr/jgrDjgpI=?=
 =?utf-8?b?5YmK6Zmk44CC?=
Message-ID: <1292558650.836481.3472.nullmailer@users.sourceforge.jp>

Revision: 4220
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4220
Author:   doda
Date:     2010-12-17 13:04:10 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
篏??????違??????
Modified Paths:
--------------
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-17 04:02:29 UTC (rev 4219)
+++ trunk/doc/ja/html/about/history.html	2010-12-17 04:04:10 UTC (rev 4220)
@@ -38,7 +38,6 @@
       <li>DA3 ???????????????????ID???????????B
         <ul>
           <li>teraterm.ini ? <a href="../setup/teraterm-term.html#TerminalUID">TerminalUID</a> ???????????????? FFFFFFFF?</li>
-          <li></li>
         </ul></li>
     </ul>
   </li>

From svnnotify ＠ sourceforge.jp  Fri Dec 17 13:10:58 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 13:10:58 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjFdICBWVCDjgqbjgqPjg7Pjg4njgqY=?=
 =?utf-8?b?44Gu5qiq5bmF44KSIDI1NiDmoYHjgojjgorlpKfjgY3jgY/jgZnjgovjgag=?=
 =?utf-8?b?5q2j5bi444Gr6KGo56S644Gn44GN44Gq44GE44Gu44KS5L+u5q2j44CC?=
Message-ID: <1292559058.368545.14875.nullmailer@users.sourceforge.jp>

Revision: 4221
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4221
Author:   doda
Date:     2010-12-17 13:10:58 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
VT ????潟????罔????256 罅????ぇ?????????絽吾?茵?ず?с???????篆????http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=18206
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=19632

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


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-17 04:04:10 UTC (rev 4220)
+++ trunk/doc/en/html/about/history.html	2010-12-17 04:10:58 UTC (rev 4221)
@@ -44,7 +44,7 @@
 
   <!-- li>Bug fixes
     <ul>
-      <li></li>
+      <li>?????? 256 ??????????\ｦ???????????B</li>
     </ul>
   </li -->
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-17 04:04:10 UTC (rev 4220)
+++ trunk/doc/ja/html/about/history.html	2010-12-17 04:10:58 UTC (rev 4221)
@@ -42,11 +42,11 @@
     </ul>
   </li>
 
-  <!-- li>????+  <li>????     <ul>
-      <li></li>
+      <li>?????? 256 ??????????\ｦ???????????B</li>
     </ul>
-  </li -->
+  </li>
 
   <li>???
     <ul>

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2010-12-17 04:04:10 UTC (rev 4220)
+++ trunk/teraterm/teraterm/vtdisp.c	2010-12-17 04:10:58 UTC (rev 4221)
@@ -44,7 +44,7 @@
 static int WinWidthOld, WinHeightOld;
 static HBRUSH Background;
 static COLORREF ANSIColor[256];
-static int Dx[256];
+static int Dx[TermWidthMax];
 
 // caret variables
 static int CaretStatus;
@@ -1956,7 +1956,7 @@
 
   SetLogFont();
 
-  for (i = 0 ; i <= 255; i++)
+  for (i = 0 ; i < TermWidthMax; i++)
     Dx[i] = FontWidth;
 }
 

From svnnotify ＠ sourceforge.jp  Fri Dec 17 13:13:38 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 13:13:38 +0900
Subject: [Ttssh2-commit] [4222] 256 -> 257
Message-ID: <1292559218.553695.19703.nullmailer@users.sourceforge.jp>

Revision: 4222
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4222
Author:   doda
Date:     2010-12-17 13:13:38 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
256 -> 257
# ?????? 256 ?障? OK ?????????罅???с???? 257 罅???уぇ筝?か?????
Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-17 04:10:58 UTC (rev 4221)
+++ trunk/doc/en/html/about/history.html	2010-12-17 04:13:38 UTC (rev 4222)
@@ -44,7 +44,7 @@
 
   <!-- li>Bug fixes
     <ul>
-      <li>?????? 256 ??????????\ｦ???????????B</li>
+      <li>?????? 257 ??????????\ｦ???????????B</li>
     </ul>
   </li -->
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-17 04:10:58 UTC (rev 4221)
+++ trunk/doc/ja/html/about/history.html	2010-12-17 04:13:38 UTC (rev 4222)
@@ -44,7 +44,7 @@
 
   <li>????     <ul>
-      <li>?????? 256 ??????????\ｦ???????????B</li>
+      <li>?????? 257 ??????????\ｦ???????????B</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Fri Dec 17 13:53:10 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 13:53:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjNdICDnq6/mnKvlm7rmnIkgSUQg44Gr?=
 =?utf-8?b?6YOo5YiG44KS5L+u5q2j44CC?=
Message-ID: <1292561590.199508.20376.nullmailer@users.sourceforge.jp>

Revision: 4223
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4223
Author:   doda
Date:     2010-12-17 13:53:10 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
腴???堺? ID ??????篆????
Modified Paths:
--------------
    trunk/doc/en/html/about/ctrlseq.html
    trunk/doc/ja/html/about/ctrlseq.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/ctrlseq.html
===================================================================
--- trunk/doc/en/html/about/ctrlseq.html	2010-12-17 04:13:38 UTC (rev 4222)
+++ trunk/doc/en/html/about/ctrlseq.html	2010-12-17 04:53:10 UTC (rev 4223)
@@ -276,7 +276,8 @@
 <tr><td>CSI = <i>Ps</i> c</td>	<td>DA3 (Tertiary DA)</td>	<td> Tertiary Device Attribute. The default value of <i>Ps</i> is 0.
 <pre>
 <i>Ps</i> = 0      Tertiary Device Attribute request.
-            Response: DCS ! | FFFFFFFF ST
+            Response: DCS ! | <i>dddddddd</i> ST
+              <i>dddddddd</i>  <a href="../setup/teraterm-term.html#TerminalUID">Terminal Unique ID</a>
 </pre>
 </td></tr>
 

Modified: trunk/doc/ja/html/about/ctrlseq.html
===================================================================
--- trunk/doc/ja/html/about/ctrlseq.html	2010-12-17 04:13:38 UTC (rev 4222)
+++ trunk/doc/ja/html/about/ctrlseq.html	2010-12-17 04:53:10 UTC (rev 4223)
@@ -267,7 +267,8 @@
 <tr><td>CSI = <i>Ps</i> c</td>	<td>DA3 (Tertiary DA)</td>	<td>?????????????<i>Ps</i> ??? 0?
 <pre>
 <i>Ps</i> = 0      ????????
-            ??: DCS ! | FFFFFFFF ST
+            ??: DCS ! | <i>dddddddd</i> ST
+              <i>dddddddd</i>  <a href="../setup/teraterm-term.html#TerminalUID">????ID</a>
 </pre>
 </td></tr>
 

From svnnotify ＠ sourceforge.jp  Fri Dec 17 13:59:28 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 13:59:28 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjRdICDjg4bjgrnjg4jnlKjjgasgLyBT?=
 =?utf-8?b?SVpFIOOCquODl+OCt+ODp+ODs+OCkui/veWKoOOAgg==?=
Message-ID: <1292561968.350204.29655.nullmailer@users.sourceforge.jp>

Revision: 4224
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4224
Author:   doda
Date:     2010-12-17 13:59:28 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
テスト用に /SIZE オプションを追加。

Modified Paths:
--------------
    trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c


-------------- next part --------------
Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c	2010-12-17 04:53:10 UTC (rev 4223)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c	2010-12-17 04:59:28 UTC (rev 4224)
@@ -84,6 +84,7 @@
 static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
   char buff[1024];
   PCHAR cur, next;
+  int x, y;
 
   cur = Param;
   while (next = GetParam(buff, sizeof(buff), cur)) {
@@ -95,6 +96,13 @@
       ColorStr2ColorRef(&(ts->VTColor[1]), &buff[4]);
       memset(cur, ' ', next - cur);
     }
+    else if (_strnicmp(buff, "/SIZE=", 6) == 0) {
+      if (sscanf_s(buff+6, "%dx%d", &x, &y) == 2 || sscanf_s(buff+6, "%d,%d", &x, &y) == 2) {
+	ts->TerminalWidth = x;
+	ts->TerminalHeight = y;
+      }
+      memset(cur, ' ', next - cur);
+    }
     cur = next;
   }
 

From svnnotify ＠ sourceforge.jp  Fri Dec 17 15:10:40 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 15:10:40 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjVdICBERUNTVFVJIOOBq+WvvuW/nA==?=
	=?utf-8?b?44CC?=
Message-ID: <1292566240.518039.18815.nullmailer@users.sourceforge.jp>

Revision: 4225
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4225
Author:   doda
Date:     2010-12-17 15:10:40 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
DECSTUI に対応。

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2010-12-17 04:59:28 UTC (rev 4224)
+++ trunk/installer/release/TERATERM.INI	2010-12-17 06:10:40 UTC (rev 4225)
@@ -416,6 +416,9 @@
 ; Language selection
 LanguageSelection=on
 
+; Lock Terminal Unique ID
+LockTUID=on
+
 ; Max scroll buffer size
 MaxBuffSize=500000
 

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2010-12-17 04:59:28 UTC (rev 4224)
+++ trunk/teraterm/common/tttypes.h	2010-12-17 06:10:40 UTC (rev 4225)
@@ -189,6 +189,7 @@
 #define TF_BACKWRAP           128
 #define TF_CLEARONRESIZE      256
 #define TF_ALTSCR             512
+#define TF_LOCKTUID           1024
 
 // ANSI/Attribute color flags (used in ts.ColorFlag)
 #define CF_PCBOLD16     1

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-17 04:59:28 UTC (rev 4224)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-17 06:10:40 UTC (rev 4225)
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <mbstring.h>
 #include <locale.h>
+#include <ctype.h>
 
 #include "buffer.h"
 #include "ttwinman.h"
@@ -924,8 +925,10 @@
     case DCS:
       SavedMode = ParseMode;
       ESCFlag = FALSE;
+      ICount = 0;
       NParam = 1;
       Param[1] = -1;
+      Prv = 0;
       ParseMode = ModeDCS;
       break;
     case SOS:
@@ -2905,49 +2908,104 @@
   FirstPrm = FALSE;
 }
 
+#define ModeDcsFirst     1
+#define ModeDcsString    2
 void DeviceControl(BYTE b)
 {
-  if (ESCFlag && (b=='\\') || (b==ST && ts.KanjiCode!=IdSJIS))
-  {
-    ESCFlag = FALSE;
-    ParseMode = SavedMode;
-    return;
-  }
+	static char StrBuff[256];
+	static int DcsParseMode = ModeDcsFirst;
+	static int StrLen;
+	static char Cmd;
 
-  if (b==ESC)
-  {
-    ESCFlag = TRUE;
-    return;
-  }
-  else ESCFlag = FALSE;
+	if ((ESCFlag && (b=='\\')) || (b==ST && ts.KanjiCode!=IdSJIS)) {
+		if (DcsParseMode == ModeDcsString) {
+			StrBuff[StrLen] = 0;
+			switch (ICount) {
+			case 0:
+				break;
+			case 1:
+				if (IntChar[1] == '!' && Cmd == '{') { // DECSTUI
+					if (! (ts.TermFlag & TF_LOCKTUID)) {
+						int i;
+						for (i=0; i<8 && isxdigit(StrBuff[i]); i++) {
+							if (islower(StrBuff[i])) {
+								StrBuff[i] = toupper(StrBuff[i]);
+							}
+						}
+						if (StrLen == 8 && i == 8) {
+							strncpy_s(ts.TerminalUID, sizeof(ts.TerminalUID), StrBuff, _TRUNCATE);
+						}
+					}
+				}
+				break;
+			default:
+				break;
+			}
+		}
+		ESCFlag = FALSE;
+		ParseMode = SavedMode;
+		DcsParseMode = ModeDcsFirst;
+		StrLen = 0;
+		return;
+	}
 
-  if (b<=US)
-    ParseControl(b);
-  else if ((b>=0x30) && (b<=0x39))
-  {
-    if (Param[NParam] < 0) Param[NParam] = 0;
-    if (Param[NParam]<1000)
-      Param[NParam] = Param[NParam]*10 + b - 0x30;
-  }
-  else if (b==0x3B)
-  {
-    if (NParam < NParamMax)
-    {
-      NParam++;
-      Param[NParam] = -1;
-    }
-  }
-  else if ((b>=0x40) && (b<=0x7E))
-  {
-    if (b=='|')
-    {
-      ParseMode = ModeDCUserKey;
-      if (Param[1] < 1) ClearUserKey();
-      WaitKeyId = TRUE;
-      NewKeyId = 0;
-    }
-    else ParseMode = ModeSOS;
-  }
+	if (b==ESC) {
+		ESCFlag = TRUE;
+		return;
+	}
+	else {
+		ESCFlag = FALSE;
+	}
+
+	switch (DcsParseMode) {
+	case ModeDcsFirst:
+		if (b<=US) {
+			ParseControl(b);
+		}
+		else if ((b>=0x20) && (b<=0x2F)) {
+			if (ICount<IntCharMax) ICount++;
+			IntChar[ICount] = b;
+		}
+		else if ((b>=0x30) && (b<=0x39)) {
+			if (Param[NParam] < 0) Param[NParam] = 0;
+			if (Param[NParam]<1000)
+				Param[NParam] = Param[NParam]*10 + b - 0x30;
+		}
+		else if (b==0x3B) {
+			if (NParam < NParamMax) {
+				NParam++;
+				Param[NParam] = -1;
+			}
+		}
+		else if ((b>=0x40) && (b<=0x7E)) {
+			if (ICount == 0 && b=='|') {
+				ParseMode = ModeDCUserKey;
+				if (Param[1] < 1) ClearUserKey();
+				WaitKeyId = TRUE;
+				NewKeyId = 0;
+			}
+			else {
+				Cmd = b;
+				DcsParseMode = ModeDcsString;
+			}
+		}
+		else {
+			ParseMode = ModeSOS;
+		}
+		break;
+
+	case ModeDcsString:
+		if (b <= US && b != HT && b != CR) {
+			ESCFlag = FALSE;
+			ParseMode = SavedMode;
+			DcsParseMode = ModeDcsFirst;
+			StrLen = 0;
+		}
+		else if (StrLen < sizeof(StrBuff)-1) {
+			StrBuff[StrLen++] = b;
+		}
+		break;
+	}
 }
 
 void DCUserKey(BYTE b)

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2010-12-17 04:59:28 UTC (rev 4224)
+++ trunk/teraterm/ttpset/ttset.c	2010-12-17 06:10:40 UTC (rev 4225)
@@ -1386,6 +1386,10 @@
 	else {
 		strncpy_s(ts->TerminalUID, sizeof(ts->TerminalUID), "FFFFFFFF", _TRUNCATE);
 	}
+
+	// Lock Terminal UID
+	if (GetOnOff(Section, "LockTUID", FName, TRUE))
+		ts->TermFlag |= TF_LOCKTUID;
 }
 
 void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2406,6 +2410,9 @@
 
 	// Terminal Unique ID
 	WritePrivateProfileString(Section, "TerminalUID", ts->TerminalUID, FName);
+
+	// Lock Terminal UID
+	WritePrivateProfileString(Section, "LockTUID", FName, ts->TermFlag & TF_LOCKTUID);
 }
 
 #define VTEditor "VT editor keypad"

From svnnotify ＠ sourceforge.jp  Fri Dec 17 16:37:29 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 16:37:29 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4226=5D__isdigit_=E3=81=AB_char_?=
 =?utf-8?b?5aSJ5pWw44KS5rih44GX44Gm44GE44Gf44Gu44KS5L+u5q2j44CC?=
Message-ID: <1292571449.263601.24716.nullmailer@users.sourceforge.jp>

Revision: 4226
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4226
Author:   doda
Date:     2010-12-17 16:37:29 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
isdigit に char 変数を渡していたのを修正。

Modified Paths:
--------------
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
    trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c


-------------- next part --------------
Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2010-12-17 06:10:40 UTC (rev 4225)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2010-12-17 07:37:29 UTC (rev 4226)
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttplugin.h"
@@ -80,11 +81,11 @@
   }
 }
 
-void ParseInputStr(char *rstr, int rcount) {
+void ParseInputStr(unsigned char *rstr, int rcount) {
   static WORD mode = IdModeFirst;
-  static char buff[InBuffSize];
+  static unsigned char buff[InBuffSize];
   static unsigned int blen;
-  char *p;
+  unsigned char *p;
   int i;
   unsigned int func;
 

Modified: trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c	2010-12-17 06:10:40 UTC (rev 4225)
+++ trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c	2010-12-17 07:37:29 UTC (rev 4226)
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttplugin.h"
@@ -107,11 +108,11 @@
   pvar->cv->OutBuffCount = c;
 }
 
-void ParseInputStr(char *rstr, int rcount) {
+void ParseInputStr(unsigned char *rstr, int rcount) {
   static WORD mode = IdModeFirst;
-  static char buff[InBuffSize];
+  static unsigned char buff[InBuffSize];
   static unsigned int blen;
-  char *p, *p2;
+  unsigned char *p, *p2;
   int i;
   unsigned int func;
 

From svnnotify ＠ sourceforge.jp  Fri Dec 17 16:41:25 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 16:41:25 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjddICBjdHlwZSDns7vplqLmlbDjgas=?=
 =?utf-8?b?6LKg44Gu5YCk44KS5rih44GV44Gq44GE44KI44GG44Gr44GZ44KL44Gf44KB?=
 =?utf-8?b?44CBdW5zaWduZWQgY2hhciDjgbjlpInmm7TjgII=?=
Message-ID: <1292571685.982691.31069.nullmailer@users.sourceforge.jp>

Revision: 4227
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4227
Author:   doda
Date:     2010-12-17 16:41:25 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
ctype 系関数に負の値を渡さないようにするため、unsigned char へ変更。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-17 07:37:29 UTC (rev 4226)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-17 07:41:25 UTC (rev 4227)
@@ -2912,7 +2912,7 @@
 #define ModeDcsString    2
 void DeviceControl(BYTE b)
 {
-	static char StrBuff[256];
+	static unsigned char StrBuff[256];
 	static int DcsParseMode = ModeDcsFirst;
 	static int StrLen;
 	static char Cmd;

From svnnotify ＠ sourceforge.jp  Fri Dec 17 16:53:37 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 17 Dec 2010 16:53:37 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjhdICDjg7tpc3hkaWdpdCDjgasgY2hh?=
 =?utf-8?b?ciDlpInmlbDjgpLmuKHjgZfjgabjgYTjgZ/jga7jgpLkv67mraPjgII=?=
Message-ID: <1292572417.815775.17650.nullmailer@users.sourceforge.jp>

Revision: 4228
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4228
Author:   doda
Date:     2010-12-17 16:53:37 +0900 (Fri, 17 Dec 2010)

Log Message:
-----------
・isxdigit に char 変数を渡していたのを修正。
・LockTUID の設定保存がおかしかったのを修正。

Modified Paths:
--------------
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2010-12-17 07:41:25 UTC (rev 4227)
+++ trunk/teraterm/ttpset/ttset.c	2010-12-17 07:53:37 UTC (rev 4228)
@@ -1368,7 +1368,7 @@
 	// Terminal Unique ID
 	GetPrivateProfileString(Section, "TerminalUID", "FFFFFFFF", Temp, sizeof(Temp), FName);
 	if (strlen(Temp) == 8) {
-		for (i=0; i<8 && isxdigit(Temp[i]); i++) {
+		for (i=0; i<8 && isxdigit((unsigned char)Temp[i]); i++) {
 			if (islower(Temp[i])) {
 				ts->TerminalUID[i] = toupper(Temp[i]);
 			}
@@ -2412,7 +2412,7 @@
 	WritePrivateProfileString(Section, "TerminalUID", ts->TerminalUID, FName);
 
 	// Lock Terminal UID
-	WritePrivateProfileString(Section, "LockTUID", FName, ts->TermFlag & TF_LOCKTUID);
+	WriteOnOff(Section, "LockTUID", FName, ts->TermFlag & TF_LOCKTUID);
 }
 
 #define VTEditor "VT editor keypad"

From svnnotify ＠ sourceforge.jp  Sat Dec 18 22:04:43 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 18 Dec 2010 22:04:43 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMjldICBTU0gg44Ko44O844K444Kn44Oz?=
 =?utf-8?b?44OI6Lui6YCB44Gu6KaB5rGC44GM44Kv44Op44Kk44Ki44Oz44OI44GL44KJ?=
 =?utf-8?b?5p2l44Gf44Go44GN44CBUGFnZWFudCDjgavlj5bjgormrKHjgZDjgYvjgak=?=
 =?utf-8?b?44GG44GL44Om44O844K244Gr56K66KqN44GZ44KL44KI44GG44Gr44GX44Gf?=
 =?utf-8?b?44CC?=
Message-ID: <1292677483.301710.3072.nullmailer@users.sourceforge.jp>

Revision: 4229
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4229
Author:   maya
Date:     2010-12-18 22:04:43 +0900 (Sat, 18 Dec 2010)

Log Message:
-----------
SSH ????吾??潟?荵∫????羆??????ゃ??潟?????ャ??????ageant ????罨＜???????????吟?腆肴?????????????
  ????ゃ??潟???? CHANNEL_OPEN ???????鴻? MessageBox ???????с???
Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/setup-ssh.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/setup-ssh.html
    trunk/installer/release/TERATERM.INI
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/ttssh2/ttxssh/fwd.c
    trunk/ttssh2/ttxssh/fwd.h
    trunk/ttssh2/ttxssh/resource.h
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h
    trunk/ttssh2/ttxssh/ttxssh.rc


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/en/html/about/history.html	2010-12-18 13:04:43 UTC (rev 4229)
@@ -1614,7 +1614,7 @@
 <ul class="history">
   <!-- li>Changes
     <ul>
-     <li></li>
+     <li>SSH???????????????????????????????????????????</li>
     </ul>
   </li -->
 

Modified: trunk/doc/en/html/menu/setup-ssh.html
===================================================================
--- trunk/doc/en/html/menu/setup-ssh.html	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/en/html/menu/setup-ssh.html	2010-12-18 13:04:43 UTC (rev 4229)
@@ -48,6 +48,11 @@
       <dd>
       The SSH agent forwarding is enabled using by the Pageant application.
       </dd>
+
+      <dt>Confirm agent forwarding</dt>
+      <!--dd>
+	?????? SSH ??????????????????????? Pageant ?????????????????????
+      </dd-->
     </dl>
   </body>
 </html>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/ja/html/about/history.html	2010-12-18 13:04:43 UTC (rev 4229)
@@ -1614,11 +1614,11 @@
 
 <h3><a name="ttssh_2.56">2011.xx.xx (Ver 2.56)</a></h3>
 <ul class="history">
-  <!-- li>??
+  <li>??
     <ul>
-     <li></li>
+     <li>SSH???????????????????????????????????????????</li>
     </ul>
-  </li -->
+  </li>
 
   <li>????     <ul>

Modified: trunk/doc/ja/html/menu/setup-ssh.html
===================================================================
--- trunk/doc/ja/html/menu/setup-ssh.html	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/ja/html/menu/setup-ssh.html	2010-12-18 13:04:43 UTC (rev 4229)
@@ -46,6 +46,11 @@
       <dd>
 	Pageant ????? SSH ????????????????
       </dd>
+
+      <dt>Confirm agent forwarding</dt>
+      <dd>
+	?????? SSH ??????????????????????? Pageant ?????????????????????
+      </dd>
     </dl>
   </body>
 </html>

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/TERATERM.INI	2010-12-18 13:04:43 UTC (rev 4229)
@@ -649,6 +649,9 @@
 ; SSH agent forwarding (pageant) (1=enabled 0=disabled)
 ForwardAgent=0
 
+; Confirm SSH agent forwarding (1=enabled 0=disabled)
+ForwardAgentConfirm=1
+
 [TTProxy]
 ConnectionTimeout="10"
 SocksResolve="auto"

Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/English.lng	2010-12-18 13:04:43 UTC (rev 4229)
@@ -615,6 +615,7 @@
 DLG_SSHSETUP_HEARTBEAT_UNIT=sec.(0 to turn off)
 DLG_SSHSETUP_PASSWORD=Remember password on &memory
 DLG_SSHSETUP_FORWARDAGENT=Enable &agent forwarding
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
 DLG_SSHSETUP_NOTICE=All options take effect the next time a session is started.
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choose a read/write known-hosts file
@@ -663,6 +664,7 @@
 MSG_FWD_DENIED_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the local X server.\nYou did not specify this forwarding to TTSSH in advance, and therefore the request was denied.
 MSG_FWD_DENIED_BY_SERVER_ERROR=A program on the local machine attempted to connect to a forwarded port.\nThe forwarding request was denied by the server. The connection has been closed.
 MSG_FWD_COMM_ERROR=A communications error occurred while sending forwarded data to a local port.\nThe forwarded connection will be closed.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
 
 ; hosts.c
 MSG_HOSTS_READ_ENOENT_ERROR=An error occurred while trying to read a known_hosts file.\nThe specified filename does not exist.

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/French.lng	2010-12-18 13:04:43 UTC (rev 4229)
@@ -614,6 +614,7 @@
 DLG_SSHSETUP_HEARTBEAT_UNIT=sec.(0 pour ?eindre)
 DLG_SSHSETUP_PASSWORD=Garder mot de passe en m?oire
 DLG_SSHSETUP_FORWARDAGENT=Activer &agent forwarding
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
 DLG_SSHSETUP_NOTICE=Toutes options actives prochaine ouverture de session
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choisir un fichier h?es connus en R/W
@@ -662,6 +663,7 @@
 MSG_FWD_DENIED_X_ERROR=Le serveur a essay?de rediriger une connexion ?travers cette machine.\nIl a demand?une connexion au serveur X local.\nVous n'aviez pas sp?ifi?cette redirection par avance ?TTSSH, par cons?uent la requ?e a ??refus?.
 MSG_FWD_DENIED_BY_SERVER_ERROR=Un programme sur la machine locale a essay?de se connecter ?un port redirig?\nLa demande de redirection a ??refus? par le serveur. La connexion a ??ferm?.
 MSG_FWD_COMM_ERROR=Une erreur de communication est survenue lors de l'envoi de donn?s redirig?s vers un port local.\nLa connexion redirig? va ?re ferm?.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
 
 ; hosts.c
 MSG_HOSTS_READ_ENOENT_ERROR=Une erreur est apparue lors d'une tentative de lecture d'un fichier d'h?es connus.\nLe nom de fichier n'existe pas.

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/German.lng	2010-12-18 13:04:43 UTC (rev 4229)
@@ -612,6 +612,7 @@
 DLG_SSHSETUP_HEARTBEAT=HeartBeat(&keep-alive)
 DLG_SSHSETUP_HEARTBEAT_UNIT=sec.(0 to turn off)
 DLG_SSHSETUP_FORWARDAGENT=Enable &agent forwarding
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
 DLG_SSHSETUP_NOTICE=Die Einstellungen werden beim Start der n?hsten Sitzung aktiv.
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choose a read/write known-hosts file
@@ -660,6 +661,7 @@
 MSG_FWD_DENIED_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the local X server.\nYou did not specify this forwarding to TTSSH in advance, and therefore the request was denied.
 MSG_FWD_DENIED_BY_SERVER_ERROR=A program on the local machine attempted to connect to a forwarded port.\nThe forwarding request was denied by the server. The connection has been closed.
 MSG_FWD_COMM_ERROR=A communications error occurred while sending forwarded data to a local port.\nThe forwarded connection will be closed.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
 
 ; hosts.c
 MSG_HOSTS_READ_ENOENT_ERROR=An error occurred while trying to read a known_hosts file.\nThe specified filename does not exist.

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/Japanese.lng	2010-12-18 13:04:43 UTC (rev 4229)
@@ -615,6 +615,7 @@
 DLG_SSHSETUP_HEARTBEAT_UNIT=?(0????????)
 DLG_SSHSETUP_PASSWORD=???????????L???(&M)
 DLG_SSHSETUP_FORWARDAGENT=??????????????(&A)
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=?????????????(&O)
 DLG_SSHSETUP_NOTICE=????????????????????????.
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=????pknownhosts?????????????
@@ -663,6 +664,7 @@
 MSG_FWD_DENIED_X_ERROR=??????????????????.\n?????X ??????????????.\nTTSSH ?????????????????, ?????????.
 MSG_FWD_DENIED_BY_SERVER_ERROR=?????????v??????????????????.\n?????????????????. ???????.
 MSG_FWD_COMM_ERROR=?????????????????, ????????????.\n?????????.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=???????????????????
 
 ; hosts.c
 MSG_HOSTS_READ_ENOENT_ERROR=known_hosts ????????????????. \n?????????????????.

Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/fwd.c	2010-12-18 13:04:43 UTC (rev 4229)
@@ -1914,3 +1914,22 @@
 		DestroyWindow(pvar->fwd_state.accept_wnd);
 	}
 }
+
+BOOL FWD_agent_forword_confirm(PTInstVar pvar)
+{
+	HWND cur_active = GetActiveWindow();
+	pvar->session_settings.ForwardAgentConfirm = 1;
+	if (pvar->session_settings.ForwardAgentConfirm) {
+		UTIL_get_lang_msg("MSG_FWD_AGENT_FORWARDING_CONFIRM", pvar,
+		                  "Accept agent forwading request?");
+		if (MessageBox(cur_active != NULL ? cur_active : pvar->NotificationWindow,
+		               pvar->ts->UIMsg, "TTSSH",
+		               MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) {
+			return TRUE;
+		}
+		else {
+			return FALSE;
+		}
+	}
+	return TRUE;
+}

Modified: trunk/ttssh2/ttxssh/fwd.h
===================================================================
--- trunk/ttssh2/ttxssh/fwd.h	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/fwd.h	2010-12-18 13:04:43 UTC (rev 4229)
@@ -168,5 +168,6 @@
 void FWD_free_channel(PTInstVar pvar, uint32 local_channel_num);
 int FWD_check_local_channel_num(PTInstVar pvar, int local_num);
 int FWD_agent_open(PTInstVar pvar, uint32 remote_channel_num);
+BOOL FWD_agent_forword_confirm(PTInstVar pvar);
 
 #endif

Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/resource.h	2010-12-18 13:04:43 UTC (rev 4229)
@@ -81,6 +81,7 @@
 #define IDC_FORWARDAGENT                1055
 #define IDC_TTSSH_VERSION               1056
 #define IDC_FORWARD_AGENT               1056
+#define IDC_FORWARDAGENTCONFIRM         1056
 #define IDC_RSA1_TYPE                   1057
 #define IDC_RSA_TYPE                    1058
 #define IDC_DSA_TYPE                    1059

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ssh.c	2010-12-18 13:04:43 UTC (rev 4229)
@@ -1961,7 +1961,7 @@
 		int remote_id = get_payload_uint32(pvar, 0);
 		int local_id;
 
-		if (pvar->agentfwd_enable) {
+		if (pvar->agentfwd_enable && FWD_agent_forword_confirm(pvar)) {
 			local_id = FWD_agent_open(pvar, remote_id);
 			if (local_id == -1) {
 				SSH_fail_channel_open(pvar, remote_id);
@@ -8914,7 +8914,7 @@
 		c->remote_maxpacket = remote_maxpacket;
 
 	} else if (strcmp(ctype, "auth-agent ＠ openssh.com") == 0) { // agent forwarding
-		if (pvar->agentfwd_enable) {
+		if (pvar->agentfwd_enable && FWD_agent_forword_confirm(pvar)) {
 			c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_AGENT, chan_num);
 			if (c == NULL) {
 				UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2010-12-18 13:04:43 UTC (rev 4229)
@@ -363,6 +363,9 @@
 	// agent forward ?????? (2008.11.25 maya)
 	settings->ForwardAgent = read_BOOL_option(fileName, "ForwardAgent", FALSE);
 
+	// agent forward ????????
+	settings->ForwardAgentConfirm = read_BOOL_option(fileName, "ForwardAgentConfirm", TRUE);
+
 	clear_local_settings(pvar);
 }
 
@@ -439,6 +442,10 @@
 	// agent forward ?????? (2008.11.25 maya)
 	WritePrivateProfileString("TTSSH", "ForwardAgent",
 	                          settings->ForwardAgent ? "1" : "0", fileName);
+
+	// agent forward ????????
+	WritePrivateProfileString("TTSSH", "ForwardAgentConfirm",
+	                          settings->ForwardAgentConfirm ? "1" : "0", fileName);
 }
 
 
@@ -2459,6 +2466,9 @@
 	GetDlgItemText(dlg, IDC_FORWARDAGENT, uimsg, sizeof(uimsg));
 	UTIL_get_lang_msg("DLG_SSHSETUP_FORWARDAGENT", pvar, uimsg);
 	SetDlgItemText(dlg, IDC_FORWARDAGENT, pvar->ts->UIMsg);
+	GetDlgItemText(dlg, IDC_FORWARDAGENTCONFIRM, uimsg, sizeof(uimsg));
+	UTIL_get_lang_msg("DLG_SSHSETUP_FORWARDAGENTCONFIRM", pvar, uimsg);
+	SetDlgItemText(dlg, IDC_FORWARDAGENTCONFIRM, pvar->ts->UIMsg);
 	GetDlgItemText(dlg, IDC_NOTICEBANNER, uimsg, sizeof(uimsg));
 	UTIL_get_lang_msg("DLG_SSHSETUP_NOTICE", pvar, uimsg);
 	SetDlgItemText(dlg, IDC_NOTICEBANNER, pvar->ts->UIMsg);
@@ -2516,6 +2526,12 @@
 	if (pvar->settings.ForwardAgent) {
 		CheckDlgButton(dlg, IDC_FORWARDAGENT, TRUE);
 	}
+	else {
+		EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), FALSE);
+	}
+	if (pvar->settings.ForwardAgentConfirm) {
+		CheckDlgButton(dlg, IDC_FORWARDAGENTCONFIRM, TRUE);
+	}
 }
 
 void get_teraterm_dir_relative_name(char FAR * buf, int bufsize,
@@ -2656,6 +2672,7 @@
 
 	pvar->settings.remember_password = IsDlgButtonChecked(dlg, IDC_REMEMBERPASSWORD);
 	pvar->settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARDAGENT);
+	pvar->settings.ForwardAgentConfirm = IsDlgButtonChecked(dlg, IDC_FORWARDAGENTCONFIRM);
 }
 
 static void move_cur_sel_delta(HWND listbox, int delta)
@@ -2784,6 +2801,7 @@
 			SendDlgItemMessage(dlg, IDC_HEARTBEATLABEL2, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_REMEMBERPASSWORD, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_FORWARDAGENT, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_FORWARDAGENTCONFIRM, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 		}
@@ -2827,6 +2845,14 @@
 		case IDC_CHOOSEREADONLYFILE:
 			choose_read_only_file(dlg);
 			return TRUE;
+		case IDC_FORWARDAGENT:
+			if (!IsDlgButtonChecked(dlg, IDC_FORWARDAGENT)) {
+				EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), FALSE);
+			}
+			else {
+				EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), TRUE);
+			}
+			return TRUE;
 		}
 		break;
 	}

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2010-12-18 13:04:43 UTC (rev 4229)
@@ -135,6 +135,9 @@
 
 	// Enable Agent forwarding
 	BOOL ForwardAgent;
+
+	// Confirm Agent forwarding
+	BOOL ForwardAgentConfirm;
 } TS_SSH;
 
 typedef struct _TInstVar {

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2010-12-18 13:04:43 UTC (rev 4229)
@@ -135,7 +135,7 @@
     CONTROL         "S&erial",IDC_HOSTSERIAL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,89,37,8
 END
 
-IDD_SSHSETUP DIALOGEX 0, 0, 223, 269
+IDD_SSHSETUP DIALOGEX 0, 0, 223, 282
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TTSSH: Setup"
 FONT 8, "Tahoma", 0, 0, 0x0
@@ -148,20 +148,22 @@
     LISTBOX         IDC_SSHCIPHERPREFS,31,45,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     PUSHBUTTON      "Move &Up",IDC_SSHMOVECIPHERUP,43,110,58,13,WS_GROUP
     PUSHBUTTON      "Move &Down",IDC_SSHMOVECIPHERDOWN,117,110,58,13
-    GROUPBOX        "SSH Known Hosts",IDC_KNOWNHOSTS,7,138,209,52
-    PUSHBUTTON      "Read/&write file:",IDC_CHOOSEREADWRITEFILE,14,149,63,14
-    EDITTEXT        IDC_READWRITEFILENAME,83,150,126,13,ES_AUTOHSCROLL | WS_GROUP
-    PUSHBUTTON      "&Read-only files:",IDC_CHOOSEREADONLYFILE,14,167,63,14
-    EDITTEXT        IDC_READONLYFILENAME,83,168,126,13,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "HeartBeat(&keep-alive)",IDC_HEARTBEATLABEL,17,196,83,8
-    EDITTEXT        IDC_HEARTBEAT_EDIT,102,194,26,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
-    LTEXT           "sec.(0 to turn off)",IDC_HEARTBEATLABEL2,134,196,77,8
+    GROUPBOX        "SSH Known Hosts",IDC_KNOWNHOSTS,7,134,209,52
+    PUSHBUTTON      "Read/&write file:",IDC_CHOOSEREADWRITEFILE,14,145,63,14
+    EDITTEXT        IDC_READWRITEFILENAME,83,146,126,13,ES_AUTOHSCROLL | WS_GROUP
+    PUSHBUTTON      "&Read-only files:",IDC_CHOOSEREADONLYFILE,14,163,63,14
+    EDITTEXT        IDC_READONLYFILENAME,83,164,126,13,ES_AUTOHSCROLL | WS_GROUP
+    LTEXT           "HeartBeat(&keep-alive)",IDC_HEARTBEATLABEL,17,193,83,8
+    EDITTEXT        IDC_HEARTBEAT_EDIT,102,191,26,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
+    LTEXT           "sec.(0 to turn off)",IDC_HEARTBEATLABEL2,134,193,77,8
     CONTROL         "Remember password in &memory",IDC_REMEMBERPASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,210,187,10
-    CONTROL         "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,224,187,10
-    DEFPUSHBUTTON   "OK",IDOK,49,253,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,119,253,50,14
-    LTEXT           "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,238,187,12
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,207,187,10
+    CONTROL         "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,221,187,10
+    CONTROL         "C&onfirm agent forwarding",IDC_FORWARDAGENTCONFIRM,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,235,187,10
+    LTEXT           "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,249,187,12
+    DEFPUSHBUTTON   "OK",IDOK,49,263,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,119,263,50,14
 END
 
 IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 242
@@ -390,7 +392,10 @@
 
     IDD_SSHSETUP, DIALOG
     BEGIN
-        BOTTOMMARGIN, 267
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 216
+        TOPMARGIN, 4
+        BOTTOMMARGIN, 277
     END
 
     IDD_SSHUNKNOWNHOST, DIALOG

From svnnotify ＠ sourceforge.jp  Sun Dec 19 20:07:47 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 19 Dec 2010 20:07:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzBdICDjgrPjg6Hjg7Pjg4jkv67mraM=?=
Message-ID: <1292756867.877640.25759.nullmailer@users.sourceforge.jp>

Revision: 4230
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4230
Author:   doda
Date:     2010-12-19 20:07:47 +0900 (Sun, 19 Dec 2010)

Log Message:
-----------
コメント修正

Modified Paths:
--------------
    trunk/teraterm/common/tttypes.h


-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2010-12-18 13:04:43 UTC (rev 4229)
+++ trunk/teraterm/common/tttypes.h	2010-12-19 11:07:47 UTC (rev 4230)
@@ -563,7 +563,7 @@
 
   /* Mouse tracking mode */
 #define IdMouseTrackNone     0
-#define IdMouseTrackDECELR   1  // not supported
+#define IdMouseTrackDECELR   1
 #define IdMouseTrackX10      2
 #define IdMouseTrackVT200    3
 #define IdMouseTrackVT200Hl  4  // not supported

From svnnotify ＠ sourceforge.jp  Sun Dec 19 20:11:10 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 19 Dec 2010 20:11:10 +0900
Subject: [Ttssh2-commit] [4231] typo fix.
Message-ID: <1292757070.522141.29883.nullmailer@users.sourceforge.jp>

Revision: 4231
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4231
Author:   doda
Date:     2010-12-19 20:11:10 +0900 (Sun, 19 Dec 2010)

Log Message:
-----------
typo fix.

Modified Paths:
--------------
    trunk/doc/en/html/reference/develop.txt


-------------- next part --------------
Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2010-12-19 11:07:47 UTC (rev 4230)
+++ trunk/doc/en/html/reference/develop.txt	2010-12-19 11:11:10 UTC (rev 4231)
@@ -259,4 +259,4 @@
        (3) TTSSH Changelog http://logmett.com/forum/viewtopic.php?f=5&t=29
            Added current modification.
 
-  10. Delete spanshots.
+  10. Delete snapshots.

From svnnotify ＠ sourceforge.jp  Sun Dec 19 21:03:05 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 19 Dec 2010 21:03:05 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzJdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?=
 =?utf-8?b?5pu05pawICggREVDU1RVSemWoumAoyAp?=
Message-ID: <1292760185.141348.1146.nullmailer@users.sourceforge.jp>

Revision: 4232
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4232
Author:   doda
Date:     2010-12-19 21:03:05 +0900 (Sun, 19 Dec 2010)

Log Message:
-----------
????ャ??潟??贋? (DECSTUI?∫?)

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-term.html
    trunk/doc/en/html/setup/teraterm.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/setup/teraterm-term.html
    trunk/doc/ja/html/setup/teraterm.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-19 11:11:10 UTC (rev 4231)
+++ trunk/doc/en/html/about/history.html	2010-12-19 12:03:05 UTC (rev 4232)
@@ -39,6 +39,10 @@
         <ul>
           <li>added the <a href="../setup/teraterm-term.html#TerminalUID">TerminalUID</a> entry in the teraterm.ini file. The default value is FFFFFFFF.</li>
         </ul></li>
+      <li>DECSTUI(????ID??)?????????????
+        <ul>
+          <li>teraterm.ini ? <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> ???????????????? on?</li>
+        </ul></li>
     </ul>
   </li -->
 

Modified: trunk/doc/en/html/setup/teraterm-term.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-term.html	2010-12-19 11:11:10 UTC (rev 4231)
+++ trunk/doc/en/html/setup/teraterm-term.html	2010-12-19 12:03:05 UTC (rev 4232)
@@ -362,15 +362,17 @@
 AlternateScreenBuffer=on
 </pre>
 
-<h1><a name="TerminalUID">Terminal unique ID <!--????ID?????--></a></h1>
 
-<!-- p>
+<!--
+<h1><a name="TerminalUID">????ID?????</a></h1>
+
+<p>
 Tera Term ? DA3 ??????????????????? ID ?????????? ID ? 8 ?? 16 ????????2 ???????A??? 6 ????????[?????????????????
 </p>
 
 <p>
 DA3 ??????????????????? ID ???????? 01234567 ?????????A??????? [Tera Term] ?????? TerminalUID ???????????????
-</p -->
+</p>
 
 <pre>
 TerminalUID=01234567
@@ -381,5 +383,26 @@
 TerminalUID=FFFFFFFF
 </pre>
 
+
+<h1><a name="LockTUID">????ID????????</a></h1>
+
+<p>
+???? ID ??????? DECSTUI ??????????????????????????A??????@????????????
+</p>
+
+<p>
+DECSTUI??????????????? ID ???????????????A??????? [Tera Term] ?????? LockTUID ???????????????
+</p>
+
+<pre>
+LockTUID=off
+</pre>
+
+<pre>
+Default:
+LockTUID=on
+</pre>
+-->
+
 </BODY>
 </HTML>

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2010-12-19 11:11:10 UTC (rev 4231)
+++ trunk/doc/en/html/setup/teraterm.html	2010-12-19 12:03:05 UTC (rev 4232)
@@ -43,7 +43,8 @@
  <li><a href="teraterm-term.html#StrictKeyMapping">Mapping of the function key</a></li>
  <li><a href="teraterm-term.html#Meta8Bit">Sending MSB set character with Alt key</a></li>
  <li><a href="teraterm-term.html#AltScr">Disabling the alternate screen buffer</a></li>
- <li><a href="teraterm-term.html#TerminalUID">Terminal unique ID <!-- ???? ID ?????--></a></li>
+ <!-- li><a href="teraterm-term.html#TerminalUID">????ID?????</a></li -->
+ <!-- li><a href="teraterm-term.html#LockTUID">????ID????????</a></li -->
 </ul>
 
 <h3>Window</h3>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-19 11:11:10 UTC (rev 4231)
+++ trunk/doc/ja/html/about/history.html	2010-12-19 12:03:05 UTC (rev 4232)
@@ -39,6 +39,10 @@
         <ul>
           <li>teraterm.ini ? <a href="../setup/teraterm-term.html#TerminalUID">TerminalUID</a> ???????????????? FFFFFFFF?</li>
         </ul></li>
+      <li>DECSTUI(????ID??)?????????????
+        <ul>
+          <li>teraterm.ini ? <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> ???????????????? on?</li>
+        </ul></li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/setup/teraterm-term.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-term.html	2010-12-19 11:11:10 UTC (rev 4231)
+++ trunk/doc/ja/html/setup/teraterm-term.html	2010-12-19 12:03:05 UTC (rev 4232)
@@ -428,6 +428,7 @@
 AlternateScreenBuffer=on
 </pre>
 
+
 <h1><a name="TerminalUID">????ID?????</a></h1>
 
 <p>
@@ -447,5 +448,25 @@
 TerminalUID=FFFFFFFF
 </pre>
 
+
+<h1><a name="LockTUID">????ID????????</a></h1>
+
+<p>
+???? ID ??????? DECSTUI ??????????????????????????A??????@????????????
+</p>
+
+<p>
+DECSTUI??????????????? ID ???????????????A??????? [Tera Term] ?????? LockTUID ???????????????
+</p>
+
+<pre>
+LockTUID=off
+</pre>
+
+<pre>
+???
+LockTUID=on
+</pre>
+
 </BODY>
 </HTML>

Modified: trunk/doc/ja/html/setup/teraterm.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm.html	2010-12-19 11:11:10 UTC (rev 4231)
+++ trunk/doc/ja/html/setup/teraterm.html	2010-12-19 12:03:05 UTC (rev 4232)
@@ -46,6 +46,7 @@
  <li><a href="teraterm-term.html#Meta8Bit">Alt???MSB?????????????</a></li>
  <li><a href="teraterm-term.html#AltScr">??????????????</a></li>
  <li><a href="teraterm-term.html#TerminalUID">????ID?????</a></li>
+ <li><a href="teraterm-term.html#LockTUID">????ID????????</a></li>
 </ul>
 
 <h3>?????</h3>

From svnnotify ＠ sourceforge.jp  Sun Dec 19 21:21:30 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 19 Dec 2010 21:21:30 +0900
Subject: [Ttssh2-commit] [4233] typo fix.
Message-ID: <1292761290.016728.25355.nullmailer@users.sourceforge.jp>

Revision: 4233
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4233
Author:   doda
Date:     2010-12-19 21:21:29 +0900 (Sun, 19 Dec 2010)

Log Message:
-----------
typo fix.

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/fwd.c
    trunk/ttssh2/ttxssh/fwd.h
    trunk/ttssh2/ttxssh/ssh.c


-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2010-12-19 12:03:05 UTC (rev 4232)
+++ trunk/ttssh2/ttxssh/fwd.c	2010-12-19 12:21:29 UTC (rev 4233)
@@ -1915,7 +1915,7 @@
 	}
 }
 
-BOOL FWD_agent_forword_confirm(PTInstVar pvar)
+BOOL FWD_agent_forward_confirm(PTInstVar pvar)
 {
 	HWND cur_active = GetActiveWindow();
 	pvar->session_settings.ForwardAgentConfirm = 1;

Modified: trunk/ttssh2/ttxssh/fwd.h
===================================================================
--- trunk/ttssh2/ttxssh/fwd.h	2010-12-19 12:03:05 UTC (rev 4232)
+++ trunk/ttssh2/ttxssh/fwd.h	2010-12-19 12:21:29 UTC (rev 4233)
@@ -168,6 +168,6 @@
 void FWD_free_channel(PTInstVar pvar, uint32 local_channel_num);
 int FWD_check_local_channel_num(PTInstVar pvar, int local_num);
 int FWD_agent_open(PTInstVar pvar, uint32 remote_channel_num);
-BOOL FWD_agent_forword_confirm(PTInstVar pvar);
+BOOL FWD_agent_forward_confirm(PTInstVar pvar);
 
 #endif

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2010-12-19 12:03:05 UTC (rev 4232)
+++ trunk/ttssh2/ttxssh/ssh.c	2010-12-19 12:21:29 UTC (rev 4233)
@@ -1961,7 +1961,7 @@
 		int remote_id = get_payload_uint32(pvar, 0);
 		int local_id;
 
-		if (pvar->agentfwd_enable && FWD_agent_forword_confirm(pvar)) {
+		if (pvar->agentfwd_enable && FWD_agent_forward_confirm(pvar)) {
 			local_id = FWD_agent_open(pvar, remote_id);
 			if (local_id == -1) {
 				SSH_fail_channel_open(pvar, remote_id);
@@ -8914,7 +8914,7 @@
 		c->remote_maxpacket = remote_maxpacket;
 
 	} else if (strcmp(ctype, "auth-agent ＠ openssh.com") == 0) { // agent forwarding
-		if (pvar->agentfwd_enable && FWD_agent_forword_confirm(pvar)) {
+		if (pvar->agentfwd_enable && FWD_agent_forward_confirm(pvar)) {
 			c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_AGENT, chan_num);
 			if (c == NULL) {
 				UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,

From svnnotify ＠ sourceforge.jp  Sun Dec 19 23:08:13 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 19 Dec 2010 23:08:13 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzRdICDoqK3lrprjgavplqLkv4Ljgao=?=
 =?utf-8?b?44GP5bi444Gr56K66KqN44GX44Gm44GE44Gf44Gu44KS5L+u5q2j44CC?=
Message-ID: <1292767693.407646.7060.nullmailer@users.sourceforge.jp>

Revision: 4234
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4234
Author:   doda
Date:     2010-12-19 23:08:13 +0900 (Sun, 19 Dec 2010)

Log Message:
-----------
設定に関係なく常に確認していたのを修正。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/fwd.c


-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2010-12-19 12:21:29 UTC (rev 4233)
+++ trunk/ttssh2/ttxssh/fwd.c	2010-12-19 14:08:13 UTC (rev 4234)
@@ -1918,7 +1918,6 @@
 BOOL FWD_agent_forward_confirm(PTInstVar pvar)
 {
 	HWND cur_active = GetActiveWindow();
-	pvar->session_settings.ForwardAgentConfirm = 1;
 	if (pvar->session_settings.ForwardAgentConfirm) {
 		UTIL_get_lang_msg("MSG_FWD_AGENT_FORWARDING_CONFIRM", pvar,
 		                  "Accept agent forwading request?");

From svnnotify ＠ sourceforge.jp  Sun Dec 19 23:12:19 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 19 Dec 2010 23:12:19 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzVdICDjgrPjg57jg7Pjg4njg6njgqQ=?=
 =?utf-8?b?44Oz44GL44KJIEZvcndhcmRBZ2VudENvbmZpcm0g44KS5aSJ5pu044Gn44GN?=
 =?utf-8?b?44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1292767939.250530.13838.nullmailer@users.sourceforge.jp>

Revision: 4235
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4235
Author:   doda
Date:     2010-12-19 23:12:19 +0900 (Sun, 19 Dec 2010)

Log Message:
-----------
?潟??潟?????潟???ForwardAgentConfirm ????眼?????????????
# ???????激??喝????????????? ?????????????с????????с???

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.c


-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2010-12-19 14:08:13 UTC (rev 4234)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2010-12-19 14:12:19 UTC (rev 4235)
@@ -1525,6 +1525,17 @@
 			} else if (_stricmp(option + 4, "-autologin") == 0 ||
 			           _stricmp(option + 4, "-autologon") == 0) {
 				pvar->settings.TryDefaultAuth = TRUE;
+			} else if (MATCH_STR_I(option + 4, "-agentconfirm=") == 0) {
+				if ((_stricmp(option+18, "off") == 0) ||
+				    (_stricmp(option+18, "no") == 0) ||
+				    (_stricmp(option+18, "false") == 0) ||
+				    (_stricmp(option+18, "0") == 0) ||
+				    (_stricmp(option+18, "n") == 0)) {
+					pvar->settings.ForwardAgentConfirm = 0;
+				}
+				else {
+					pvar->settings.ForwardAgentConfirm = 1;
+				}
 
 			// -axx????????? 			} else if (MATCH_STR(option + 4, "-a") == 0) {

From svnnotify ＠ sourceforge.jp  Mon Dec 20 09:09:15 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 20 Dec 2010 09:09:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzZdICDliLblvqHjgrfjg7zjgrHjg7M=?=
 =?utf-8?b?44K55LiA6Kan5pu05paw44CCIChERUNTVFVJKQ==?=
Message-ID: <1292803755.548198.2201.nullmailer@users.sourceforge.jp>

Revision: 4236
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4236
Author:   doda
Date:     2010-12-20 09:09:15 +0900 (Mon, 20 Dec 2010)

Log Message:
-----------
?九勝?激??宴??剛?荀ф??違?(DECSTUI)

Modified Paths:
--------------
    trunk/doc/en/html/about/ctrlseq.html
    trunk/doc/ja/html/about/ctrlseq.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/ctrlseq.html
===================================================================
--- trunk/doc/en/html/about/ctrlseq.html	2010-12-19 14:12:19 UTC (rev 4235)
+++ trunk/doc/en/html/about/ctrlseq.html	2010-12-20 00:09:15 UTC (rev 4236)
@@ -743,6 +743,7 @@
 <i>Pt</i>         Key definition.
 </pre -->
 </td></tr>
+<tr><td>DCS ! { <i>Pt</i> ST </td> <td>DECSTUI</td> <td>Change <a href="../setup/teraterm-term.html#TerminalUID">Terminal Unique ID</a> to <i>Pt</i>. DECSTUI works only when <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> LockUID setting is off.</td>
 </table>
 
 <h2><a name="OSC">OSC Sequence</a></h2>

Modified: trunk/doc/ja/html/about/ctrlseq.html
===================================================================
--- trunk/doc/ja/html/about/ctrlseq.html	2010-12-19 14:12:19 UTC (rev 4235)
+++ trunk/doc/ja/html/about/ctrlseq.html	2010-12-20 00:09:15 UTC (rev 4236)
@@ -726,6 +726,7 @@
 <i>Pt</i>         ??????
 </pre -->
 </td></tr>
+<tr><td>DCS ! { <i>Pt</i> ST </td> <td>DECSTUI</td> <td><a href="../setup/teraterm-term.html#TerminalUID">???? ID</a> ? <i>Pt</i> ??????<a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> ??? off ???????</td>
 </table>
 
 <h2><a name="OSC">OSC?????</a></h2>

From svnnotify ＠ sourceforge.jp  Mon Dec 20 09:37:14 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 20 Dec 2010 09:37:14 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzddICBERUNSUVNTIOOBq+S4gOmDqA==?=
 =?utf-8?b?5a++5b+c44CC44Go44KK44GC44GI44GaIHZ0dGVzdCDjgYzkvb/jgYYgREVD?=
 =?utf-8?b?U0xDIOOBruOBv+OAgg==?=
Message-ID: <1292805434.576755.7315.nullmailer@users.sourceforge.jp>

Revision: 4237
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4237
Author:   doda
Date:     2010-12-20 09:37:14 +0900 (Mon, 20 Dec 2010)

Log Message:
-----------
DECRQSS に一部対応。とりあえず vttest が使う DECSLC のみ。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-20 00:09:15 UTC (rev 4236)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-20 00:37:14 UTC (rev 4237)
@@ -2908,6 +2908,81 @@
   FirstPrm = FALSE;
 }
 
+void RequestStatusString(unsigned char *StrBuff, int StrLen) {
+	unsigned char RepStr[256];
+	int len = 0;
+
+	switch (StrBuff[0]) {
+	case '"':
+		switch (StrBuff[1]) {
+		case 'p': // DECSCL
+			switch (ts.TerminalID) {
+			case IdVT220J:
+			case IdVT282:
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r62;%d", CLocale, Send8BitMode?0:1);
+				break;
+			case IdVT320:
+			case IdVT382:
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r63;%d", CLocale, Send8BitMode?0:1);
+				break;
+			case IdVT420:
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r64;%d", CLocale, Send8BitMode?0:1);
+				break;
+			case IdVT520:
+			case IdVT525:
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r65;%d", CLocale, Send8BitMode?0:1);
+				break;
+			default:
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r61;1", CLocale);
+				break;
+			}
+			break;
+		}
+		break;
+	}
+	if (len > 0) {
+		SendDCSstr(RepStr, len);
+	}
+	else {
+		SendDCSstr("1$r", 0);
+	}
+}
+
+void ParseDCS(BYTE Cmd, unsigned char *StrBuff, int len) {
+	switch (ICount) {
+	case 0:
+		break;
+	case 1:
+		switch (IntChar[1]) {
+		case '!':
+			if (Cmd == '{') { // DECSTUI
+				if (! (ts.TermFlag & TF_LOCKTUID)) {
+					int i;
+					for (i=0; i<8 && isxdigit(StrBuff[i]); i++) {
+						if (islower(StrBuff[i])) {
+							StrBuff[i] = toupper(StrBuff[i]);
+						}
+					}
+					if (len == 8 && i == 8) {
+						strncpy_s(ts.TerminalUID, sizeof(ts.TerminalUID), StrBuff, _TRUNCATE);
+					}
+				}
+			}
+			break;
+		case '$':
+			if (Cmd == 'q')  { // DECRQSS
+				RequestStatusString(StrBuff, len);
+			}
+			break;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+}
+
 #define ModeDcsFirst     1
 #define ModeDcsString    2
 void DeviceControl(BYTE b)
@@ -2915,32 +2990,12 @@
 	static unsigned char StrBuff[256];
 	static int DcsParseMode = ModeDcsFirst;
 	static int StrLen;
-	static char Cmd;
+	static BYTE Cmd;
 
 	if ((ESCFlag && (b=='\\')) || (b==ST && ts.KanjiCode!=IdSJIS)) {
 		if (DcsParseMode == ModeDcsString) {
+			ParseDCS(Cmd, StrBuff, StrLen);
 			StrBuff[StrLen] = 0;
-			switch (ICount) {
-			case 0:
-				break;
-			case 1:
-				if (IntChar[1] == '!' && Cmd == '{') { // DECSTUI
-					if (! (ts.TermFlag & TF_LOCKTUID)) {
-						int i;
-						for (i=0; i<8 && isxdigit(StrBuff[i]); i++) {
-							if (islower(StrBuff[i])) {
-								StrBuff[i] = toupper(StrBuff[i]);
-							}
-						}
-						if (StrLen == 8 && i == 8) {
-							strncpy_s(ts.TerminalUID, sizeof(ts.TerminalUID), StrBuff, _TRUNCATE);
-						}
-					}
-				}
-				break;
-			default:
-				break;
-			}
 		}
 		ESCFlag = FALSE;
 		ParseMode = SavedMode;

From svnnotify ＠ sourceforge.jp  Mon Dec 20 13:09:28 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 20 Dec 2010 13:09:28 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzhdICDmloflrZfliJfjgpLntYLnq68=?=
 =?utf-8?b?44GZ44KL44K/44Kk44Of44Oz44Kw44KS6ZaT6YGV44GI44Gm44GE44Gf44Gu?=
 =?utf-8?b?44KS5L+u5q2j44CC?=
Message-ID: <1292818168.812125.5888.nullmailer@users.sourceforge.jp>

Revision: 4238
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4238
Author:   doda
Date:     2010-12-20 13:09:28 +0900 (Mon, 20 Dec 2010)

Log Message:
-----------
文字列を終端するタイミングを間違えていたのを修正。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-20 00:37:14 UTC (rev 4237)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-20 04:09:28 UTC (rev 4238)
@@ -2994,8 +2994,8 @@
 
 	if ((ESCFlag && (b=='\\')) || (b==ST && ts.KanjiCode!=IdSJIS)) {
 		if (DcsParseMode == ModeDcsString) {
+			StrBuff[StrLen] = 0;
 			ParseDCS(Cmd, StrBuff, StrLen);
-			StrBuff[StrLen] = 0;
 		}
 		ESCFlag = FALSE;
 		ParseMode = SavedMode;

From svnnotify ＠ sourceforge.jp  Mon Dec 20 13:16:18 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 20 Dec 2010 13:16:18 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyMzldICBERUNSUVNTIOOBriBERUNTQ0wg?=
 =?utf-8?b?44Gu5b+c562U44GM6Kqk44Gj44Gm44GE44Gf44Gu44KS5L+u5q2j44CC?=
Message-ID: <1292818578.502554.16197.nullmailer@users.sourceforge.jp>

Revision: 4239
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4239
Author:   doda
Date:     2010-12-20 13:16:18 +0900 (Mon, 20 Dec 2010)

Log Message:
-----------
DECRQSS の DECSCL の応答が誤っていたのを修正。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-20 04:09:28 UTC (rev 4238)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-20 04:16:18 UTC (rev 4239)
@@ -2919,21 +2919,21 @@
 			switch (ts.TerminalID) {
 			case IdVT220J:
 			case IdVT282:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r62;%d", CLocale, Send8BitMode?0:1);
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r62;%d\"p", CLocale, Send8BitMode?0:1);
 				break;
 			case IdVT320:
 			case IdVT382:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r63;%d", CLocale, Send8BitMode?0:1);
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r63;%d\"p", CLocale, Send8BitMode?0:1);
 				break;
 			case IdVT420:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r64;%d", CLocale, Send8BitMode?0:1);
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r64;%d\"p", CLocale, Send8BitMode?0:1);
 				break;
 			case IdVT520:
 			case IdVT525:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r65;%d", CLocale, Send8BitMode?0:1);
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r65;%d\"p", CLocale, Send8BitMode?0:1);
 				break;
 			default:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r61;1", CLocale);
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r61;1\"p", CLocale);
 				break;
 			}
 			break;

From svnnotify ＠ sourceforge.jp  Mon Dec 20 13:41:37 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 20 Dec 2010 13:41:37 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDBdICBERUNSUVNTIOOBpyBTR1Ig44Gr?=
 =?utf-8?b?5a++5b+c44CC?=
Message-ID: <1292820097.101330.15511.nullmailer@users.sourceforge.jp>

Revision: 4240
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4240
Author:   doda
Date:     2010-12-20 13:41:37 +0900 (Mon, 20 Dec 2010)

Log Message:
-----------
DECRQSS で SGR に対応。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-20 04:16:18 UTC (rev 4239)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-20 04:41:37 UTC (rev 4240)
@@ -2939,6 +2939,38 @@
 			break;
 		}
 		break;
+	case 'm':
+		if (StrBuff[1] == 0) {
+			RepStr[0] = '0';
+			RepStr[1] = '$';
+			RepStr[2] = 'r';
+			len = 3;
+			if (CharAttr.Attr & AttrBold) {
+				RepStr[len++] = '1';
+				RepStr[len++] = ';';
+			}
+			if (CharAttr.Attr & AttrUnder) {
+				RepStr[len++] = '4';
+				RepStr[len++] = ';';
+			}
+			if (CharAttr.Attr & AttrBlink) {
+				RepStr[len++] = '5';
+				RepStr[len++] = ';';
+			}
+			if (CharAttr.Attr & AttrReverse) {
+				RepStr[len++] = '7';
+				RepStr[len++] = ';';
+			}
+			if (len == 3) {
+				RepStr[len++] = '0';
+			}
+			else {
+				len--;
+			}
+			RepStr[len++] = 'm';
+			RepStr[len] = 0;
+		}
+		break;
 	}
 	if (len > 0) {
 		SendDCSstr(RepStr, len);

From svnnotify ＠ sourceforge.jp  Mon Dec 20 14:33:28 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 20 Dec 2010 14:33:28 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDFdICBERUNSUVNTIOOBpyBERUNTQ0Eg?=
 =?utf-8?b?LCAgREVDU1RCTSDjgavlr77lv5zjgII=?=
Message-ID: <1292823208.496238.18047.nullmailer@users.sourceforge.jp>

Revision: 4241
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4241
Author:   doda
Date:     2010-12-20 14:33:28 +0900 (Mon, 20 Dec 2010)

Log Message:
-----------
DECRQSS で DECSCA, DECSTBM に対応。
とりあえず xterm が対応している分は済。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-20 04:41:37 UTC (rev 4240)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-20 05:33:28 UTC (rev 4241)
@@ -2937,9 +2937,18 @@
 				break;
 			}
 			break;
+
+		case 'q': // DECSCA
+			if (CharAttr.Attr2 & Attr2Protect) {
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r1\"q", CLocale);
+			}
+			else {
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r0\"q", CLocale);
+			}
+			break;
 		}
 		break;
-	case 'm':
+	case 'm':	// SGR
 		if (StrBuff[1] == 0) {
 			RepStr[0] = '0';
 			RepStr[1] = '$';
@@ -2971,6 +2980,11 @@
 			RepStr[len] = 0;
 		}
 		break;
+	case 'r':	// DECSTBM
+		if (StrBuff[1] == 0) {
+			len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r%d;%dr", CLocale, CursorTop+1, CursorBottom+1);
+		}
+		break;
 	}
 	if (len > 0) {
 		SendDCSstr(RepStr, len);

From svnnotify ＠ sourceforge.jp  Mon Dec 20 17:00:10 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 20 Dec 2010 17:00:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDJdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?=
 =?utf-8?b?5pu05paw44CCIChERUNSUVNTKQ==?=
Message-ID: <1292832010.591129.4559.nullmailer@users.sourceforge.jp>

Revision: 4242
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4242
Author:   doda
Date:     2010-12-20 17:00:10 +0900 (Mon, 20 Dec 2010)

Log Message:
-----------
????ャ??潟??贋???DECRQSS)

Modified Paths:
--------------
    trunk/doc/en/html/about/ctrlseq.html
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/ctrlseq.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/ctrlseq.html
===================================================================
--- trunk/doc/en/html/about/ctrlseq.html	2010-12-20 05:33:28 UTC (rev 4241)
+++ trunk/doc/en/html/about/ctrlseq.html	2010-12-20 08:00:10 UTC (rev 4242)
@@ -744,6 +744,23 @@
 </pre -->
 </td></tr>
 <tr><td>DCS ! { <i>Pt</i> ST </td> <td>DECSTUI</td> <td>Change <a href="../setup/teraterm-term.html#TerminalUID">Terminal Unique ID</a> to <i>Pt</i>. DECSTUI works only when <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> LockUID setting is off.</td>
+<tr><td>DCS $ q <i>Pt</i> ST</td>       <td>DECRQSS</td>        <td>Request selection or setting.
+<pre>
+<i>Pt</i>: the setting that the host asks about.
+<i>Pt</i> = m    SGR
+   = r    DECSTBM
+   = "p   DECSCL
+   = "q   DECSCA
+
+Response: DCS <i>Ps</i> $ r <i>Pt</i> ST
+<i>Ps</i> = 0    Valid request.
+          <i>Pt</i> indicates the current setting of a valid control function
+          that the host asked about. 
+          <i>Pt</i> consists of all the characters in the control function,
+          except the CSI or ESC [ introducer characters.
+   = 1    Invalid request. Does not send <i>Pt</i>.
+</pre>
+</td></tr>
 </table>
 
 <h2><a name="OSC">OSC Sequence</a></h2>

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-20 05:33:28 UTC (rev 4241)
+++ trunk/doc/en/html/about/history.html	2010-12-20 08:00:10 UTC (rev 4242)
@@ -33,18 +33,19 @@
 
 <h3><a name="teraterm_4.69">2011.xx.xx (Ver 4.69)</a></h3>
 <ul class="history">
-  <!-- li>Changes
+  <li>Changes
     <ul>
-      <li>DA3 ???????????????????ID???????????B
+      <!-- li>DA3 ???????????????????ID???????????B
         <ul>
           <li>added the <a href="../setup/teraterm-term.html#TerminalUID">TerminalUID</a> entry in the teraterm.ini file. The default value is FFFFFFFF.</li>
-        </ul></li>
-      <li>DECSTUI(????ID??)?????????????
+        </ul></li -->
+      <li>added support for the DECSTUI (Change Terminal Unique ID) control sequece.
         <ul>
-          <li>teraterm.ini ? <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> ???????????????? on?</li>
+          <li>added the <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> entry in the teraterm.ini file. The default value is on.</li>
         </ul></li>
+      <li>addes support for the DECRQSS (Request terminal setting) control sequence. Supported control sequences are DECSCA, DECSCL, DECSTBM and SGR.</li>
     </ul>
-  </li -->
+  </li>
 
   <!-- li>Bug fixes
     <ul>

Modified: trunk/doc/ja/html/about/ctrlseq.html
===================================================================
--- trunk/doc/ja/html/about/ctrlseq.html	2010-12-20 05:33:28 UTC (rev 4241)
+++ trunk/doc/ja/html/about/ctrlseq.html	2010-12-20 08:00:10 UTC (rev 4242)
@@ -727,6 +727,19 @@
 </pre -->
 </td></tr>
 <tr><td>DCS ! { <i>Pt</i> ST </td> <td>DECSTUI</td> <td><a href="../setup/teraterm-term.html#TerminalUID">???? ID</a> ? <i>Pt</i> ??????<a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> ??? off ???????</td>
+<tr><td>DCS $ q <i>Pt</i> ST</td>	<td>DECRQSS</td>	<td>????????
+<pre>
+<i>Pt</i>: ????????
+<i>Pt</i> = m    SGR
+   = r    DECSTBM
+   = "p   DECSCL
+   = "q   DECSCA
+
+??: DCS <i>Ps</i> $ r <i>Pt</i> ST
+<i>Ps</i> = 0    ????????B<i>Pt</i> ??????????????X??????????????? CSI ?????B
+   = 1    ?????????<i>Pt</i> ????
+</pre>
+</td></tr>
 </table>
 
 <h2><a name="OSC">OSC?????</a></h2>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-20 05:33:28 UTC (rev 4241)
+++ trunk/doc/ja/html/about/history.html	2010-12-20 08:00:10 UTC (rev 4242)
@@ -43,6 +43,7 @@
         <ul>
           <li>teraterm.ini ? <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> ???????????????? on?</li>
         </ul></li>
+      <li>DECRQSS(???????)???????????????????????????? DECSCA, DECSCL, DECSTBM, SGR?</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Tue Dec 21 13:11:15 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 21 Dec 2010 13:11:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDNdIERFQ0ZJLyBERUNCSSDliLblvqE=?=
 =?utf-8?b?44K344O844Kx44Oz44K544Gr5a++5b+c44CC?=
Message-ID: <1292904675.301693.13739.nullmailer@users.sourceforge.jp>

Revision: 4243
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4243
Author:   doda
Date:     2010-12-21 13:11:15 +0900 (Tue, 21 Dec 2010)

Log Message:
-----------
DECFI/DECBI 制御シーケンスに対応。

Modified Paths:
--------------
    trunk/teraterm/teraterm/buffer.c
    trunk/teraterm/teraterm/buffer.h
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2010-12-20 08:00:10 UTC (rev 4242)
+++ trunk/teraterm/teraterm/buffer.c	2010-12-21 04:11:15 UTC (rev 4243)
@@ -3432,3 +3432,57 @@
 
 	BuffUpdateRect(XStart, CursorY, XStart+Count, CursorY);
 }
+
+void BuffScrollLeft(int count)
+{
+	int i;
+	LONG Ptr;
+
+	UpdateStr();
+
+	Ptr = GetLinePtr(PageStart);
+	for (i = 1; i < NumOfLines - StatusLine; i++) {
+		memmove(&(CodeBuff[Ptr]),   &(CodeBuff[Ptr+count]),   NumOfColumns - count);
+		memmove(&(AttrBuff[Ptr]),   &(AttrBuff[Ptr+count]),   NumOfColumns - count);
+		memmove(&(AttrBuff2[Ptr]),  &(AttrBuff2[Ptr+count]),  NumOfColumns - count);
+		memmove(&(AttrBuffFG[Ptr]), &(AttrBuffFG[Ptr+count]), NumOfColumns - count);
+		memmove(&(AttrBuffBG[Ptr]), &(AttrBuffBG[Ptr+count]), NumOfColumns - count);
+
+		memset(&(CodeBuff[Ptr+NumOfColumns-count]),   0x20,          count);
+		memset(&(AttrBuff[Ptr+NumOfColumns-count]),   AttrDefault,   count);
+		memset(&(AttrBuff2[Ptr+NumOfColumns-count]),  AttrDefault,   count);
+		memset(&(AttrBuffFG[Ptr+NumOfColumns-count]), AttrDefaultFG, count);
+		memset(&(AttrBuffBG[Ptr+NumOfColumns-count]), AttrDefaultBG, count);
+
+		Ptr = NextLinePtr(Ptr);
+	}
+
+	BuffUpdateRect(0, 0, NumOfColumns-1, NumOfLines-1);
+}
+
+void BuffScrollRight(int count)
+{
+	int i;
+	LONG Ptr;
+
+	UpdateStr();
+
+	Ptr = GetLinePtr(PageStart);
+	for (i = 1; i < NumOfLines - StatusLine; i++) {
+		memmove(&(CodeBuff[Ptr+count]),   &(CodeBuff[Ptr]),   NumOfColumns - count);
+		memmove(&(AttrBuff[Ptr+count]),   &(AttrBuff[Ptr]),   NumOfColumns - count);
+		memmove(&(AttrBuff2[Ptr+count]),  &(AttrBuff2[Ptr]),  NumOfColumns - count);
+		memmove(&(AttrBuffFG[Ptr+count]), &(AttrBuffFG[Ptr]), NumOfColumns - count);
+		memmove(&(AttrBuffBG[Ptr+count]), &(AttrBuffBG[Ptr]), NumOfColumns - count);
+
+		memset(&(CodeBuff[Ptr]),   0x20,          count);
+		memset(&(AttrBuff[Ptr]),   AttrDefault,   count);
+		memset(&(AttrBuff2[Ptr]),  AttrDefault,   count);
+		memset(&(AttrBuffFG[Ptr]), AttrDefaultFG, count);
+		memset(&(AttrBuffBG[Ptr]), AttrDefaultBG, count);
+
+		Ptr = NextLinePtr(Ptr);
+	}
+
+	BuffUpdateRect(0, 0, NumOfColumns-1, NumOfLines-1);
+}

Modified: trunk/teraterm/teraterm/buffer.h
===================================================================
--- trunk/teraterm/teraterm/buffer.h	2010-12-20 08:00:10 UTC (rev 4242)
+++ trunk/teraterm/teraterm/buffer.h	2010-12-21 04:11:15 UTC (rev 4243)
@@ -76,6 +76,8 @@
 void BuffSelectedEraseHomeToCur();
 void BuffSelectedEraseScreen();
 void BuffSelectEraseBox(int XStart, int YStart, int XEnd, int YEnd);
+void BuffScrollLeft(int count);
+void BuffScrollRight(int count);
 
 extern int StatusLine;
 extern int CursorTop, CursorBottom;

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-20 08:00:10 UTC (rev 4242)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-21 04:11:15 UTC (rev 4243)
@@ -1226,8 +1226,22 @@
     /* no intermediate char */
     case 0:
       switch (b) {
+        case '6': // DECBI
+	  if (CursorX == 0) {
+	    BuffScrollRight(1);
+	  }
+	  else {
+	    CursorX--;
+	  }
 	case '7': SaveCursor(); break;
 	case '8': RestoreCursor(); break;
+	case '9': // DECFI
+	  if (CursorX == NumOfColumns-1) {
+	    BuffScrollLeft(1);
+	  }
+	  else {
+	    CursorX++;
+	  }
 	case '=': AppliKeyMode = TRUE; break;
 	case '>': AppliKeyMode = FALSE; break;
 	case 'D': /* IND */

From svnnotify ＠ sourceforge.jp  Tue Dec 21 16:45:25 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 21 Dec 2010 16:45:25 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDRdICDnq6/mnKsgSUQg44GMIFZUNTIw?=
 =?utf-8?b?ICwgIFZUNTI1IOOBruaZguOBqyBEQTEg44Gu5b+c562U44GM5aOK44KM44Gm?=
 =?utf-8?b?44GE44Gf44Gu44KS5L+u5q2j44CC?=
Message-ID: <1292917525.444988.17920.nullmailer@users.sourceforge.jp>

Revision: 4244
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4244
Author:   doda
Date:     2010-12-21 16:45:25 +0900 (Tue, 21 Dec 2010)

Log Message:
-----------
端末 ID が VT520, VT525 の時に DA1 の応答が壊れていたのを修正。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-21 04:11:15 UTC (rev 4243)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-21 07:45:25 UTC (rev 4244)
@@ -1011,7 +1011,7 @@
 
 void AnswerTerminalType()
 {
-  char Tmp[31];
+  char Tmp[50];
 
   if (ts.TerminalID<IdVT320)
     strncpy_s(Tmp, sizeof(Tmp),"\033[?", _TRUNCATE);

From svnnotify ＠ sourceforge.jp  Tue Dec 21 17:11:15 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 21 Dec 2010 17:11:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDVdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?=
 =?utf-8?b?5pu05paw44CCIChERUNGSS9ERUNCSSwgIERBMeOBruW/nOetlOODkOOCsCAp?=
Message-ID: <1292919075.526511.19182.nullmailer@users.sourceforge.jp>

Revision: 4245
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4245
Author:   doda
Date:     2010-12-21 17:11:15 +0900 (Tue, 21 Dec 2010)

Log Message:
-----------
????ャ??潟??贋???DECFI/DECBI, DA1???膈????

Modified Paths:
--------------
    trunk/doc/en/html/about/ctrlseq.html
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/ctrlseq.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/ctrlseq.html
===================================================================
--- trunk/doc/en/html/about/ctrlseq.html	2010-12-21 07:45:25 UTC (rev 4244)
+++ trunk/doc/en/html/about/ctrlseq.html	2010-12-21 08:11:15 UTC (rev 4245)
@@ -88,6 +88,7 @@
 <h2><a name="ESC">Escape Sequence</a></h2>
 <table border="1">
 <tr><th>Sequence</th>	<th>Mnemonic</th>	<th>Description</th></tr>
+<tr><td>ESC 6</td>	<td>DECBI</td>	<td> Moves the cursor backward one column. If the cursor is at the left margin, then all screen data within the margins moves one column to the right. The column shifted past the right margin is lost. </td></tr>
 <tr><td>ESC 7</td>	<td>DECSC</td>	<td> Save the following items. <br>
 					     - Cursor position<br>
 					     - Character attributes (SGR)<br>
@@ -97,6 +98,7 @@
 					     - Selective erase attribute (DECSCA)<br>
 					     - Any single SS2 or SS3 functions sent</td></tr>
 <tr><td>ESC 8</td>	<td>DECRC</td>	<td> Restores the terminal to the state saved by the save cursor (DECSC) function. </td></tr>
+<tr><td>ESC 9</td>	<td>DECFI</td>	<td> Moves the cursor forward one column. If the cursor is at the right margin, then all screen data within the margins moves one column to the left. The column shifted past the left margin is lost. </td></tr>
 <tr><td>ESC =</td>	<td>DECKPAM</td>	<td> Using <a href="../usage/tips/appkeypad.html">Application Keypad Mode</a>. </td></tr>
 <tr><td>ESC ></td>	<td>DECKPNM</td>	<td> Using <a href="../usage/tips/appkeypad.html">Normal Keypad Mode</a>. </td></tr>
 <tr><td>ESC D</td>	<td>IND</td>	<td> Moves the cursor down one line in the same column. </td></tr>

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-21 07:45:25 UTC (rev 4244)
+++ trunk/doc/en/html/about/history.html	2010-12-21 08:11:15 UTC (rev 4245)
@@ -44,12 +44,14 @@
           <li>added the <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> entry in the teraterm.ini file. The default value is on.</li>
         </ul></li>
       <li>addes support for the DECRQSS (Request terminal setting) control sequence. Supported control sequences are DECSCA, DECSCL, DECSTBM and SGR.</li>
+      <li>added support for the DECFI, DECBI control sequences.</li>
     </ul>
   </li>
 
   <!-- li>Bug fixes
     <ul>
       <li>?????? 257 ??????????\ｦ???????????B</li>
+      <li>??ID?VT520,VT525?????????Primary DA (DA1) ????????????????B</li>
     </ul>
   </li -->
 

Modified: trunk/doc/ja/html/about/ctrlseq.html
===================================================================
--- trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 07:45:25 UTC (rev 4244)
+++ trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 08:11:15 UTC (rev 4245)
@@ -88,8 +88,10 @@
 <h2>??????????</h2>
 <table border="1">
 <tr><th>?????</th>	<th>??</th>	<th>??</th></tr>
+<tr><td>ESC 6</td>	<td>DECBI</td>	<td>??????? 1 ???????????????????A????? 1 ???????????????????????????????????B</td></tr>
 <tr><td>ESC 7</td>	<td>DECSC</td>	<td>???????????</td></tr>
 <tr><td>ESC 8</td>	<td>DECRC</td>	<td>???????????????</td></tr>
+<tr><td>ESC 9</td>	<td>DECFI</td>	<td>??????? 1 ???????????????????A????? 1 ???????????????????????????????????B</td></tr>
 <tr><td>ESC =</td>	<td>DECKPAM</td>	<td><a href="../usage/tips/appkeypad.html">????????????????</a>??????</td></tr>
 <tr><td>ESC ></td>	<td>DECKPNM</td>	<td><a href="../usage/tips/appkeypad.html">????????????</a>??????</td></tr>
 <tr><td>ESC D</td>	<td>IND</td>	<td> ??????????? </td></tr>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-21 07:45:25 UTC (rev 4244)
+++ trunk/doc/ja/html/about/history.html	2010-12-21 08:11:15 UTC (rev 4245)
@@ -44,12 +44,14 @@
           <li>teraterm.ini ? <a href="../setup/teraterm-term.html#LockTUID">LockTUID</a> ???????????????? on?</li>
         </ul></li>
       <li>DECRQSS(???????)???????????????????????????? DECSCA, DECSCL, DECSTBM, SGR?</li>
+      <li>DECFI, DECBI ?????????????</li>
     </ul>
   </li>
 
   <li>????     <ul>
       <li>?????? 257 ??????????\ｦ???????????B</li>
+      <li>??ID?VT520,VT525?????????Primary DA (DA1) ????????????????B</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Tue Dec 21 20:59:56 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 21 Dec 2010 20:59:56 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDZdICBWVC1MZXZlbCDjga7mpoLlv7U=?=
 =?utf-8?b?44KS5bCO5YWl44CC?=
Message-ID: <1292932796.907984.795.nullmailer@users.sourceforge.jp>

Revision: 4246
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4246
Author:   doda
Date:     2010-12-21 20:59:56 +0900 (Tue, 21 Dec 2010)

Log Message:
-----------
VT-Level の概念を導入。
・VT-Lvelev 1 では 8bit 送信モードが無効になるようにした。
・端末 ID でのレベルより VT-Level が上にならないようにした。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/teraterm/vtterm.h
    trunk/teraterm/teraterm/vtwin.cpp


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-21 08:11:15 UTC (rev 4245)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-21 11:59:56 UTC (rev 4246)
@@ -27,7 +27,7 @@
 #include "vtterm.h"
 
 #define MAPSIZE(x) (sizeof(x)/sizeof((x)[0]))
-#define Accept8BitCtrl ((ts.TerminalID>=IdVT220J) && (ts.TermFlag & TF_ACCEPT8BITCTRL))
+#define Accept8BitCtrl ((VTlevel >= 2) && (ts.TermFlag & TF_ACCEPT8BITCTRL))
 
   /* Parsing modes */
 #define ModeFirst 0
@@ -65,6 +65,8 @@
 static BOOL AltScr;
 BOOL BracketedPaste;
 
+static int VTlevel;
+
 // save/restore cursor
 typedef struct {
   int CursorX, CursorY;
@@ -208,11 +210,12 @@
   RelativeOrgMode = FALSE;
   ts.ColorFlag &= ~CF_REVERSEVIDEO;
   AutoRepeatMode = TRUE;
-  Send8BitMode = ts.Send8BitCtrl;
   FocusReportMode = FALSE;
   MouseReportMode = IdMouseTrackNone;
   DecLocatorFlag = 0;
 
+  ChangeTerminalID();
+
   LastX = 0;
   LastY = 0;
   ButtonStat = 0;
@@ -814,7 +817,7 @@
       if ((ts.TermFlag & TF_ACCEPT8BITCTRL)==0)
 	return; /* ignore C1 char */
       /* C1 chars are interpreted as C0 chars in VT100 mode */
-      if (ts.TerminalID<IdVT220J)
+      if (VTlevel < 2)
 	b = b & 0x7F;
     }
   }
@@ -1064,8 +1067,14 @@
 void ESCSpace(BYTE b)
 {
   switch (b) {
-    case 'F': Send8BitMode = FALSE; break;	// S7C1T
-    case 'G': Send8BitMode = TRUE; break;	// S8C1T
+    case 'F':	// S7C1T
+      Send8BitMode = FALSE;
+      break;
+    case 'G':	// S8C1T
+      if (VTlevel >= 2) {
+	Send8BitMode = TRUE;
+      }
+      break;
   }
 }
 
@@ -2511,8 +2520,6 @@
     CursorBottom = NumOfLines-1-StatusLine;
     ResetCharSet();
 
-    Send8BitMode = ts.Send8BitCtrl;
-
     /* Attribute */
     CharAttr = DefCharAttr;
     Special = FALSE;
@@ -2539,21 +2546,23 @@
 	/* Select terminal mode (software reset) */
 	SoftReset();
 	if (NParam > 0) {
-	  switch (Param[1]) {
-	    case 61: // VT-Level 1 (VT100)
-	      Send8BitMode = FALSE; break;
-	    case 62: // VT-Level 2 (VT200)
-	    case 63: // VT-Level 3 (VT300)
-	    case 64: // VT-Level 4 (VT400)
-	    case 65: // VT-Level 5 (VT500)
-	      if (NParam > 1 && Param[2] == 1)
-		Send8BitMode = FALSE;
-	      else
-		Send8BitMode = TRUE;
-	      break;
+	  ChangeTerminalID();
+	  if (Param[1] >= 61 && Param[1] <= 65) {
+	    if (VTlevel > Param[1] - 60) {
+	      VTlevel = Param[1] - 60;
+	    }
 	  }
+	  else {
+	    VTlevel = 1;
+	  }
+
+	  if (VTlevel < 2 || (NParam > 1 && Param[2] == 1))
+	    Send8BitMode = FALSE;
+	  else
+	    Send8BitMode = TRUE;
 	}
 	break;
+
       case 'q': // DECSCA
 	if (Param[1] < 0) 
 	  Param[1] = 0;
@@ -2930,26 +2939,12 @@
 	case '"':
 		switch (StrBuff[1]) {
 		case 'p': // DECSCL
-			switch (ts.TerminalID) {
-			case IdVT220J:
-			case IdVT282:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r62;%d\"p", CLocale, Send8BitMode?0:1);
-				break;
-			case IdVT320:
-			case IdVT382:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r63;%d\"p", CLocale, Send8BitMode?0:1);
-				break;
-			case IdVT420:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r64;%d\"p", CLocale, Send8BitMode?0:1);
-				break;
-			case IdVT520:
-			case IdVT525:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r65;%d\"p", CLocale, Send8BitMode?0:1);
-				break;
-			default:
-				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r61;1\"p", CLocale);
-				break;
+			if (VTlevel > 1 && Send8BitMode) {
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r6%d;0\"p", CLocale, VTlevel);
 			}
+			else {
+				len = _snprintf_s_l(RepStr, sizeof(RepStr), _TRUNCATE, "0$r6%d;1\"p", CLocale, VTlevel);
+			}
 			break;
 
 		case 'q': // DECSCA
@@ -4346,3 +4341,32 @@
 BOOL BracketedPasteMode() {
 	return BracketedPaste;
 }
+
+void ChangeTerminalID() {
+  switch (ts.TerminalID) {
+  case IdVT220J:
+  case IdVT282:
+    VTlevel = 2;
+    break;
+  case IdVT320:
+  case IdVT382:
+    VTlevel = 3;
+    break;
+  case IdVT420:
+    VTlevel = 4;
+    break;
+  case IdVT520:
+  case IdVT525:
+    VTlevel = 5;
+    break;
+  default:
+    VTlevel = 1;
+  }
+
+  if (VTlevel == 1) {
+    Send8BitMode = FALSE;
+  }
+  else {
+    Send8BitMode = ts.Send8BitCtrl;
+  }
+}

Modified: trunk/teraterm/teraterm/vtterm.h
===================================================================
--- trunk/teraterm/teraterm/vtterm.h	2010-12-21 08:11:15 UTC (rev 4245)
+++ trunk/teraterm/teraterm/vtterm.h	2010-12-21 11:59:56 UTC (rev 4246)
@@ -19,6 +19,7 @@
 BOOL MouseReport(int Event, int Button, int Xpos, int Ypos);
 BOOL BracketedPasteMode();
 void EndTerm();
+void ChangeTerminalID();
 
 #ifdef __cplusplus
 }

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2010-12-21 08:11:15 UTC (rev 4245)
+++ trunk/teraterm/teraterm/vtwin.cpp	2010-12-21 11:59:56 UTC (rev 4246)
@@ -1535,6 +1535,8 @@
 	          (ts.TerminalHeight!=WinHeight-StatusLine))) {
 		BuffChangeWinSize(ts.TerminalWidth,ts.TerminalHeight+StatusLine);
 	}
+
+	ChangeTerminalID();
 }
 
 void CVTWindow::Startup()

From svnnotify ＠ sourceforge.jp  Tue Dec 21 21:01:06 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 21 Dec 2010 21:01:06 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDddICDjgr/jgrDjga7plonjgZjjg58=?=
 =?utf-8?b?44K544KS5L+u5q2j44CC?=
Message-ID: <1292932866.071000.3644.nullmailer@users.sourceforge.jp>

Revision: 4247
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4247
Author:   doda
Date:     2010-12-21 21:01:06 +0900 (Tue, 21 Dec 2010)

Log Message:
-----------
?帥????????鴻?篆????
Modified Paths:
--------------
    trunk/doc/ja/html/about/ctrlseq.html


-------------- next part --------------
Modified: trunk/doc/ja/html/about/ctrlseq.html
===================================================================
--- trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 11:59:56 UTC (rev 4246)
+++ trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 12:01:06 UTC (rev 4247)
@@ -282,10 +282,10 @@
 </td></tr>
 <tr><td>CSI > 3 ; <i>Ps1</i> ; <i>Ps2</i> ; <i>Ps3</i> ; <i>Ps4</i> J</td>	<td>-</td>	<td>????B
 <pre>
-<i>Ps1<i>   ???????-<i>Ps2<i>   ???????-<i>Ps3<i>   ???????-<i>Ps4<i>   ?????E?
+<i>Ps1</i>   ???????+<i>Ps2</i>   ???????+<i>Ps3</i>   ???????+<i>Ps4</i>   ?????E?
 </pre></td>
 </tr>
 <tr><td>CSI > 3 ; <i>Ps1</i> ; <i>Ps2</i> K</td>	<td>-</td>	<td>????? <i>Ps1</i> ???? <i>Ps2</i> ?????????B</td></tr>

From svnnotify ＠ sourceforge.jp  Tue Dec 21 21:04:49 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 21 Dec 2010 21:04:49 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDhdICDoqJjov7DoqqTjgorjgpLkv64=?=
 =?utf-8?b?5q2j44CC?=
Message-ID: <1292933089.673384.7837.nullmailer@users.sourceforge.jp>

Revision: 4248
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4248
Author:   doda
Date:     2010-12-21 21:04:49 +0900 (Tue, 21 Dec 2010)

Log Message:
-----------
荐?唇茯ゃ???信罩ｃ?

Modified Paths:
--------------
    trunk/doc/en/html/about/ctrlseq.html
    trunk/doc/ja/html/about/ctrlseq.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/ctrlseq.html
===================================================================
--- trunk/doc/en/html/about/ctrlseq.html	2010-12-21 12:01:06 UTC (rev 4247)
+++ trunk/doc/en/html/about/ctrlseq.html	2010-12-21 12:04:49 UTC (rev 4248)
@@ -357,8 +357,9 @@
     = 64    VT-Level 4 (VT400 mode)
     = 65    VT-Level 5 (VT500 mode)
 
-<i>Ps2</i> = 0     7 bit mode (S7C1T)
-    = 1     8 bit mode (S8C1T)
+<i>Ps2</i> = 0     8 bit mode (S8C1T)
+    = 1     7 bit mode (S7C1T)
+    = 2     8 bit mode (S8C1T)
 </pre></td>
 </tr>
 

Modified: trunk/doc/ja/html/about/ctrlseq.html
===================================================================
--- trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 12:01:06 UTC (rev 4247)
+++ trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 12:04:49 UTC (rev 4248)
@@ -348,8 +348,9 @@
     = 64    VT-Level 4 (VT400???)
     = 65    VT-Level 5 (VT500???)
 
-<i>Ps2</i> = 0     7 bit ??? (S7C1T)
-    = 1     8 bit ??? (S8C1T)
+<i>Ps2</i> = 0     8 bit ??? (S8C1T)
+    = 1     7 bit ??? (S7C1T)
+    = 2     8 bit ??? (S8C1T)
 </pre></td>
 </tr>
 

From svnnotify ＠ sourceforge.jp  Tue Dec 21 22:38:14 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 21 Dec 2010 22:38:14 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNDldICDmoYHjgZrjgozjgpLkv67mraM=?=
 =?utf-8?b?44CC?=
Message-ID: <1292938694.690450.13391.nullmailer@users.sourceforge.jp>

Revision: 4249
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4249
Author:   doda
Date:     2010-12-21 22:38:14 +0900 (Tue, 21 Dec 2010)

Log Message:
-----------
罅?????篆????
Modified Paths:
--------------
    trunk/doc/ja/html/about/ctrlseq.html


-------------- next part --------------
Modified: trunk/doc/ja/html/about/ctrlseq.html
===================================================================
--- trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 12:04:49 UTC (rev 4248)
+++ trunk/doc/ja/html/about/ctrlseq.html	2010-12-21 13:38:14 UTC (rev 4249)
@@ -430,7 +430,7 @@
 <pre>
 ??: CSI <i>Pe</i> ; <i>Pb</i> ; <i>Pr</i> ; <i>Pc</i> ; <i>Pp</i> & w
 <i>Pe</i>: ???????
-<i>Pe</i> =  0    ?????????
+<i>Pe</i> =  0     ?????????
    =  1     ????????(DECRQLP) ????
    =  2     ?????????
    =  3     ?????????

From svnnotify ＠ sourceforge.jp  Wed Dec 22 15:27:26 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 22 Dec 2010 15:27:26 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNTBdICDjgqbjgqPjg7Pjg4njgqbjgrU=?=
 =?utf-8?b?44Kk44K65aSJ5pu05Yi25b6h44K344O844Kx44Oz44K544Gr5a++44GX44Gm?=
 =?utf-8?b?44CB5a6f6Zqb44Gu44Km44Kj44Oz44OJ44Km44K144Kk44K644KS6L+U44GZ?=
 =?utf-8?b?44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1292999246.145266.8510.nullmailer@users.sourceforge.jp>

Revision: 4250
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4250
Author:   doda
Date:     2010-12-22 15:27:26 +0900 (Wed, 22 Dec 2010)

Log Message:
-----------
????潟?????ゃ?紊???九勝?激??宴??鴻?絲障????絎??????ｃ?????泣??冴?菴???????????

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtdisp.h
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-21 13:38:14 UTC (rev 4249)
+++ trunk/doc/en/html/about/history.html	2010-12-22 06:27:26 UTC (rev 4250)
@@ -45,6 +45,7 @@
         </ul></li>
       <li>addes support for the DECRQSS (Request terminal setting) control sequence. Supported control sequences are DECSCA, DECSCL, DECSTBM and SGR.</li>
       <li>added support for the DECFI, DECBI control sequences.</li>
+      <!-- li>??????????????????????????80x640??????????ﾀ?????????????????????</li -->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-21 13:38:14 UTC (rev 4249)
+++ trunk/doc/ja/html/about/history.html	2010-12-22 06:27:26 UTC (rev 4250)
@@ -45,6 +45,7 @@
         </ul></li>
       <li>DECRQSS(???????)???????????????????????????? DECSCA, DECSCL, DECSTBM, SGR?</li>
       <li>DECFI, DECBI ?????????????</li>
+      <li>??????????????????????????80x640??????????ﾀ?????????????????????</li>
     </ul>
   </li>
 

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2010-12-21 13:38:14 UTC (rev 4249)
+++ trunk/teraterm/teraterm/vtdisp.c	2010-12-22 06:27:26 UTC (rev 4250)
@@ -3487,6 +3487,16 @@
 	return;
 }
 
+void DispGetWindowSize(int *width, int *height) {
+	RECT r;
+
+	GetWindowRect(HVTWin, &r);
+	*width = r.right - r.left;
+	*height = r.bottom - r.top;
+
+	return;
+}
+
 void DispGetRootWinSize(int *x, int *y)
 {
 	HMODULE mod;

Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h	2010-12-21 13:38:14 UTC (rev 4249)
+++ trunk/teraterm/teraterm/vtdisp.h	2010-12-22 06:27:26 UTC (rev 4250)
@@ -86,6 +86,7 @@
 void DispResizeWin(int w, int h);
 BOOL DispWindowIconified();
 void DispGetWindowPos(int *x, int *y);
+void DispGetWindowSize(int *width, int *height);
 void DispGetRootWinSize(int *x, int *y);
 
 extern int WinWidth, WinHeight;

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-21 13:38:14 UTC (rev 4249)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-22 06:27:26 UTC (rev 4250)
@@ -2053,8 +2053,9 @@
 	break;
       case 14: /* get window size??? */
 	if (ts.WindowFlag & WF_WINDOWREPORT) {
-	  /* this is not actual window size */
-	  SendCSIstr("4;640;480t", 0);
+	  DispGetWindowSize(&x, &y);
+	  len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "4;%d;%dt", CLocale, y, x);
+	  SendCSIstr(Report, len);
 	}
 	break;
       case 18: /* get terminal size */

From svnnotify ＠ sourceforge.jp  Wed Dec 22 23:39:59 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 22 Dec 2010 23:39:59 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNTFdICDjg6Hjg4Pjgrvjg7zjgrjjga4=?=
 =?utf-8?b?6Iux6Kiz44KS5L+u5q2j?=
Message-ID: <1293028799.611271.19779.nullmailer@users.sourceforge.jp>

Revision: 4251
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4251
Author:   maya
Date:     2010-12-22 23:39:59 +0900 (Wed, 22 Dec 2010)

Log Message:
-----------
?＜??祉??吾??沿┳??信罩?
Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.lng
    trunk/installer/release/lang/German.lng
    trunk/ttssh2/ttxssh/fwd.c


-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2010-12-22 06:27:26 UTC (rev 4250)
+++ trunk/installer/release/lang/English.lng	2010-12-22 14:39:59 UTC (rev 4251)
@@ -664,7 +664,7 @@
 MSG_FWD_DENIED_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the local X server.\nYou did not specify this forwarding to TTSSH in advance, and therefore the request was denied.
 MSG_FWD_DENIED_BY_SERVER_ERROR=A program on the local machine attempted to connect to a forwarded port.\nThe forwarding request was denied by the server. The connection has been closed.
 MSG_FWD_COMM_ERROR=A communications error occurred while sending forwarded data to a local port.\nThe forwarded connection will be closed.
-MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Are you sure you want to accept agent-forwarding request?
 
 ; hosts.c
 MSG_HOSTS_READ_ENOENT_ERROR=An error occurred while trying to read a known_hosts file.\nThe specified filename does not exist.

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2010-12-22 06:27:26 UTC (rev 4250)
+++ trunk/installer/release/lang/French.lng	2010-12-22 14:39:59 UTC (rev 4251)
@@ -663,7 +663,7 @@
 MSG_FWD_DENIED_X_ERROR=Le serveur a essay?de rediriger une connexion ?travers cette machine.\nIl a demand?une connexion au serveur X local.\nVous n'aviez pas sp?ifi?cette redirection par avance ?TTSSH, par cons?uent la requ?e a ??refus?.
 MSG_FWD_DENIED_BY_SERVER_ERROR=Un programme sur la machine locale a essay?de se connecter ?un port redirig?\nLa demande de redirection a ??refus? par le serveur. La connexion a ??ferm?.
 MSG_FWD_COMM_ERROR=Une erreur de communication est survenue lors de l'envoi de donn?s redirig?s vers un port local.\nLa connexion redirig? va ?re ferm?.
-MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Are you sure you want to accept agent-forwarding request?
 
 ; hosts.c
 MSG_HOSTS_READ_ENOENT_ERROR=Une erreur est apparue lors d'une tentative de lecture d'un fichier d'h?es connus.\nLe nom de fichier n'existe pas.

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2010-12-22 06:27:26 UTC (rev 4250)
+++ trunk/installer/release/lang/German.lng	2010-12-22 14:39:59 UTC (rev 4251)
@@ -661,7 +661,7 @@
 MSG_FWD_DENIED_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the local X server.\nYou did not specify this forwarding to TTSSH in advance, and therefore the request was denied.
 MSG_FWD_DENIED_BY_SERVER_ERROR=A program on the local machine attempted to connect to a forwarded port.\nThe forwarding request was denied by the server. The connection has been closed.
 MSG_FWD_COMM_ERROR=A communications error occurred while sending forwarded data to a local port.\nThe forwarded connection will be closed.
-MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Are you sure you want to accept agent-forwarding request?
 
 ; hosts.c
 MSG_HOSTS_READ_ENOENT_ERROR=An error occurred while trying to read a known_hosts file.\nThe specified filename does not exist.

Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2010-12-22 06:27:26 UTC (rev 4250)
+++ trunk/ttssh2/ttxssh/fwd.c	2010-12-22 14:39:59 UTC (rev 4251)
@@ -1920,7 +1920,7 @@
 	HWND cur_active = GetActiveWindow();
 	if (pvar->session_settings.ForwardAgentConfirm) {
 		UTIL_get_lang_msg("MSG_FWD_AGENT_FORWARDING_CONFIRM", pvar,
-		                  "Accept agent forwading request?");
+		                  "Are you sure you want to accept agent-forwarding request?");
 		if (MessageBox(cur_active != NULL ? cur_active : pvar->NotificationWindow,
 		               pvar->ts->UIMsg, "TTSSH",
 		               MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) {

From svnnotify ＠ sourceforge.jp  Thu Dec 23 12:18:55 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 23 Dec 2010 12:18:55 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4252=5D_basename=2C__dirname_?=
 =?utf-8?b?44Oe44Kv44Ot44Kz44Oe44Oz44OJ44KS6L+95Yqg?=
Message-ID: <1293074335.568998.1849.nullmailer@users.sourceforge.jp>

Revision: 4252
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4252
Author:   maya
Date:     2010-12-23 12:18:55 +0900 (Thu, 23 Dec 2010)

Log Message:
-----------
basename, dirname ????????????菴遵?

Modified Paths:
--------------
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/ttpmacro/ttl.c
    trunk/teraterm/ttpmacro/ttmparse.c
    trunk/teraterm/ttpmacro/ttmparse.h


-------------- next part --------------
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2010-12-22 14:39:59 UTC (rev 4251)
+++ trunk/teraterm/common/ttlib.c	2010-12-23 03:18:55 UTC (rev 4252)
@@ -125,6 +125,21 @@
 	}
 }
 
+// Delete slashes at the end of a path name
+void DeleteSlash(PCHAR Path)
+{
+	size_t i;
+	for (i=strlen(Path)-1; i>=0; i--) {
+		if (i ==0 && Path[i] == '\\' ||
+		    Path[i] == '\\' && !_ismbblead(Path[i-1])) {
+			Path[i] = '\0';
+		}
+		else {
+			break;
+		}
+	}
+}
+
 void Str2Hex(PCHAR Str, PCHAR Hex, int Len, int MaxHexLen, BOOL ConvSP)
 {
 	BYTE b, low;

Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2010-12-22 14:39:59 UTC (rev 4251)
+++ trunk/teraterm/common/ttlib.h	2010-12-23 03:18:55 UTC (rev 4252)
@@ -13,6 +13,7 @@
 BOOL ExtractDirName(PCHAR PathName, PCHAR DirName);
 void FitFileName(PCHAR FileName, int destlen, PCHAR DefExt);
 void AppendSlash(PCHAR Path, int destlen);
+void DeleteSlash(PCHAR Path);
 void Str2Hex(PCHAR Str, PCHAR Hex, int Len, int MaxHexLen, BOOL ConvSP);
 BYTE ConvHexChar(BYTE b);
 int Hex2Str(PCHAR Hex, PCHAR Str, int MaxLen);

Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2010-12-22 14:39:59 UTC (rev 4251)
+++ trunk/teraterm/ttpmacro/ttl.c	2010-12-23 03:18:55 UTC (rev 4252)
@@ -2385,6 +2385,84 @@
 	return Err;
 }
 
+static void basedirname(char *fullpath, char *dest_base, int base_len, char *dest_dir, int dir_len) {
+	char drive[_MAX_DRIVE], dir[_MAX_DIR], fname[_MAX_FNAME], ext[_MAX_EXT];
+	char dirname[MAX_PATH];
+	char basename[MAX_PATH];
+
+	_splitpath_s(fullpath, drive, sizeof(drive), dir, sizeof(dir), fname, sizeof(fname), ext, sizeof(ext));
+	strncpy_s(dirname, sizeof(dirname), drive, _TRUNCATE);
+	strncat_s(dirname, sizeof(dirname), dir, _TRUNCATE);
+	DeleteSlash(dirname); // ??? \ ?????+	if (strlen(fname) == 0 && strlen(ext) == 0) {
+		_splitpath_s(dirname, drive, sizeof(drive), dir, sizeof(dir), fname, sizeof(fname), ext, sizeof(ext));
+		strncpy_s(dirname, sizeof(dirname), drive, _TRUNCATE);
+		strncat_s(dirname, sizeof(dirname), dir, _TRUNCATE);
+		DeleteSlash(dirname); // ??? \ ?????+		strncpy_s(basename, sizeof(basename), fname, _TRUNCATE);
+		strncat_s(basename, sizeof(basename), ext, _TRUNCATE);
+	}
+	else {
+		strncpy_s(basename, sizeof(basename), fname, _TRUNCATE);
+		strncat_s(basename, sizeof(basename), ext, _TRUNCATE);
+	}
+
+	if (dest_dir != NULL) {
+		strncpy_s(dest_dir, dir_len, dirname, _TRUNCATE);
+	}
+	if (dest_base != NULL) {
+		strncpy_s(dest_base, base_len, basename, _TRUNCATE);
+	}
+}
+
+static void basename(char *fullpath, char *dest, int len) {
+	basedirname(fullpath, dest, len, NULL, 0);
+}
+
+static void dirname(char *fullpath, char *dest, int len) {
+	basedirname(fullpath, NULL, 0, dest, len);
+}
+
+WORD TTLBasename()
+{
+	WORD VarId, Err;
+	TStrVal Src, Name;
+
+	Err = 0;
+	GetStrVar(&VarId,&Err);
+	GetStrVal(Src,&Err);
+	if ((Err==0) &&
+	    (GetFirstChar()!=0))
+		Err = ErrSyntax;
+
+	if (Err!=0) return Err;
+
+	basename(Src, Name, sizeof(Name));
+	SetStrVal(VarId, Name);
+
+	return Err;
+}
+
+WORD TTLDirname()
+{
+	WORD VarId, Err;
+	TStrVal Src, Dir;
+
+	Err = 0;
+	GetStrVar(&VarId,&Err);
+	GetStrVal(Src,&Err);
+	if ((Err==0) &&
+	    (GetFirstChar()!=0))
+		Err = ErrSyntax;
+
+	if (Err!=0) return Err;
+
+	dirname(Src, Dir, sizeof(Dir));
+	SetStrVal(VarId, Dir);
+
+	return Err;
+}
+
 #define IdMsgBox 1
 #define IdYesNoBox 2
 #define IdStatusBox 3
@@ -4420,6 +4498,8 @@
 
 	if (GetReservedWord(&WId)) 
 		switch (WId) {
+		case RsvBasename:
+			Err = TTLBasename(); break;
 		case RsvBeep:
 			Err = TTLBeep(); break;
 		case RsvBPlusRecv:
@@ -4453,6 +4533,8 @@
 			Err = TTLCrc32File(); break;
 		case RsvDelPassword:
 			Err = TTLDelPassword(); break;
+		case RsvDirname:
+			Err = TTLDirname(); break;
 		case RsvDisconnect:
 			Err = TTLDisconnect(); break;
 		case RsvDispStr:

Modified: trunk/teraterm/ttpmacro/ttmparse.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.c	2010-12-22 14:39:59 UTC (rev 4251)
+++ trunk/teraterm/ttpmacro/ttmparse.c	2010-12-23 03:18:55 UTC (rev 4252)
@@ -131,6 +131,7 @@
 		else if (_stricmp(Str,"bplusrecv")==0) *WordId = RsvBPlusRecv;
 		else if (_stricmp(Str,"bplussend")==0) *WordId = RsvBPlusSend;
 		else if (_stricmp(Str,"break")==0) *WordId = RsvBreak;
+		else if (_stricmp(Str,"basename")==0) *WordId = RsvBasename;
 		break;
 	case 'c':
 		if (_stricmp(Str,"call")==0) *WordId = RsvCall;
@@ -151,6 +152,7 @@
 		else if (_stricmp(Str,"disconnect")==0) *WordId = RsvDisconnect;
 		else if (_stricmp(Str,"dispstr")==0) *WordId = RsvDispStr;
 		else if (_stricmp(Str,"do")==0) *WordId = RsvDo;
+		else if (_stricmp(Str,"dirname")==0) *WordId = RsvDirname;
 		break;
 	case 'e':
 		if (_stricmp(Str,"else")==0) *WordId = RsvElse;

Modified: trunk/teraterm/ttpmacro/ttmparse.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.h	2010-12-22 14:39:59 UTC (rev 4251)
+++ trunk/teraterm/ttpmacro/ttmparse.h	2010-12-23 03:18:55 UTC (rev 4252)
@@ -202,6 +202,8 @@
 #define RsvStrSplit     184
 #define RsvStrJoin      185
 #define RsvStrSpecial   186
+#define RsvBasename     187
+#define RsvDirname      188
 
 #define RsvOperator     1000
 #define RsvBNot         1001

From svnnotify ＠ sourceforge.jp  Thu Dec 23 14:36:03 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 23 Dec 2010 14:36:03 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNTNdICDoqIDoqp7jg6Ljg7zjg4njgYw=?=
 =?utf-8?b?5pel5pys6Kqe5Lul5aSW44Gu5pmC44Gr44CB56uv5pyr44Gu6Kit5a6a44OA?=
 =?utf-8?b?44Kk44Ki44Ot44Kw44Gn56uv5pyrSUTjgasgVlQ0MjAgLCBWVDUyMCwgIFZU?=
 =?utf-8?b?NTI1IOOCkuaMh+WumuOBl+OBpuOCguWun+mam+OBq+OBryBWVDEwMCDjgas=?=
 =?utf-8?b?6Kit5a6a44GV44KM44KL44Gu44KS5L+u5q2j44CC?=
Message-ID: <1293082563.813169.22679.nullmailer@users.sourceforge.jp>

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 ??????????\ｦ???????????B</li>
-      <li>??ID?VT520,VT525?????????Primary DA (DA1) ????????????????B</li>
+      <li>??ID?VT520,VT525?????????Primary DA (DA1) ?????????????????B</li>
+      <li>??????????????<a href="../menu/setup-terminal.html">Terminal Setup</a> ????????ID? VT420, VT520, VT525 ??????ﾀ??? VT100 ?????????????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>????     <ul>
       <li>?????? 257 ??????????\ｦ???????????B</li>
-      <li>??ID?VT520,VT525?????????Primary DA (DA1) ????????????????B</li>
+      <li>??ID?VT520,VT525?????????Primary DA (DA1) ?????????????????B</li>
+      <li>??????????????<a href="../menu/setup-terminal.html">Terminal Setup</a> ????????ID? VT420, VT520, VT525 ??????ﾀ??? VT100 ?????????????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;

From svnnotify ＠ sourceforge.jp  Thu Dec 23 20:17:05 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 23 Dec 2010 20:17:05 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4254=5D_basename=2C__dirname_?=
 =?utf-8?b?44Oe44Kv44Ot44Kz44Oe44Oz44OJ44KS6L+95Yqg?=
Message-ID: <1293103025.671798.5382.nullmailer@users.sourceforge.jp>

Revision: 4254
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4254
Author:   maya
Date:     2010-12-23 20:17:05 +0900 (Thu, 23 Dec 2010)

Log Message:
-----------
basename, dirname ????????????菴遵?
  http://logmett.com/forum/viewtopic.php?f=6&t=1468
  ????ャ??潟???
Modified Paths:
--------------
    trunk/doc/en/html/macro/command/index.html
    trunk/doc/en/teraterm.hhc
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/html/macro/command/index.html
    trunk/doc/ja/teraterm.hhc
    trunk/doc/ja/teraterm.hhp
    trunk/teraterm/common/helpid.h

Added Paths:
-----------
    trunk/doc/en/html/macro/command/basename.html
    trunk/doc/en/html/macro/command/dirname.html
    trunk/doc/ja/html/macro/command/basename.html
    trunk/doc/ja/html/macro/command/dirname.html


-------------- next part --------------
Added: trunk/doc/en/html/macro/command/basename.html
===================================================================
--- trunk/doc/en/html/macro/command/basename.html	                        (rev 0)
+++ trunk/doc/en/html/macro/command/basename.html	2010-12-23 11:17:05 UTC (rev 4254)
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <title>basename</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>basename</h1>
+
+<p>
+Gets the file name from a path name.
+</p>
+
+<pre class="macro-syntax">
+basename &lt;strvar&gt; &lt;path&gt;
+</pre>
+
+<h2>Remarks</h2>
+
+<!--p>
+??? &lt;path&gt; ?????????? &lt;strvar&gt; ??????<br>
+????????????????Aﾀ???????????
+</p-->
+
+<h2>Example</h2>
+
+<pre class="macro-example">
+basename fname 'c:\teraterm\test.txt'
+; fname = "test.txt"
+</pre>
+
+</body>
+</html>

Added: trunk/doc/en/html/macro/command/dirname.html
===================================================================
--- trunk/doc/en/html/macro/command/dirname.html	                        (rev 0)
+++ trunk/doc/en/html/macro/command/dirname.html	2010-12-23 11:17:05 UTC (rev 4254)
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <title>dirname</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>dirname</h1>
+
+<p>
+Gets the directory name from a path name.
+</p>
+
+<pre class="macro-syntax">
+dirname &lt;strvar&gt; &lt;path&gt;
+</pre>
+
+<h2>Remarks</h2>
+
+<!--p>
+??? &lt;path&gt; ??????????? &lt;strvar&gt; ??????<br>
+????????????????Aﾀ???????????
+</p-->
+
+<h2>Example</h2>
+
+<pre class="macro-example">
+dirname dir 'c:\teraterm\test.txt'
+; dir = "c:\teraterm"
+dirname dir 'c:\teraterm\'
+; dir = "c:"
+dirname dir 'c:\teraterm'
+; dir = "c:"
+</pre>
+
+</body>
+</html>

Modified: trunk/doc/en/html/macro/command/index.html
===================================================================
--- trunk/doc/en/html/macro/command/index.html	2010-12-23 05:36:03 UTC (rev 4253)
+++ trunk/doc/en/html/macro/command/index.html	2010-12-23 11:17:05 UTC (rev 4254)
@@ -132,6 +132,8 @@
 
 <h2>File operation commands</h2>
 <ul>
+ <li><a href="basename.html">basename</a> (version 4.69 or later)
+ <li><a href="dirname.html">dirname</a> (version 4.69 or later)
  <li><a href="fileclose.html">fileclose</a>
  <li><a href="fileconcat.html">fileconcat</a>
  <li><a href="filecopy.html">filecopy</a>

Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2010-12-23 05:36:03 UTC (rev 4253)
+++ trunk/doc/en/teraterm.hhc	2010-12-23 11:17:05 UTC (rev 4254)
@@ -1092,6 +1092,16 @@
 				</OBJECT>
 			<UL>
 				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="basename">
+					<param name="Local" value="html\macro\command\basename.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="dirname">
+					<param name="Local" value="html\macro\command\dirname.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="fileclose">
 					<param name="Local" value="html\macro\command\fileclose.html">
 					<param name="ImageNumber" value="11">

Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2010-12-23 05:36:03 UTC (rev 4253)
+++ trunk/doc/en/teraterm.hhp	2010-12-23 11:17:05 UTC (rev 4254)
@@ -151,6 +151,7 @@
 HlpMacroSyntaxExp=html\macro\syntax\expressions.html
 HlpMacroSyntaxLine=html\macro\syntax\lineformats.html
 HlpMacroCommand=html\macro\command\index.html
+HlpMacroCommandBasename=html\macro\command\basename.html
 HlpMacroCommandBeep=html\macro\command\beep.html
 HlpMacroCommandBplusrecv=html\macro\command\bplusrecv.html
 HlpMacroCommandBplussend=html\macro\command\bplussend.html
@@ -168,6 +169,7 @@
 HlpMacroCommandCrc32File=html\macro\command\crc32.html
 HlpMacroCommandCygConnect=html\macro\command\cygconnect.html
 HlpMacroCommandDelpassword=html\macro\command\delpassword.html
+HlpMacroCommandDirname=html\macro\command\dirname.html
 HlpMacroCommandDisconnect=html\macro\command\disconnect.html
 HlpMacroCommandDispstr=html\macro\command\dispstr.html
 HlpMacroCommandDo=html\macro\command\doloop.html

Added: trunk/doc/ja/html/macro/command/basename.html
===================================================================
--- trunk/doc/ja/html/macro/command/basename.html	                        (rev 0)
+++ trunk/doc/ja/html/macro/command/basename.html	2010-12-23 11:17:05 UTC (rev 4254)
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+  <title>basename</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>basename</h1>
+
+<p>
+??????????????
+</p>
+
+<pre class="macro-syntax">
+basename &lt;strvar&gt; &lt;path&gt;
+</pre>
+
+<h2>??</h2>
+
+<p>
+??? &lt;path&gt; ?????????? &lt;strvar&gt; ??????<br>
+????????????????Aﾀ???????????
+</p>
+
+<h2>?</h2>
+
+<pre class="macro-example">
+basename fname 'c:\teraterm\test.txt'
+; fname = "test.txt"
+</pre>
+
+</body>
+</html>

Added: trunk/doc/ja/html/macro/command/dirname.html
===================================================================
--- trunk/doc/ja/html/macro/command/dirname.html	                        (rev 0)
+++ trunk/doc/ja/html/macro/command/dirname.html	2010-12-23 11:17:05 UTC (rev 4254)
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+  <title>dirname</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>dirname</h1>
+
+<p>
+????????????????
+</p>
+
+<pre class="macro-syntax">
+dirname &lt;strvar&gt; &lt;path&gt;
+</pre>
+
+<h2>??</h2>
+
+<p>
+??? &lt;path&gt; ??????????? &lt;strvar&gt; ??????<br>
+????????????????Aﾀ???????????
+</p>
+
+<h2>?</h2>
+
+<pre class="macro-example">
+dirname dir 'c:\teraterm\test.txt'
+; dir = "c:\teraterm"
+dirname dir 'c:\teraterm\'
+; dir = "c:"
+dirname dir 'c:\teraterm'
+; dir = "c:"
+</pre>
+
+</body>
+</html>

Modified: trunk/doc/ja/html/macro/command/index.html
===================================================================
--- trunk/doc/ja/html/macro/command/index.html	2010-12-23 05:36:03 UTC (rev 4253)
+++ trunk/doc/ja/html/macro/command/index.html	2010-12-23 11:17:05 UTC (rev 4254)
@@ -132,6 +132,8 @@
 
 <h2>??????????</h2>
 <ul>
+ <li><a href="basename.html">basename</a> (?????4.69??)
+ <li><a href="dirname.html">dirname</a> (?????4.69??)
  <li><a href="fileclose.html">fileclose</a>
  <li><a href="fileconcat.html">fileconcat</a>
  <li><a href="filecopy.html">filecopy</a>

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2010-12-23 05:36:03 UTC (rev 4253)
+++ trunk/doc/ja/teraterm.hhc	2010-12-23 11:17:05 UTC (rev 4254)
@@ -1105,6 +1105,16 @@
 				</OBJECT>
 			<UL>
 				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="basename">
+					<param name="Local" value="html\macro\command\basename.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="dirname">
+					<param name="Local" value="html\macro\command\dirname.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="fileclose">
 					<param name="Local" value="html\macro\command\fileclose.html">
 					<param name="ImageNumber" value="11">

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2010-12-23 05:36:03 UTC (rev 4253)
+++ trunk/doc/ja/teraterm.hhp	2010-12-23 11:17:05 UTC (rev 4254)
@@ -161,6 +161,7 @@
 HlpMacroSyntaxExp=html\macro\syntax\expressions.html
 HlpMacroSyntaxLine=html\macro\syntax\lineformats.html
 HlpMacroCommand=html\macro\command\index.html
+HlpMacroCommandBasename=html\macro\command\basename.html
 HlpMacroCommandBeep=html\macro\command\beep.html
 HlpMacroCommandBplusrecv=html\macro\command\bplusrecv.html
 HlpMacroCommandBplussend=html\macro\command\bplussend.html
@@ -178,6 +179,7 @@
 HlpMacroCommandCrc32File=html\macro\command\crc32.html
 HlpMacroCommandCygConnect=html\macro\command\cygconnect.html
 HlpMacroCommandDelpassword=html\macro\command\delpassword.html
+HlpMacroCommandDirname=html\macro\command\dirname.html
 HlpMacroCommandDisconnect=html\macro\command\disconnect.html
 HlpMacroCommandDispstr=html\macro\command\dispstr.html
 HlpMacroCommandDo=html\macro\command\doloop.html

Modified: trunk/teraterm/common/helpid.h
===================================================================
--- trunk/teraterm/common/helpid.h	2010-12-23 05:36:03 UTC (rev 4253)
+++ trunk/teraterm/common/helpid.h	2010-12-23 11:17:05 UTC (rev 4254)
@@ -160,6 +160,7 @@
 #define HlpMacroSyntaxExp               91005
 #define HlpMacroSyntaxLine              91006
 #define HlpMacroCommand                 92000
+#define HlpMacroCommandBasename         92187
 #define HlpMacroCommandBeep             92001
 #define HlpMacroCommandBplusrecv        92002
 #define HlpMacroCommandBplussend        92003
@@ -177,6 +178,7 @@
 #define HlpMacroCommandCrc32File        92139
 #define HlpMacroCommandCygConnect       92130
 #define HlpMacroCommandDelpassword      92011
+#define HlpMacroCommandDirname          92188
 #define HlpMacroCommandDisconnect       92012
 #define HlpMacroCommandDispstr          92149
 #define HlpMacroCommandDo               92126

From svnnotify ＠ sourceforge.jp  Thu Dec 23 21:37:41 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 23 Dec 2010 21:37:41 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4255=5D_basename=2C__dirname_?=
 =?utf-8?b?44Oe44Kv44Ot44Kz44Oe44Oz44OJ44KS6L+95Yqg?=
Message-ID: <1293107861.036240.7086.nullmailer@users.sourceforge.jp>

Revision: 4255
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4255
Author:   maya
Date:     2010-12-23 21:37:40 +0900 (Thu, 23 Dec 2010)

Log Message:
-----------
basename, dirname ????????????菴遵?
  ?贋?絮ユ?

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-23 11:17:05 UTC (rev 4254)
+++ trunk/doc/en/html/about/history.html	2010-12-23 12:37:40 UTC (rev 4255)
@@ -46,6 +46,7 @@
       <li>addes support for the DECRQSS (Request terminal setting) control sequence. Supported control sequences are DECSCA, DECSCL, DECSTBM and SGR.</li>
       <li>added support for the DECFI, DECBI control sequences.</li>
       <!-- li>??????????????????????????80x640??????????ﾀ?????????????????????</li -->
+      <li>added the "<a href="../macro/command/basename.html">basename</a>" and "<a href="../macro/command/dirname.html">dirname</a>" macro command.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-23 11:17:05 UTC (rev 4254)
+++ trunk/doc/ja/html/about/history.html	2010-12-23 12:37:40 UTC (rev 4255)
@@ -46,6 +46,7 @@
       <li>DECRQSS(???????)???????????????????????????? DECSCA, DECSCL, DECSTBM, SGR?</li>
       <li>DECFI, DECBI ?????????????</li>
       <li>??????????????????????????80x640??????????ﾀ?????????????????????</li>
+      <li>??????? "<a href="../macro/command/basename.html">basename</a>", "<a href="../macro/command/dirname.html">dirname</a>" ??????</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Thu Dec 23 23:55:44 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 23 Dec 2010 23:55:44 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNTZdIEVzY2FwZSAvICBDU0kg44K344O8?=
 =?utf-8?b?44Kx44Oz44K55Lit44GrIDB4QTAg5Lul6ZmN44Gu5paH5a2X44GM5p2l44Gf?=
 =?utf-8?b?5aC05ZCI44CB44K344O844Kx44Oz44K544Gu6Kej6YeI44KS5Lit5pat44GZ?=
 =?utf-8?b?44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1293116144.831122.31580.nullmailer@users.sourceforge.jp>

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

Log Message:
-----------
Escape / CSI シーケンス中に 0xA0 以降の文字が来た場合、シーケンスの解釈を中断するようにした。
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=23931
# いまいち自信なし

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-23 12:37:40 UTC (rev 4255)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-23 14:55:44 UTC (rev 4256)
@@ -26,6 +26,8 @@
 
 #include "vtterm.h"
 
+void ParseFirst(BYTE b);
+
 #define MAPSIZE(x) (sizeof(x)/sizeof((x)[0]))
 #define Accept8BitCtrl ((VTlevel >= 2) && (ts.TermFlag & TF_ACCEPT8BITCTRL))
 
@@ -1367,6 +1369,10 @@
     ParseEscape(b);
   else if ((b>=0x80) && (b<=0x9F))
     ParseControl(b);
+  else if (b>=0xA0) {
+    ParseMode=ModeFirst;
+    ParseFirst(b);
+  }
 
   JustAfterESC = FALSE;
 }
@@ -2928,6 +2934,10 @@
     { /* private char */
       if (FirstPrm) Prv = b;
     }
+    else if (b>0xA0) {
+      ParseMode=ModeFirst;
+      ParseFirst(b);
+    }
   }
   FirstPrm = FALSE;
 }

From svnnotify ＠ sourceforge.jp  Fri Dec 24 03:00:49 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 24 Dec 2010 03:00:49 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNTddICDku4rlvozjgoLkvb/jgYbjgZM=?=
 =?utf-8?b?44Go44Gv54Sh44GE44Go5oCd44KP44KM44KL44CB44Kz44Oh44Oz44OI44Ki?=
 =?utf-8?b?44Km44OI44GV44KM44Gf6KGM44KS5YmK6Zmk44CC?=
Message-ID: <1293127249.283656.20706.nullmailer@users.sourceforge.jp>

Revision: 4257
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4257
Author:   doda
Date:     2010-12-24 03:00:49 +0900 (Fri, 24 Dec 2010)

Log Message:
-----------
今後も使うことは無いと思われる、コメントアウトされた行を削除。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-23 14:55:44 UTC (rev 4256)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-23 18:00:49 UTC (rev 4257)
@@ -2248,7 +2248,6 @@
       ts.ColorFlag ^= CF_REVERSEVIDEO;
 
 #ifdef ALPHABLEND_TYPE2
-//      BGInitialize();
       BGExchangeColor();
 #endif
       DispChangeBackground();
@@ -3418,7 +3417,6 @@
 	  case ModeXsEsc:
 		if (b == '\\') { /* String Terminator */
 			XsParseMode = PrevMode;
-//			XSequence(ST);
 			XSequence(BEL);
 		}
 		else { /* Other character -- invalid sequence */
@@ -3426,9 +3424,6 @@
 			XsParseMode = ModeXsFirst;
 		}
 		break;
-//	  default:
-//		ParseMode = ModeFirst;
-//		XsParseMode = ModeXsFirst;
 	}
 }
 

From svnnotify ＠ sourceforge.jp  Sat Dec 25 01:13:47 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 25 Dec 2010 01:13:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNThdICDoi7HoqLPjgpLov73liqDjgII=?=
Message-ID: <1293207227.817993.26669.nullmailer@users.sourceforge.jp>

Revision: 4258
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4258
Author:   yutakapon
Date:     2010-12-25 01:13:47 +0900 (Sat, 25 Dec 2010)

Log Message:
-----------
?沿┳??申???

Modified Paths:
--------------
    trunk/doc/en/html/macro/command/basename.html
    trunk/doc/en/html/macro/command/dirname.html
    trunk/doc/en/html/menu/setup-ssh.html


-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/basename.html
===================================================================
--- trunk/doc/en/html/macro/command/basename.html	2010-12-23 18:00:49 UTC (rev 4257)
+++ trunk/doc/en/html/macro/command/basename.html	2010-12-24 16:13:47 UTC (rev 4258)
@@ -14,7 +14,7 @@
 <h1>basename</h1>
 
 <p>
-Gets the file name from a path name.
+Returns trailing name component of path
 </p>
 
 <pre class="macro-syntax">
@@ -23,10 +23,10 @@
 
 <h2>Remarks</h2>
 
-<!--p>
-??? &lt;path&gt; ?????????? &lt;strvar&gt; ??????<br>
-????????????????Aﾀ???????????
-</p-->
+<p>
+Given a &lt;path&gt; string containing the path to a file or directory, this macro will return the trailing name component into the &lt;strvar&gt; variable name.<br>
+The file or directory will need not be existed.
+</p>
 
 <h2>Example</h2>
 

Modified: trunk/doc/en/html/macro/command/dirname.html
===================================================================
--- trunk/doc/en/html/macro/command/dirname.html	2010-12-23 18:00:49 UTC (rev 4257)
+++ trunk/doc/en/html/macro/command/dirname.html	2010-12-24 16:13:47 UTC (rev 4258)
@@ -14,7 +14,7 @@
 <h1>dirname</h1>
 
 <p>
-Gets the directory name from a path name.
+Returns the directory name from a path name.
 </p>
 
 <pre class="macro-syntax">
@@ -23,10 +23,10 @@
 
 <h2>Remarks</h2>
 
-<!--p>
-??? &lt;path&gt; ??????????? &lt;strvar&gt; ??????<br>
-????????????????Aﾀ???????????
-</p-->
+<p>
+Given a &lt;path&gt; pathname, this macro will delete any suffix beginning with the last slash('/') character and return the result into the &lt;strvar&gt; variable name.<br>
+The pathname will need not be existed.
+</p>
 
 <h2>Example</h2>
 

Modified: trunk/doc/en/html/menu/setup-ssh.html
===================================================================
--- trunk/doc/en/html/menu/setup-ssh.html	2010-12-23 18:00:49 UTC (rev 4257)
+++ trunk/doc/en/html/menu/setup-ssh.html	2010-12-24 16:13:47 UTC (rev 4258)
@@ -50,9 +50,9 @@
       </dd>
 
       <dt>Confirm agent forwarding</dt>
-      <!--dd>
-	?????? SSH ??????????????????????? Pageant ?????????????????????
-      </dd-->
+      <dd>
+	When the SSH agent-forwarding is requested, a user will confirm contacting the Pageant.
+      </dd>
     </dl>
   </body>
 </html>

From svnnotify ＠ sourceforge.jp  Mon Dec 27 11:41:32 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 27 Dec 2010 11:41:32 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNTldICDjgrPjg6Hjg7Pjg4jkv67mraM=?=
Message-ID: <1293417692.943097.17173.nullmailer@users.sourceforge.jp>

Revision: 4259
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4259
Author:   doda
Date:     2010-12-27 11:41:32 +0900 (Mon, 27 Dec 2010)

Log Message:
-----------
コメント修正

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c


-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2010-12-24 16:13:47 UTC (rev 4258)
+++ trunk/teraterm/teraterm/vtterm.c	2010-12-27 02:41:32 UTC (rev 4259)
@@ -2057,7 +2057,7 @@
 	  SendCSIstr(Report, len);
 	}
 	break;
-      case 14: /* get window size??? */
+      case 14: /* get window size */
 	if (ts.WindowFlag & WF_WINDOWREPORT) {
 	  DispGetWindowSize(&x, &y);
 	  len = _snprintf_s_l(Report, sizeof(Report), _TRUNCATE, "4;%d;%dt", CLocale, y, x);
@@ -2834,7 +2834,7 @@
 //	    case 'O': break;				// EA   -- Not support
 	    case 'P': CSDeleteCharacter(); break;       // DCH
 //	    case 'Q': break;				// SEE  -- Not support
-//	    case 'R': break;				// CPR  -- Not support
+//	    case 'R': break;				// CPR  -- Report only, ignore.
 	    case 'S': CSScrollUP(); break;              // SU
 	    case 'T': CSScrollDown(); break;            // SD
 //	    case 'U': break;				// NP   -- Not support

From svnnotify ＠ sourceforge.jp  Tue Dec 28 11:49:24 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 28 Dec 2010 11:49:24 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B4260=5D__ConfirmChangePaste_?=
 =?utf-8?b?44GMIG9uIOOBruaZguOAgUFsdCtS44Gn44Gu5by144KK5LuY44GR44Gv5LiA?=
 =?utf-8?b?6KGM44Gu44G/44Gn44KC56K66KqN44GZ44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1293504564.367797.16591.nullmailer@users.sourceforge.jp>

Revision: 4260
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4260
Author:   doda
Date:     2010-12-28 11:49:24 +0900 (Tue, 28 Dec 2010)

Log Message:
-----------
ConfirmChangePaste ??on ?????lt+R?с?綣泣?篁?????茵???帥???∈茯?????????????
Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/clipboar.c
    trunk/teraterm/teraterm/clipboar.h
    trunk/teraterm/teraterm/vtwin.cpp


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/doc/en/html/about/history.html	2010-12-28 02:49:24 UTC (rev 4260)
@@ -46,6 +46,7 @@
       <li>addes support for the DECRQSS (Request terminal setting) control sequence. Supported control sequences are DECSCA, DECSCL, DECSTBM and SGR.</li>
       <li>added support for the DECFI, DECBI control sequences.</li>
       <!-- li>??????????????????????????80x640??????????ﾀ?????????????????????</li -->
+      <!-- li>??????????????????Alt+R?????????????????m?????????</li -->
       <li>added the "<a href="../macro/command/basename.html">basename</a>" and "<a href="../macro/command/dirname.html">dirname</a>" macro command.</li>
     </ul>
   </li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/doc/ja/html/about/history.html	2010-12-28 02:49:24 UTC (rev 4260)
@@ -46,6 +46,7 @@
       <li>DECRQSS(???????)???????????????????????????? DECSCA, DECSCL, DECSTBM, SGR?</li>
       <li>DECFI, DECBI ?????????????</li>
       <li>??????????????????????????80x640??????????ﾀ?????????????????????</li>
+      <li>??????????????????Alt+R?????????????????m?????????</li>
       <li>??????? "<a href="../macro/command/basename.html">basename</a>", "<a href="../macro/command/dirname.html">dirname</a>" ??????</li>
     </ul>
   </li>

Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/teraterm/teraterm/clipboar.c	2010-12-28 02:49:24 UTC (rev 4260)
@@ -678,7 +678,7 @@
 //
 // (2008.2.3 yutaka)
 //
-int CBStartPasteConfirmChange(HWND HWin)
+int CBStartPasteConfirmChange(HWND HWin, BOOL AddCR)
 {
 	UINT Cf;
 	HANDLE hText;
@@ -710,7 +710,7 @@
 	if (hText != NULL) {
 		pText = (char *)GlobalLock(hText);
 		pos = strcspn(pText, "\r\n");  // ??????????
-		if (pText[pos] != '\0') {
+		if (pText[pos] != '\0' || AddCR) {
 			confirm = 1;
 
 		} else {

Modified: trunk/teraterm/teraterm/clipboar.h
===================================================================
--- trunk/teraterm/teraterm/clipboar.h	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/teraterm/teraterm/clipboar.h	2010-12-28 02:49:24 UTC (rev 4260)
@@ -17,7 +17,7 @@
 void CBSend();
 void CBEcho();
 void CBEndPaste();
-int CBStartPasteConfirmChange(HWND HWin);
+int CBStartPasteConfirmChange(HWND HWin, BOOL AddCR);
 
 #ifdef __cplusplus
 }

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/teraterm/teraterm/vtwin.cpp	2010-12-28 02:49:24 UTC (rev 4260)
@@ -783,7 +783,7 @@
 
 	// added ConfirmPasteMouseRButton (2007.3.17 maya)
 	if (pasteRButton && !ts.ConfirmPasteMouseRButton) {
-		if (CBStartPasteConfirmChange(HVTWin)) {
+		if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
 			CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
 			/* ??????ｩ????????????? 			   ???????X??????? */
@@ -793,7 +793,7 @@
 		}
 	}
 	else if (pasteMButton) {
-		if (CBStartPasteConfirmChange(HVTWin)) {
+		if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
 			CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
 			/* ??????ｩ????????????? 			   ???????X??????? */
@@ -3972,7 +3972,7 @@
 void CVTWindow::OnEditPaste()
 {
 	// add confirm (2008.2.4 yutaka)
-	if (CBStartPasteConfirmChange(HVTWin)) {
+	if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
 		CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
 		/* ??????ｩ????????????? 		   ???????X??????? */
@@ -3985,7 +3985,7 @@
 void CVTWindow::OnEditPasteCR()
 {
 	// add confirm (2008.3.11 maya)
-	if (CBStartPasteConfirmChange(HVTWin)) {
+	if (CBStartPasteConfirmChange(HVTWin, TRUE)) {
 		CBStartPaste(HVTWin, TRUE, BracketedPasteMode(), 0, NULL, 0);
 		/* ??????ｩ????????????? 		   ???????X??????? */

From svnnotify ＠ sourceforge.jp  Tue Dec 28 13:55:01 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 28 Dec 2010 13:55:01 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNjFdICBBbHQrUiDjga7mmYLjga/noro=?=
 =?utf-8?b?6KqN44KS6KGM44KP44Gq44GE44KI44GG44Gr5Ye65p2l44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1293512101.262886.8381.nullmailer@users.sourceforge.jp>

Revision: 4261
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4261
Author:   doda
Date:     2010-12-28 13:55:01 +0900 (Tue, 28 Dec 2010)

Log Message:
-----------
Alt+R ?????∈茯??茵????????????ャ??????????

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/clipboar.c
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/installer/release/TERATERM.INI	2010-12-28 04:55:01 UTC (rev 4261)
@@ -51,6 +51,7 @@
 ConfirmChangePaste=on
 PasteDialogSize=330,220
 ConfirmChangePasteStringFile=
+DontConfirmPasteCR=off
 
 ; Scroll out the current buffer when the clear screen does.
 ScrollWindowClearScreen=on

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/teraterm/common/tttypes.h	2010-12-28 04:55:01 UTC (rev 4261)
@@ -504,6 +504,7 @@
 	WORD DisableMenuDuplicateSession;
 	WORD DisableMenuNewConnection;
 	char TerminalUID[9];
+	WORD DontConfirmPasteCR;
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -941,6 +942,7 @@
  *
  * - At version 4.69, ttset_memfilemap was replaced with ttset_memfilemap_15.
  *   added tttset.TerminalUID.
+ *   added tttset.DontConfirmPasteCR.
  *
  * - At version 4.68, ttset_memfilemap was replaced with ttset_memfilemap_14.
  *   increase WinList(MAXNWIN) size.

Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/teraterm/teraterm/clipboar.c	2010-12-28 04:55:01 UTC (rev 4261)
@@ -709,10 +709,11 @@
 
 	if (hText != NULL) {
 		pText = (char *)GlobalLock(hText);
-		pos = strcspn(pText, "\r\n");  // ??????????
-		if (pText[pos] != '\0' || AddCR) {
-			confirm = 1;
-
+		if (!(ts.DontConfirmPasteCR && AddCR)) {
+			pos = strcspn(pText, "\r\n");  // ??????????
+			if (pText[pos] != '\0' || AddCR) {
+				confirm = 1;
+			}
 		} else {
 			// ｫ??T????
 			if (search_clipboard(ts.ConfirmChangePasteStringFile, pText)) {

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/teraterm/ttpset/ttset.c	2010-12-28 04:55:01 UTC (rev 4261)
@@ -1390,6 +1390,9 @@
 	// Lock Terminal UID
 	if (GetOnOff(Section, "LockTUID", FName, TRUE))
 		ts->TermFlag |= TF_LOCKTUID;
+	
+	// Don't confirm PasteCR
+	ts->DontConfirmPasteCR = GetOnOff(Section, "DontConfirmPasteCR", FName, FALSE);
 }
 
 void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2413,6 +2416,9 @@
 
 	// Lock Terminal UID
 	WriteOnOff(Section, "LockTUID", FName, ts->TermFlag & TF_LOCKTUID);
+
+	// Don't confirm PasteCR
+	WriteOnOff(Section, "DontConfirmPasteCR", FName, ts->DontConfirmPasteCR);
 }
 
 #define VTEditor "VT editor keypad"

From svnnotify ＠ sourceforge.jp  Tue Dec 28 15:29:54 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 28 Dec 2010 15:29:54 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNjJdICBIVE1MIGhlbHAg44Gu55uu5qyh?=
 =?utf-8?b?44Gu5pu05paw44GX5b+Y44KM44CC?=
Message-ID: <1293517794.674267.20811.nullmailer@users.sourceforge.jp>

Revision: 4262
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4262
Author:   doda
Date:     2010-12-28 15:29:54 +0900 (Tue, 28 Dec 2010)

Log Message:
-----------
HTML help ???罨＜??贋???????

Modified Paths:
--------------
    trunk/doc/en/teraterm.hhc
    trunk/doc/ja/teraterm.hhc


-------------- next part --------------
Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2010-12-28 04:55:01 UTC (rev 4261)
+++ trunk/doc/en/teraterm.hhc	2010-12-28 06:29:54 UTC (rev 4262)
@@ -129,6 +129,17 @@
 			<param name="Local" value="html\usage\transparent.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Additional plugins">
+			<param name="ImageNumber" value="1">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Window resize plugin">
+				<param name="Local" value="html\usage\resizemenu.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="VT window commands">
@@ -359,6 +370,17 @@
 			<param name="Local" value="html\menu\help.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Addtional plugins">
+			<param name="ImageNumber" value="1">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="[Resize] menu">
+				<param name="Local" value="html\menu\resize.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="TEK window commands">

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2010-12-28 04:55:01 UTC (rev 4261)
+++ trunk/doc/ja/teraterm.hhc	2010-12-28 06:29:54 UTC (rev 4262)
@@ -114,11 +114,6 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="??????ｩ???">
-			<param name="Local" value="html\usage\kcodechange.html">
-			<param name="ImageNumber" value="11">
-			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="LogMeTT">
 			<param name="Local" value="html\usage\LogMeTT\LogMeTTTutorial.htm">
 			<param name="ImageNumber" value="11">
@@ -138,6 +133,22 @@
 			<param name="Local" value="html\usage\transparent.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="???????">
+			<param name="ImageNumber" value="1">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="??????ｩ???">
+				<param name="Local" value="html\usage\kcodechange.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="???????????????">
+				<param name="Local" value="html\usage\resizemenu.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="VT window ?????">
@@ -368,6 +379,17 @@
 			<param name="Local" value="html\menu\help.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="???????">
+			<param name="ImageNumber" value="1">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="[Resize] ????">
+				<param name="Local" value="html\menu\resize.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="TEK window ?????">

From svnnotify ＠ sourceforge.jp  Tue Dec 28 15:55:08 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 28 Dec 2010 15:55:08 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNjNdICDoi7Hoqp7niYggaW5kZXggLCAg?=
 =?utf-8?b?44GK44KI44GzIEhUTUwgaGVscCDjga7nm67mrKHjgasgVFRYdHR5cGxheSA=?=
 =?utf-8?b?44Gu44Kz44Oe44Oz44OJ44Op44Kk44Oz44Kq44OX44K344On44Oz44G444Gu?=
 =?utf-8?b?44Oq44Oz44Kv44KS6L+95Yqg44CC?=
Message-ID: <1293519308.733691.16090.nullmailer@users.sourceforge.jp>

Revision: 4263
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4263
Author:   doda
Date:     2010-12-28 15:55:08 +0900 (Tue, 28 Dec 2010)

Log Message:
-----------
?沿???index, ?????HTML help ???罨＜? TTXttyplay ??????????ゃ?????激??潟?????潟???申???

Modified Paths:
--------------
    trunk/doc/en/html/index.html
    trunk/doc/en/teraterm.hhc
    trunk/doc/ja/teraterm.hhc


-------------- next part --------------
Modified: trunk/doc/en/html/index.html
===================================================================
--- trunk/doc/en/html/index.html	2010-12-28 06:29:54 UTC (rev 4262)
+++ trunk/doc/en/html/index.html	2010-12-28 06:55:08 UTC (rev 4263)
@@ -114,6 +114,10 @@
  <LI><A HREF="commandline/ttssh.html">TTSSH</A></LI>
  <LI><A HREF="commandline/cygterm.html">CygTerm+</A></LI>
  <LI><A HREF="commandline/ttproxy.html">TTProxy</A></LI>
+ <li>Additional plugins
+   <ul>
+     <li><a href="commandline/ttxttyplay.html">TTXttyplay</a></li>
+   </ul></li>
 </UL>
 
 

Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2010-12-28 06:29:54 UTC (rev 4262)
+++ trunk/doc/en/teraterm.hhc	2010-12-28 06:55:08 UTC (rev 4263)
@@ -467,6 +467,17 @@
 			<param name="Local" value="html\commandline\ttproxy.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Additional plugins">
+			<param name="ImageNumber" value="1">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="TTXttyplay">
+				<param name="Local" value="html\commandline\ttxttyplay.html">
+				<param name="ImageNumber" value="11">
+			</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Setup files">

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2010-12-28 06:29:54 UTC (rev 4262)
+++ trunk/doc/ja/teraterm.hhc	2010-12-28 06:55:08 UTC (rev 4263)
@@ -476,6 +476,17 @@
 			<param name="Local" value="html\commandline\ttproxy.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="???????">
+			<param name="ImageNumber" value="1">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="TTXttyplay">
+				<param name="Local" value="html\commandline\ttxttyplay.html">
+				<param name="ImageNumber" value="11">
+				</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="??????">

From svnnotify ＠ sourceforge.jp  Thu Dec 30 14:39:20 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 30 Dec 2010 14:39:20 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNjRdICDkuK3lm73oqp7oqK3lrprjgpI=?=
 =?utf-8?b?5L+u5q2j44GX44Gf44CC?=
Message-ID: <1293687560.819111.5322.nullmailer@users.sourceforge.jp>

Revision: 4264
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4264
Author:   yutakapon
Date:     2010-12-30 14:39:20 +0900 (Thu, 30 Dec 2010)

Log Message:
-----------
筝??茯?┃絎??篆???????cf.
http://tfidf.net/memos/teraterm-chinese.htm
http://diary.sshida.com/20100521-4-diary.html

Modified Paths:
--------------
    trunk/doc/en/html/usage/unicode.html
    trunk/doc/ja/html/usage/unicode.html


-------------- next part --------------
Modified: trunk/doc/en/html/usage/unicode.html
===================================================================
--- trunk/doc/en/html/usage/unicode.html	2010-12-28 06:55:08 UTC (rev 4263)
+++ trunk/doc/en/html/usage/unicode.html	2010-12-30 05:39:20 UTC (rev 4264)
@@ -76,14 +76,14 @@
 </ul>
 
 <h4>Example of WindowsXP Simplified Chinese</h4>
-<pre>
-; Locale for Unicode
-Locale = chs
 
-; CodePage for Unicode
-CodePage = 936
-</pre>
+<ul>
+ <li>On Setup -> Terminal dialog, select locale=chs and CodePage=65001.</li>
+ <li>On Setup -> Font dialog, select FontName=NSimSun, CharacterSet=CHINESE_GB2312 and Size=9.</li>
+</ul>
 
+
+
 <h4>Example of WindowsXP USA</h4>
 <pre>
 ; Locale for Unicode

Modified: trunk/doc/ja/html/usage/unicode.html
===================================================================
--- trunk/doc/ja/html/usage/unicode.html	2010-12-28 06:55:08 UTC (rev 4263)
+++ trunk/doc/ja/html/usage/unicode.html	2010-12-30 05:39:20 UTC (rev 4264)
@@ -74,14 +74,14 @@
 </ul>
 
 <h4>???: WindowsXP ??????</h4>
-<pre>
-; Locale for Unicode
-Locale = chs
 
-; CodePage for Unicode
-CodePage = 936
-</pre>
+<ul>
+ <li>Setup -> Terminal ? locale=chs, CodePage=65001 ????? </li>
+ <li>Setup -> Font ? ?????=NSimSun, ?????=CHINESE_GB2312, ???=9 ?????? </li>
+</ul>
 
+
+
 <h4>???: WindowsXP ??</h4>
 <pre>
 ; Locale for Unicode

From svnnotify ＠ sourceforge.jp  Thu Dec 30 14:59:16 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 30 Dec 2010 14:59:16 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQyNjVdICDoi7HoqLPjgpLov73liqDjgII=?=
Message-ID: <1293688756.542990.27642.nullmailer@users.sourceforge.jp>

Revision: 4265
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4265
Author:   yutakapon
Date:     2010-12-30 14:59:16 +0900 (Thu, 30 Dec 2010)

Log Message:
-----------
?沿┳??申???

?＜??帥???CP?????拭????翫???????????狗?篋????В?ゃ????????ｃ?????с????
????ｃ???????荐??蕁???障???
Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/macro/command/scprecv.html
    trunk/doc/en/html/macro/command/scpsend.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/macro/command/scprecv.html
    trunk/doc/ja/html/macro/command/scpsend.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-30 05:39:20 UTC (rev 4264)
+++ trunk/doc/en/html/about/history.html	2010-12-30 05:59:16 UTC (rev 4265)
@@ -1629,11 +1629,11 @@
     </ul>
   </li -->
 
-  <!-- li>Bug fixes
+  <li>Bug fixes
     <ul>
-      <li>SCP ????????2GB????????????????????????B</li>
+      <li>The 2GB over file can not transfer by using the SCP protocol.</li>
     </ul>
-  </li -->
+  </li>
 
   <li>Misc
     <ul>

Modified: trunk/doc/en/html/macro/command/scprecv.html
===================================================================
--- trunk/doc/en/html/macro/command/scprecv.html	2010-12-30 05:39:20 UTC (rev 4264)
+++ trunk/doc/en/html/macro/command/scprecv.html	2010-12-30 05:59:16 UTC (rev 4265)
@@ -27,8 +27,6 @@
 Causes Tera Term to receive the remote file &lt;remote filename&gt; to the host with the SCP(Secure Copy Protocol) protocol. 
 If the local file &lt;local filename&gt; is omitted, the file &lt;remote filename&gt; would be copied in the current directory of the local host.
 Tera Term does not pause until the end of the file transfer.<br>
-
-Also, the 2GB over file does not work.
 </p>
 
 <h2>Example</h2>

Modified: trunk/doc/en/html/macro/command/scpsend.html
===================================================================
--- trunk/doc/en/html/macro/command/scpsend.html	2010-12-30 05:39:20 UTC (rev 4264)
+++ trunk/doc/en/html/macro/command/scpsend.html	2010-12-30 05:59:16 UTC (rev 4265)
@@ -27,8 +27,6 @@
 Causes Tera Term to send the file &lt;filename&gt; to the host with the SCP(Secure Copy Protocol) protocol. 
 If the file &lt;destination filename&gt; is omitted, the file &lt;filename&gt; would be copied in the home directory of the remote host.
 Tera Term does not pause until the end of the file transfer.<br>
-
-Also, the 2GB over file does not work.
 </p>
 
 <h2>Example</h2>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-30 05:39:20 UTC (rev 4264)
+++ trunk/doc/ja/html/about/history.html	2010-12-30 05:59:16 UTC (rev 4265)
@@ -1633,7 +1633,7 @@
 
   <li>????     <ul>
-      <li>SCP ????????2GB????????????????????????B</li>
+      <li>SCP ????????2GB????????????????????????B</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/macro/command/scprecv.html
===================================================================
--- trunk/doc/ja/html/macro/command/scprecv.html	2010-12-30 05:39:20 UTC (rev 4264)
+++ trunk/doc/ja/html/macro/command/scprecv.html	2010-12-30 05:59:16 UTC (rev 4265)
@@ -27,8 +27,6 @@
 ???? &lt;remote filename&gt; ? SCP(Secure Copy Protocol) ???????????
 ???????? &lt;local filename&gt; ????????A???????????????????????????????
 ????????????A???????ﾀ??????????<br>
-
-???2GB???????????????????
 </p>
 
 <h2>?</h2>

Modified: trunk/doc/ja/html/macro/command/scpsend.html
===================================================================
--- trunk/doc/ja/html/macro/command/scpsend.html	2010-12-30 05:39:20 UTC (rev 4264)
+++ trunk/doc/ja/html/macro/command/scpsend.html	2010-12-30 05:59:16 UTC (rev 4265)
@@ -27,8 +27,6 @@
 ???? &lt;filename&gt; ? SCP(Secure Copy Protocol) ???????????
 ???????????A??????????????????????????????
 ????????????A???????ﾀ??????????<br>
-
-???2GB???????????????????
 </p>
 
 <h2>?</h2>