From scmnotify ＠ osdn.net  Fri Jun  1 10:16:08 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 01 Jun 2018 10:16:08 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMjRdICDjg6rjg7Pjgq/kv67mraMgWyB0?=
 =?utf-8?q?eraterm=3A1303=5D?=
Message-ID: <1527815768.629796.26313.nullmailer@users.osdn.me>

Revision: 7124
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7124
Author:   doda
Date:     2018-06-01 10:16:08 +0900 (Fri, 01 Jun 2018)
Log Message:
-----------
リンク修正 [teraterm:1303]

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

-------------- next part --------------
Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html	2018-05-31 12:56:10 UTC (rev 7123)
+++ trunk/doc/en/html/setup/teraterm-ini.html	2018-06-01 01:16:08 UTC (rev 7124)
@@ -1250,7 +1250,7 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="TerminalSpeed"><a href="../menu/setup-com.html#TerminalSpeed">TerminalSpeed</a></td>
+		<td id="TerminalSpeed"><a href="teraterm-com.html#TerminalSpeed">TerminalSpeed</a></td>
 		<td style="width:250px;">38400</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>

Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html	2018-05-31 12:56:10 UTC (rev 7123)
+++ trunk/doc/ja/html/setup/teraterm-ini.html	2018-06-01 01:16:08 UTC (rev 7124)
@@ -1250,7 +1250,7 @@
 		<td></td>
 	</tr>
 	<tr>
-		<td id="TerminalSpeed"><a href="../menu/setup-com.html#TerminalSpeed">TerminalSpeed</a></td>
+		<td id="TerminalSpeed"><a href="teraterm-com.html#TerminalSpeed">TerminalSpeed</a></td>
 		<td style="width:250px;">38400</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>

From scmnotify ＠ osdn.net  Sat Jun  2 17:33:58 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 02 Jun 2018 17:33:58 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7125=5D_Windows95/_NT4_=E3=81=A7_TTX?=
 =?utf-8?b?UmVzaXplTWVudSDjgYzoqq3jgb/ovrzjgoHjgarjgYTllY/poYzjgpLkv64=?=
 =?utf-8?b?5q2j44CCNC44NCAocjU2NDcpIOS7pemZjeOBq+OBpueZuueUnw==?=
Message-ID: <1527928438.607216.81687.nullmailer@users.osdn.me>

Revision: 7125
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7125
Author:   maya
Date:     2018-06-02 17:33:58 +0900 (Sat, 02 Jun 2018)
Log Message:
-----------
Windows95/NT4 で TTXResizeMenu が読み込めない問題を修正。4.84(r5647)以降にて発生

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5647

Modified Paths:
--------------
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj

-------------- next part --------------
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj	2018-06-01 01:16:08 UTC (rev 7124)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj	2018-06-02 08:33:58 UTC (rev 7125)
@@ -60,6 +60,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -77,6 +78,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj	2018-06-01 01:16:08 UTC (rev 7124)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj	2018-06-02 08:33:58 UTC (rev 7125)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj	2018-06-01 01:16:08 UTC (rev 7124)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj	2018-06-02 08:33:58 UTC (rev 7125)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj	2018-06-01 01:16:08 UTC (rev 7124)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj	2018-06-02 08:33:58 UTC (rev 7125)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj	2018-06-01 01:16:08 UTC (rev 7124)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v15.vcxproj	2018-06-02 08:33:58 UTC (rev 7125)
@@ -65,6 +65,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -82,6 +83,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj	2018-06-01 01:16:08 UTC (rev 7124)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj	2018-06-02 08:33:58 UTC (rev 7125)
@@ -64,6 +64,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="2"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -138,6 +139,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="1"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj	2018-06-01 01:16:08 UTC (rev 7124)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj	2018-06-02 08:33:58 UTC (rev 7125)
@@ -63,6 +63,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="2"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -138,6 +139,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="1"
+				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"

From scmnotify ＠ osdn.net  Sat Jun  2 17:34:43 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 02 Jun 2018 17:34:43 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7126=5D_Windows95/98/Me/_NT4_?=
 =?utf-8?b?44GnIFRUWFJlc2l6ZU1lbnUg44Gu44Oh44OL44Ol44O844GM6KGo56S644GV?=
 =?utf-8?b?44KM44Gq44GE5ZWP6aGM44KS5L+u5q2j?=
Message-ID: <1527928483.245020.85479.nullmailer@users.osdn.me>

Revision: 7126
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7126
Author:   maya
Date:     2018-06-02 17:34:43 +0900 (Sat, 02 Jun 2018)
Log Message:
-----------
Windows95/98/Me/NT4 で TTXResizeMenu のメニューが表示されない問題を修正

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

-------------- next part --------------
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c	2018-06-02 08:33:58 UTC (rev 7125)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c	2018-06-02 08:34:43 UTC (rev 7126)
@@ -232,8 +232,14 @@
   if (pvar->MenuItems > 0) {
     InitMenu();
 
-    memset(&mi, 0, sizeof(mi));
-    mi.cbSize = sizeof(mi);
+    if (IsWindows2000OrLater()) {
+      memset(&mi, 0, sizeof(MENUITEMINFO));
+      mi.cbSize = sizeof(MENUITEMINFO);
+    }
+    else {
+      memset(&mi, 0, sizeof(MENUITEMINFO)-sizeof(HBITMAP));
+      mi.cbSize = sizeof(MENUITEMINFO)-sizeof(HBITMAP);
+    }
     mi.fMask  = MIIM_TYPE | MIIM_SUBMENU;
     mi.fType  = MFT_STRING;
     mi.hSubMenu = pvar->ResizeMenu;

From scmnotify ＠ osdn.net  Wed Jun  6 18:59:53 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 06 Jun 2018 18:59:53 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMjddICDliIfmlq3lvozjga4gU1NIIEZv?=
 =?utf-8?b?cndhcmRpbmcg44OA44Kk44Ki44Ot44Kw44GM5q2j44GX44GE54q25oWL44KS?=
 =?utf-8?b?6KGo56S644GX44Gq44GE5ZWP6aGM44KS5L+u5q2jICAjMzgzMTQ=?=
Message-ID: <1528279193.026098.101366.nullmailer@users.osdn.me>

Revision: 7127
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7127
Author:   doda
Date:     2018-06-06 18:59:52 +0900 (Wed, 06 Jun 2018)
Log Message:
-----------
切断後の SSH Forwarding ダイアログが正しい状態を表示しない問題を修正  #38314

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/38314

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/fwdui.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2018-06-02 08:34:43 UTC (rev 7126)
+++ trunk/doc/en/html/about/history.html	2018-06-06 09:59:52 UTC (rev 7127)
@@ -31,6 +31,15 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.100">2018.08.xx (Ver 4.100)</a></h3>
+<ul class="history">
+  <li>Misc
+    <ul>
+      <li>upgraded TTSSH to <a href="#ttssh_2.86">2.86</a>.</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="teraterm_4.99">2018.05.31 (Ver 4.99)</a></h3>
 <ul class="history">
   <li>Changes
@@ -3008,6 +3017,15 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.86">2018.08.xx (Ver 2.86)</a></h3>
+<ul class="history">
+  <li>Bug fixes
+    <ul>
+      <li>SSH Forwarding dialog shows incorrect setting after the connection is closed.</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.85">2018.05.31 (Ver 2.85)</a></h3>
 <ul class="history">
   <li>Changes

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2018-06-02 08:34:43 UTC (rev 7126)
+++ trunk/doc/ja/html/about/history.html	2018-06-06 09:59:52 UTC (rev 7127)
@@ -33,6 +33,15 @@
 
 <h3><a name="teraterm_4.99">2018.05.31 (Ver 4.99)</a></h3>
 <ul class="history">
+  <li>\x82\xBB\x82?\xBC
+    <ul>
+      <li><a href="#ttssh_2.86">TTSSH(2.86)</a>\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
+<h3><a name="teraterm_4.99">2018.05.31 (Ver 4.99)</a></h3>
+<ul class="history">
   <li>\x95ύX
     <ul>
       <li>DECSACE \x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X\x82?Ή\x9E\x82\xB5\x82\xBD\x81B
@@ -3014,6 +3023,15 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.86">2018.08.xx (Ver 2.86)</a></h3>
+<ul class="history">
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li>\x83R\x83l\x83N\x83V\x83\x87\x83\x93\x82??f\x8C\xE3\x81ASSH Forwarding \x83_\x83C\x83A\x83\x8D\x83O\x82Ŋ?\xE1\x82\xC1\x82\xBD\x90?肪\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.85">2018.05.31 (Ver 2.85)</a></h3>
 <ul class="history">
   <li>\x95ύX

Modified: trunk/ttssh2/ttxssh/fwdui.c
===================================================================
--- trunk/ttssh2/ttxssh/fwdui.c	2018-06-02 08:34:43 UTC (rev 7126)
+++ trunk/ttssh2/ttxssh/fwdui.c	2018-06-06 09:59:52 UTC (rev 7127)
@@ -377,6 +377,7 @@
 
 void FWDUI_init(PTInstVar pvar)
 {
+	FWDUI_load_settings(pvar);
 }
 
 void FWDUI_end(PTInstVar pvar)

From scmnotify ＠ osdn.net  Sat Jun  9 13:54:09 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 09 Jun 2018 13:54:09 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMjhdICBXaW5kb3dzIDEwIOOBruOAjA==?=
 =?utf-8?b?44Ki44OX44Oq44Go5qmf6IO944CN44Gr44Oq44K544OI44Ki44OD44OX44GV?=
 =?utf-8?b?44KM44Gq44GE44Gu44Gn6Kq/5pW0?=
Message-ID: <1528520049.877879.80222.nullmailer@users.osdn.me>

Revision: 7128
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7128
Author:   maya
Date:     2018-06-09 13:54:09 +0900 (Sat, 09 Jun 2018)
Log Message:
-----------
Windows 10 の「アプリと機能」にリストアップされないので調整

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

-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2018-06-06 09:59:52 UTC (rev 7127)
+++ trunk/installer/teraterm.iss	2018-06-09 04:54:09 UTC (rev 7128)
@@ -28,10 +28,15 @@
 
 [Setup]
 AppCopyright=(C) 2004-2018 TeraTerm Project
+AppPublisher=TeraTerm Project
+AppPublisherURL=https://ttssh2.osdn.jp/
+AppSupportURL=https://ttssh2.osdn.jp/
 AppName={#AppName}
 #ifndef snapshot
+AppVersion={#AppVer}
 AppVerName={#AppName} {#AppVer}
 #else
+AppVersion={#AppVer}+ snapshot-{#snapshot}
 AppVerName={#AppName} {#AppVer}+ snapshot-{#snapshot}
 #endif
 LicenseFile=release\license.txt

From scmnotify ＠ osdn.net  Mon Jun 11 23:22:14 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 11 Jun 2018 23:22:14 +0900
Subject: [Ttssh2-commit] [7129] create branch r7128
Message-ID: <1528726934.420028.8348.nullmailer@users.osdn.me>

Revision: 7129
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7129
Author:   zmatsuo
Date:     2018-06-11 23:22:14 +0900 (Mon, 11 Jun 2018)
Log Message:
-----------
create branch r7128

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7128

Added Paths:
-----------
    branches/drag_and_drop/

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


From scmnotify ＠ osdn.net  Mon Jun 11 23:34:12 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 11 Jun 2018 23:34:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMzBdICBkcmFnIGFuZCBkcm9w44Gu5pS5?=
 =?utf-8?b?6Imv?=
Message-ID: <1528727652.421499.27907.nullmailer@users.osdn.me>

Revision: 7130
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7130
Author:   zmatsuo
Date:     2018-06-11 23:34:12 +0900 (Mon, 11 Jun 2018)
Log Message:
-----------
drag and dropの改良
- ダイアログにファイル名ペーストなどを追加
- 複数ファイルのドロップに対応

Modified Paths:
--------------
    branches/drag_and_drop/teraterm/common/tt_res.h
    branches/drag_and_drop/teraterm/common/tttypes.h
    branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
    branches/drag_and_drop/teraterm/teraterm/vtwin.cpp
    branches/drag_and_drop/teraterm/teraterm/vtwin.h

-------------- next part --------------
Modified: branches/drag_and_drop/teraterm/common/tt_res.h
===================================================================
--- branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-11 14:22:14 UTC (rev 7129)
+++ branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-11 14:34:12 UTC (rev 7130)
@@ -164,7 +164,6 @@
 #define IDC_PROT_ELAPSED                2525
 #define IDC_DAD_STATIC                  2525
 #define IDC_PROTOELAPSEDTIME            2526
-#define IDC_DAD_SENDFILE                2526
 #define IDC_TRANS_ELAPSED               2527
 #define IDC_BGIMG_LABEL                 2527
 #define IDC_TRANS_ETIME                 2528
@@ -218,7 +217,16 @@
 #define IDC_NORMALIZE_LINEBREAK         2565
 #define IDC_CLIPBOARD_NOTIFY            2566
 #define IDC_LIST_HIDDEN_FONTS           2567
-
+#define IDC_BINARY_CHECK                2568
+#define IDC_ADAPT_SAME_CHECK            2569
+#define IDC_FILENAME_EDIT               2570
+#define IDC_SCP_RADIO                   2571
+#define IDC_SENDFILE_RADIO              2572
+#define IDC_PASTE_RADIO                 2573
+#define IDC_ESCAPE_CHECK                2574
+#define IDC_DEFAULT_CHECK               2575
+#define IDC_SCP_PATH_LABEL              2576
+#define IDC_SCP_PATH_NOTE               2577
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002
 #define ID_ACC_NEWCONNECTION            50003
@@ -316,7 +324,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        126
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2568
+#define _APS_NEXT_CONTROL_VALUE         2578
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: branches/drag_and_drop/teraterm/common/tttypes.h
===================================================================
--- branches/drag_and_drop/teraterm/common/tttypes.h	2018-06-11 14:22:14 UTC (rev 7129)
+++ branches/drag_and_drop/teraterm/common/tttypes.h	2018-06-11 14:34:12 UTC (rev 7130)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2004-2017 TeraTerm Project
+ * (C) 2004-2018 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -173,6 +173,7 @@
 #define WM_USER_GETSERIALNO  WM_USER+13
 #define WM_USER_CHANGETITLE  WM_USER+14
 #define WM_USER_NOTIFYICON   WM_USER+15
+#define WM_USER_DROPNOTIFY   WM_USER+16
 
 #define WM_USER_DDEREADY     WM_USER+21
 #define WM_USER_DDECMNDEND   WM_USER+22

Modified: branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-11 14:22:14 UTC (rev 7129)
+++ branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-11 14:34:12 UTC (rev 7130)
@@ -26,17 +26,28 @@
 // Dialog
 //
 
-IDD_DAD_DIALOG DIALOGEX 0, 0, 186, 74
+IDD_DAD_DIALOG DIALOGEX 0, 0, 187, 207
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Tera Term: File Drag and Drop"
 FONT 8, "Tahoma", 400, 0, 0x0
 BEGIN
-    LTEXT           "Are you sure that you want to send the file content?",IDC_DAD_STATIC,7,9,172,8
-    LTEXT           "SCP:",IDC_STATIC,15,27,16,8
-    EDITTEXT        IDC_SCP_PATH,31,25,122,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Send file",IDOK,7,45,50,14
-    DEFPUSHBUTTON   "SCP",IDC_DAD_SENDFILE,69,45,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,45,50,14
+    EDITTEXT        IDC_FILENAME_EDIT,7,6,172,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
+    LTEXT           "Are you sure that you want to send the file content?",IDC_DAD_STATIC,7,25,173,8
+    CONTROL         "&SCP",IDC_SCP_RADIO,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,7,36,29,10
+    CONTROL         "S&end File (Paste content of file)",IDC_SENDFILE_RADIO,
+                    "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,7,77,172,10
+    CONTROL         "&Paste Filename",IDC_PASTE_RADIO,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,7,109,172,10
+    LTEXT           "SCP des&t:",IDC_SCP_PATH_LABEL,19,50,36,8
+    EDITTEXT        IDC_SCP_PATH,57,47,122,14,ES_AUTOHSCROLL
+    LTEXT           "dest is home directory if empty",IDC_SCP_PATH_NOTE,50,64,120,8
+    CONTROL         "Bina&ry",IDC_BINARY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,92,151,10
+    CONTROL         "Es&cape",IDC_ESCAPE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,125,151,10
+    CONTROL         "&Adapt same process to remaing %d files",IDC_ADAPT_SAME_CHECK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144,172,10
+    CONTROL         "&Default process from next drop\n(Drop with CTRL, this dialog is dispalyed)",IDC_DEFAULT_CHECK,
+                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,160,172,18
+    DEFPUSHBUTTON   "OK",IDOK,69,185,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,130,185,50,14
 END
 
 IDD_COMMENT_DIALOG DIALOGEX 0, 0, 239, 19

Modified: branches/drag_and_drop/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-11 14:22:14 UTC (rev 7129)
+++ branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-11 14:34:12 UTC (rev 7130)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2004-2017 TeraTerm Project
+ * (C) 2004-2018 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -254,6 +254,7 @@
 	ON_COMMAND(ID_WINDOW_UNDO, OnWindowUndo)
 	ON_COMMAND(ID_HELP_INDEX2, OnHelpIndex)
 	ON_COMMAND(ID_HELP_ABOUT, OnHelpAbout)
+	ON_MESSAGE(WM_USER_DROPNOTIFY, OnDropNotify)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -918,6 +919,9 @@
 	// Tera Term\x82?N\x93\xAE\x8E\x9E\x81AVirtual Store\x82\xAA\x93\xAD\x82\xAD\x82\xA9\x82?\xA4\x82\xA9\x82\xF0\x8Ao\x82\xA6\x82Ă\xA8\x82\xAD\x81B
 	// (2015.11.14 yutaka)
 	cv.VirtualStoreEnabled = GetVirtualStoreEnvironment();
+
+	DropLists = NULL;
+	DropListCount = 0;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1986,6 +1990,7 @@
 
 	/* Disable drag-drop */
 	::DragAcceptFiles(HVTWin,FALSE);
+	DropListFree();
 
 	EndDDE();
 
@@ -2019,57 +2024,135 @@
 	DeleteNotifyIcon(&cv);
 }
 
+static void SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount, HFONT hFont)
+{
+	for (int i = 0 ; i < nIDDlgItemCount ; i++) {
+		const int nIDDlgItem = nIDDlgItems[i];
+		SendDlgItemMessage(hDlg, nIDDlgItem, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(TRUE,0));
+	}
+}
+
+enum drop_type {
+	DROP_TYPE_CANCEL,
+	DROP_TYPE_SCP,
+	DROP_TYPE_SEND_FILE,		// past contents of file
+	DROP_TYPE_SEND_FILE_BINARY,
+	DROP_TYPE_PASTE_FILENAME,
+	DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE,
+};
+
+struct DrapDropDlgParam {
+	const char *TargetFilename;
+	enum drop_type DropType;
+	bool ScpEnable;
+	char *ScpSendDirPtr;
+	int ScpSendDirSize;
+	bool SendfileEnable;
+	int RemaingFileCount;
+	bool AdaptSameProcess;
+	bool DefaultProcess;
+};
+
+struct DrapDropDlgData {
+	HFONT DlgDragDropFont;
+	struct DrapDropDlgParam *Param;
+};
+
 static LRESULT CALLBACK OnDragDropDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
-	static HFONT DlgDragDropFont = NULL;
-	char uimsg[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
+	struct DrapDropDlgData *DlgData = (struct DrapDropDlgData *)GetWindowLongPtr(hDlgWnd, GWLP_USERDATA);
 
 	switch (msg) {
 		case WM_INITDIALOG:
+		{
+			char uimsg[MAX_UIMSG];
+			LOGFONT logfont;
+			HFONT font;
+			HFONT DlgDragDropFont = NULL;
+			DlgData = (struct DrapDropDlgData *)malloc(sizeof(struct DrapDropDlgData));
+			SetWindowLongPtr(hDlgWnd, GWLP_USERDATA, (LONG_PTR)DlgData);
+			struct DrapDropDlgParam *Param = (struct DrapDropDlgParam *)lp;
+			DlgData->Param = Param;
 			font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
 			GetObject(font, sizeof(LOGFONT), &logfont);
 			if (get_lang_font("DLG_TAHOMA_FONT", hDlgWnd, &logfont, &DlgDragDropFont, ts.UILanguageFile)) {
-				SendDlgItemMessage(hDlgWnd, IDC_SCP_PATH, WM_SETFONT, (WPARAM)DlgDragDropFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDOK, WM_SETFONT, (WPARAM)DlgDragDropFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDCANCEL, WM_SETFONT, (WPARAM)DlgDragDropFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDC_DAD_STATIC, WM_SETFONT, (WPARAM)DlgDragDropFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDC_DAD_SENDFILE, WM_SETFONT, (WPARAM)DlgDragDropFont, MAKELPARAM(TRUE,0));
+				const static int IDs[] = {
+					IDC_FILENAME_EDIT,
+					IDC_DAD_STATIC,
+					IDC_SCP_RADIO, IDC_SENDFILE_RADIO, IDC_PASTE_RADIO,
+					IDC_SCP_PATH_LABEL, IDC_SCP_PATH, IDC_SCP_PATH_NOTE,
+					IDC_BINARY_CHECK, IDC_ESCAPE_CHECK,
+					IDC_ADAPT_SAME_CHECK, IDC_DEFAULT_CHECK,
+					IDOK, IDCANCEL,
+				};
+				SetDlgFonts(hDlgWnd, IDs, _countof(IDs), DlgDragDropFont);
 			} else {
 				DlgDragDropFont = NULL;
 			}
+			DlgData->DlgDragDropFont = DlgDragDropFont;
 
 			GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
 			get_lang_msg("MSG_DANDD_CONF_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 			SetWindowText(hDlgWnd, ts.UIMsg);
 
+			SetDlgItemText(hDlgWnd, IDC_FILENAME_EDIT, Param->TargetFilename);
+
 			get_lang_msg("MSG_DANDD_CONF", ts.UIMsg, sizeof(ts.UIMsg),
 			             "Are you sure that you want to send the file content?", ts.UILanguageFile);
 			SetDlgItemText(hDlgWnd, IDC_DAD_STATIC, ts.UIMsg);
+			
+			// checkbox
+			CheckRadioButton(hDlgWnd, IDC_SCP_RADIO, IDC_PASTE_RADIO,
+							 (Param->DropType == DROP_TYPE_SEND_FILE ||
+							  Param->DropType == DROP_TYPE_SEND_FILE_BINARY) ? IDC_SENDFILE_RADIO :
+							 (Param->DropType == DROP_TYPE_PASTE_FILENAME ||
+							  Param->DropType == DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE) ? IDC_PASTE_RADIO :
+							 IDC_SCP_RADIO);
 
-			get_lang_msg("FILEDLG_TRANS_TITLE_SENDFILE", ts.UIMsg, sizeof(ts.UIMsg),
-						 "Send file", ts.UILanguageFile);
-			SetDlgItemText(hDlgWnd, IDOK, ts.UIMsg);
+			// SCP
+			SendMessage(GetDlgItem(hDlgWnd, IDC_SCP_PATH), WM_SETTEXT, 0, (LPARAM)Param->ScpSendDirPtr);
+			if (!Param->ScpEnable) {
+				// \x96\xB3\x8C\xF8\x89\xBB
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_SCP_RADIO), FALSE);
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_SCP_PATH_LABEL), FALSE);
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_SCP_PATH), FALSE);
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_SCP_PATH_NOTE), FALSE);
+			}
 
-			SendMessage(GetDlgItem(hDlgWnd, IDC_SCP_PATH), WM_SETTEXT, 0, (LPARAM)ts.ScpSendDir);
+			// Send File
+			if (Param->DropType == DROP_TYPE_SEND_FILE_BINARY) {
+				SendMessage(GetDlgItem(hDlgWnd, IDC_BINARY_CHECK), BM_SETCHECK, BST_CHECKED, 0);
+			}
+			if (!Param->SendfileEnable) {
+				// \x96\xB3\x8C\xF8\x89\xBB
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_SENDFILE_RADIO), FALSE);
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_BINARY_CHECK), FALSE);
+			}
 
-			// SSH2 \x90?\xB1\x82ł??\xA2\x8F?\x82?\xCD "SCP" \x82?\x{27B0B7}\x82\xE9\x81B
-			if (cv.isSSH != 2) {
-				EnableWindow(GetDlgItem(hDlgWnd, IDC_DAD_SENDFILE), FALSE);
-				EnableWindow(GetDlgItem(hDlgWnd, IDC_SCP_PATH), FALSE);
-				EnableWindow(GetDlgItem(hDlgWnd, IDC_STATIC), FALSE);
+			// Paste Filename
+			if (Param->DropType != DROP_TYPE_PASTE_FILENAME) {
+				SendMessage(GetDlgItem(hDlgWnd, IDC_ESCAPE_CHECK), BM_SETCHECK, BST_CHECKED, 0);
+			}
 
-				// \x83t\x83H\x81[\x83J\x83X\x82?\x89\x8A\xFA\x8F\xF3\x91?\xF0 Cancel \x82?\xB7\x82\xE9\x88?A\x82\xB1\x82?\x9E\x93_\x82ł\xCD Send File (IDOK)\x82\xC9
+			// Adapt same process
+			GetDlgItemText(hDlgWnd, IDC_ADAPT_SAME_CHECK, uimsg, sizeof(uimsg));
+			char b[MAX_UIMSG];
+			_snprintf_s(b, sizeof(b), _TRUNCATE, uimsg, Param->RemaingFileCount);
+			SetDlgItemText(hDlgWnd, IDC_ADAPT_SAME_CHECK, b);
+			if (Param->RemaingFileCount < 2) {
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_ADAPT_SAME_CHECK), FALSE);
+			}
+
+			// focus to "SCP dest textbox" or "Cancel"
+			if (Param->ScpEnable) {
+				// "SCP" \x97L\x8C\xF8\x8E\x9E\x82\xCD Cancel \x82?t\x83H\x81[\x83J\x83X\x82?āA\x8D?I\x93I\x82\xC9 SCP PATH \x82?t\x83H\x81[\x83J\x83X\x82\xAA
+				// \x93\x96\x82\xBD\x82\xE9\x82悤\x82?\xB7\x82\xE9\x81B
+				SetFocus(GetDlgItem(hDlgWnd, IDC_SCP_RADIO));
+			} else {
+				// \x83t\x83H\x81[\x83J\x83X\x82?\x89\x8A\xFA\x8F\xF3\x91?\xF0 Cancel \x82?\xB7\x82\xE9\x88?A\x82\xB1\x82?\x9E\x93_\x82ł\xCD IDOK \x82\xC9
 				// \x83t\x83H\x81[\x83J\x83X\x82?Ă\xE9\x81B\x8C\xE3\x82\xC5 WM_NEXTDLGCTL \x82Ńt\x83H\x81[\x83J\x83X\x82\xAA\x8E\x9F\x82?{\x83^\x83\x93\x82??\xE9\x81B
 				SetFocus(GetDlgItem(hDlgWnd, IDOK));
 			}
-			else {
-				// SSH2 \x90?\xB1\x8E\x9E\x82\xCD Cancel \x82?t\x83H\x81[\x83J\x83X\x82?āA\x8D?I\x93I\x82\xC9 SCP PATH \x82?t\x83H\x81[\x83J\x83X\x82\xAA
-				// \x93\x96\x82\xBD\x82\xE9\x82悤\x82?\xB7\x82\xE9\x81B
-				SetFocus(GetDlgItem(hDlgWnd, IDCANCEL));
-			}
-
 			// \x83t\x83H\x81[\x83J\x83X\x82\xF0\x8E\x9F\x82?{\x83^\x83\x93\x82??\xB7
 			// SetFocus() \x82Œ\xBC\x90?t\x83H\x81[\x83J\x83X\x82?Ă\xE9\x82?^\x83u\x83L\x81[\x82?\xAE\x8D?\x82?\xE2\x91肪\x8Fo\x82邽\x82?A
 			// \x82\xB1\x82?\x81\x83b\x83Z\x81[\x83W\x82?p\x82\xB7\x82\xE9
@@ -2077,34 +2160,55 @@
 
 			// TRUE\x82?\xB7\x82\xE9\x82?{\x83^\x83\x93\x82?t\x83H\x81[\x83J\x83X\x82\xAA\x93\x96\x82\xBD\x82\xE7\x82?\xA2\x81B
 			return FALSE;
+		}
 
 		case WM_COMMAND:
-			switch (LOWORD(wp)) {
-				case IDC_DAD_SENDFILE:
-					SendMessage(GetDlgItem(hDlgWnd, IDC_SCP_PATH), WM_GETTEXT, sizeof(ts.ScpSendDir), (LPARAM)ts.ScpSendDir);
-					if (DlgDragDropFont != NULL) {
-						DeleteObject(DlgDragDropFont);
-					}
-					EndDialog(hDlgWnd, IDC_DAD_SENDFILE);
-					break;
-
-				case IDOK:
-					if (DlgDragDropFont != NULL) {
-						DeleteObject(DlgDragDropFont);
-					}
-					EndDialog(hDlgWnd, IDOK);
-					break;
-
-				case IDCANCEL:
-					if (DlgDragDropFont != NULL) {
-						DeleteObject(DlgDragDropFont);
-					}
-					EndDialog(hDlgWnd, IDCANCEL);
-					break;
-
-				default:
-					return FALSE;
+		{
+			WORD wID = GET_WM_COMMAND_ID(wp, lp);
+			const WORD wCMD = GET_WM_COMMAND_CMD(wp, lp);
+			if (wCMD == BN_DBLCLK &&
+				(wID == IDC_SCP_RADIO || wID == IDC_SENDFILE_RADIO || wID == IDC_PASTE_RADIO))
+			{	// radio buttons double click
+				wID = IDOK;
 			}
+			if (wID == IDOK) {
+				if (IsDlgButtonChecked(hDlgWnd, IDC_SCP_RADIO) == BST_CHECKED) {
+					// SCP
+					DlgData->Param->DropType = DROP_TYPE_SCP;
+					SendMessage(GetDlgItem(hDlgWnd, IDC_SCP_PATH), WM_GETTEXT,
+								(WPARAM)DlgData->Param->ScpSendDirSize,
+								(LPARAM)DlgData->Param->ScpSendDirPtr);
+				} else if (IsDlgButtonChecked(hDlgWnd, IDC_SENDFILE_RADIO) == BST_CHECKED) {
+					// Send File
+					DlgData->Param->DropType =
+						(IsDlgButtonChecked(hDlgWnd, IDC_BINARY_CHECK) == BST_CHECKED) ?
+						DROP_TYPE_SEND_FILE_BINARY : DROP_TYPE_SEND_FILE;
+				} else /* if (IsDlgButtonChecked(hDlgWnd, IDC_PASTE_RADIO) == BST_CHECKED) */ {
+					// Paste Filename
+					DlgData->Param->DropType =
+						(IsDlgButtonChecked(hDlgWnd, IDC_ESCAPE_CHECK) == BST_CHECKED) ?
+						DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE : DROP_TYPE_PASTE_FILENAME;
+				}
+				DlgData->Param->AdaptSameProcess = 
+					(IsDlgButtonChecked(hDlgWnd, IDC_ADAPT_SAME_CHECK) == BST_CHECKED) ?
+					true : false;
+				DlgData->Param->DefaultProcess = 
+					(IsDlgButtonChecked(hDlgWnd, IDC_DEFAULT_CHECK) == BST_CHECKED) ?
+					true : false;
+			}
+			if (wID == IDCANCEL) {
+				DlgData->Param->DropType = DROP_TYPE_CANCEL;
+			}
+			if (wID == IDOK || wID == IDCANCEL) {
+				if (DlgData->DlgDragDropFont != NULL) {
+					DeleteObject(DlgData->DlgDragDropFont);
+				}
+				EndDialog(hDlgWnd, wID);
+				free(DlgData);
+				break;
+			}
+			return FALSE;
+		}
 
 		default:
 			return FALSE;
@@ -2112,118 +2216,312 @@
 	return TRUE;
 }
 
-void CVTWindow::OnDropFiles(HDROP hDropInfo)
+static enum drop_type ShowDropDialogBox(
+	HINSTANCE hInstance, HWND hWndParent,
+	const char *TargetFilename,
+	enum drop_type DefaultDropType,
+	int RemaingFileCount,
+	bool EnableSCP,
+	bool EnableSendFile,
+	bool *AdaptSameProcess,
+	bool *DefaultProcess)
 {
-	::SetForegroundWindow(HVTWin);
-	if (cv.Ready && (SendVar==NULL) && NewFileVar(&SendVar))
-	{
-		if (DragQueryFile(hDropInfo,0,SendVar->FullName,
-			sizeof(SendVar->FullName))>0)
-		{
-			DWORD attr;
-			char *ptr, *q;
-			char tmpbuf[_MAX_PATH * 2];
+	struct DrapDropDlgParam Param;
+	Param.TargetFilename = TargetFilename;
+	Param.DropType = DefaultDropType;
+	Param.ScpEnable = EnableSCP;
+	Param.ScpSendDirPtr = ts.ScpSendDir;
+	Param.ScpSendDirSize = sizeof(ts.ScpSendDir);
+	Param.SendfileEnable = EnableSendFile;
+	Param.RemaingFileCount = RemaingFileCount;
+	int ret = DialogBoxParam(
+		hInstance, MAKEINTRESOURCE(IDD_DAD_DIALOG),
+		hWndParent, (DLGPROC)OnDragDropDlgProc,
+		(LPARAM)&Param);
+	if (ret != IDOK) {
+		return DROP_TYPE_CANCEL;
+	}
+	*AdaptSameProcess = Param.AdaptSameProcess;
+	*DefaultProcess = Param.DefaultProcess;
+	return Param.DropType;
+}
 
-			// \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82??\x82?t\x83\x8B\x83p\x83X\x96\xBC\x82\xF0\x93\\x82\xE8\x95t\x82\xAF\x82\xE9 (2004.11.3 yutaka)
-			attr = GetFileAttributes(SendVar->FullName);
-			if (attr != -1 && (attr & FILE_ATTRIBUTE_DIRECTORY)) {
-				ptr = SendVar->FullName;
-				// \x83p\x83X\x82?\xE6\x90?\xE8\x82\xF0 \ -> / \x82\xD6
-				setlocale(LC_ALL, ts.Locale);
-				while (*ptr) {
-					if (isleadbyte(*ptr)) { // multi-byte
-						ptr += 2;
-						continue;
-					}
-					if (*ptr == '\\')
-						*ptr = '/';
-					ptr++;
-				}
+static void EscapeFilename(const char *src, char *dest)
+{
+#define ESCAPE_CHARS	" ;&()$!`'[]{}#^~"
+	setlocale(LC_ALL, ts.Locale);
+	const char *s = src;
+	char *d = dest;
+	while (*s) {
+		if (isleadbyte(*s)) { // multi-byte
+			*d++ = *s++;
+			*d++ = *s++;
+			continue;
+		}
+		char c = *s++;
+		if (c == '\\') {
+			// \x83p\x83X\x82?\xE6\x90?\xE8\x82\xF0 \ -> / \x82\xD6
+			*d = '/';
+		} else if (strchr(ESCAPE_CHARS, c) != NULL) {
+			// \x83G\x83X\x83P\x81[\x83v\x82\xAA\x95K\x97v\x82?\xB6\x8E\x9A
+			*d++ = '\\';
+			*d = c;
+		} else {
+			*d = c;
+		}
+		d++;
+	}
+	*d = '\0'; // null-terminate
+}
 
-				// \x83p\x83X\x82??\xAA\x82\xA0\x82\xEA\x82?G\x83X\x83P\x81[\x83v\x82\xB7\x82\xE9
-				q = tmpbuf;
-				ptr = SendVar->FullName;
-				while (*ptr) {
-					if (*ptr == ' ')
-						*q++ = '\\';
-					*q++ = *ptr;
-					ptr++;
-				}
-				*q = '\0'; // null-terminate
+static void PasteString(PComVar cv, const char *str, bool escape)
+{
+	PCHAR ptr = (PCHAR)str;
+	char *tmpbuf = NULL;
+	if (escape) {
+		size_t len = strlen(str) * 2;
+		tmpbuf = (char *)malloc(len);
+		EscapeFilename(str, tmpbuf);
+		ptr = tmpbuf;
+	}
 
-				ptr = tmpbuf;
+	// console\x82?\x97\x90M
+	while (*ptr) {
+		CommTextOut(cv, ptr, 1);
+		if (ts.LocalEcho > 0) {
+			CommTextEcho(cv, ptr, 1);
+		}
+		ptr++;
+	}
 
-				// console\x82?\x97\x90M
-				while (*ptr) {
-					CommTextOut(&cv, ptr, 1);
-					if (ts.LocalEcho > 0) {
-						CommTextEcho(&cv, ptr, 1);
-					}
-					ptr++;
-				}
-				FreeFileVar(&SendVar); // \x89\xF0\x95\xFA\x82\xF0\x96Y\x82?\x82\xC9
+	if (tmpbuf != NULL) free(tmpbuf);
+}
 
-			} else {
-				// Confirm send a file when drag and drop (2007.12.28 maya)
-				if (ts.ConfirmFileDragAndDrop) {
-					// \x82\xA2\x82\xAB\x82?\xE8\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82??\x82?O\x82?A\x83\x86\x81[\x83U\x82??\x8D\x87\x82?\x82\xF0\x8Ds\x82\xA4\x81B(2006.1.21 yutaka)
-					// MessageBox\x82\xC5SCP\x82\xE0\x91I\x91\xF0\x82ł\xAB\x82\xE9\x82悤\x82?\xB7\x82\xE9\x81B(2008.1.25 yutaka)
-					// SCP\x83p\x83X\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?_\x83C\x83A\x83\x8D\x83O\x82?ύX\x82\xB5\x82\xBD\x81B(2012.4.11 yutaka)
-					int ret;
+/* \x93\xFC\x97??t\x83@\x83C\x83\x8B\x82?\xDD(\x83t\x83H\x83\x8B\x83_\x82???\xEA\x82?\xA2) */
+static bool SendScp(char *Filenames[], int FileCount, const char *SendDir)
+{
+	typedef int (CALLBACK *PSSH_start_scp)(char *, char *);
+	static PSSH_start_scp func = NULL;
+	static HMODULE h = NULL;
+	char msg[128];
 
-					ret = DialogBox(hInst, MAKEINTRESOURCE(IDD_DAD_DIALOG),
-									HVTWin, (DLGPROC)OnDragDropDlgProc);
+	if (h == NULL) {
+		if ( ((h = GetModuleHandle("ttxssh.dll")) == NULL) ) {
+			_snprintf_s(msg, sizeof(msg), _TRUNCATE, "GetModuleHandle(\"ttxssh.dll\")) %d", GetLastError());
+		scp_send_error:
+			::MessageBox(NULL, msg, "Tera Term: scpsend command error", MB_OK | MB_ICONERROR);
+			return false;
+		}
+	}
+	if (func == NULL) {
+		func = (PSSH_start_scp)GetProcAddress(h, "TTXScpSendfile");
+		if (func == NULL) {
+			_snprintf_s(msg, sizeof(msg), _TRUNCATE, "GetProcAddress(\"TTXScpSendfile\")) %d", GetLastError());
+			goto scp_send_error;
+		}
+	}
 
-					if (ret == IDOK) {   // sendfile
-						HelpId = HlpFileSend;
-						SendVar->DirLen = 0;
-						ts.TransBin = 0;
-						FileSendStart();
+	for (int i = 0; i < FileCount; i++) {
+		const char *FileName = Filenames[i];
+		func((char *)FileName, ts.ScpSendDir);
+	}
+	return true;
+}
 
-					} else if (ret == IDC_DAD_SENDFILE) {   // SCP
-						typedef int (CALLBACK *PSSH_start_scp)(char *, char *);
-						static PSSH_start_scp func = NULL;
-						static HMODULE h = NULL;
-						char msg[128];
+void CVTWindow::DropListFree()
+{
+	if (DropListCount > 0) {
+		for (int i = 0; i < DropListCount; i++) {
+			free(DropLists[i]);
+			DropLists[i] = NULL;
+		}
+		free(DropLists);
+		DropLists = NULL;
+		DropListCount = 0;
+	}
+}
 
-						if (func == NULL) {
-							if ( ((h = GetModuleHandle("ttxssh.dll")) == NULL) ) {
-								_snprintf_s(msg, sizeof(msg), _TRUNCATE, "GetModuleHandle(\"ttxssh.dll\")) %d", GetLastError());
-								goto scp_send_error;
-							}
-							func = (PSSH_start_scp)GetProcAddress(h, "TTXScpSendfile");
-							if (func == NULL) {
-								_snprintf_s(msg, sizeof(msg), _TRUNCATE, "GetProcAddress(\"TTXScpSendfile\")) %d", GetLastError());
-								goto scp_send_error;
-							}
-						}
+LONG CVTWindow::OnDropNotify(UINT ShowDialog, LONG lParam)
+{
+	static enum drop_type DefaultDropType = DROP_TYPE_CANCEL;
 
-						if (func != NULL) {
-							func(SendVar->FullName, ts.ScpSendDir);
-							goto send_success;
-						}
+	(void)lParam;
+	int FileCount = 0;
+	int DirectoryCount = 0;
+	for (int i = 0; i < DropListCount; i++) {
+		const char *FileName = DropLists[i];
+		const DWORD attr = GetFileAttributes(FileName);
+		if (attr == -1 ) {
+			goto finish;
+		}
+		if (attr & FILE_ATTRIBUTE_DIRECTORY) {
+			DirectoryCount++;
+		} else {
+			FileCount++;
+		}
+	}
 
-scp_send_error:
-						::MessageBox(NULL, msg, "Tera Term: scpsend command error", MB_OK | MB_ICONERROR);
-send_success:
-						FreeFileVar(&SendVar);  // \x89\xF0\x95\xFA\x82\xF0\x96Y\x82?\x82\xC9
-
+	bool AdapatSameProcess = false;
+	const bool isSSH = (cv.isSSH == 2);
+	enum drop_type DropType;
+	if (DefaultDropType == DROP_TYPE_CANCEL) {
+		// default is not set
+		if (!ShowDialog) {
+			if (FileCount == 1 && DirectoryCount == 0) {
+				if (ts.ConfirmFileDragAndDrop) {
+					if (isSSH) {
+						DropType = DROP_TYPE_SCP;
 					} else {
-						FreeFileVar(&SendVar);
-
+						DropType = DROP_TYPE_SEND_FILE;
 					}
+					AdapatSameProcess = false;
+				} else {
+					DropType = DROP_TYPE_SEND_FILE;
+					AdapatSameProcess = true;
 				}
-				else {
-					SendVar->DirLen = 0;
-					ts.TransBin = 0;
-					FileSendStart();
+			} else if (FileCount == 0 && DirectoryCount == 1) {
+				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+				AdapatSameProcess = true;
+			} else if (FileCount > 0 && DirectoryCount > 0) {
+				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+				AdapatSameProcess = false;
+			} else if (FileCount > 0 && DirectoryCount == 0) {
+				// filename only
+				if (isSSH) {
+					DropType = DROP_TYPE_SCP;
+				} else {
+					DropType = DROP_TYPE_SEND_FILE;
+				}
+				AdapatSameProcess = false;
+			} else {
+				// directory only
+				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+				AdapatSameProcess = ts.ConfirmFileDragAndDrop ? false : true;
+			}
+		} else {
+			// show dialog
+			if (DirectoryCount > 0) {
+				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+			} else {
+				if (isSSH) {
+					DropType = DROP_TYPE_SCP;
+				} else {
+					DropType = DROP_TYPE_SEND_FILE;
+				}
+			}
+			AdapatSameProcess = false;
+		}
+	} else {
+		if (DirectoryCount > 0 &&
+			(DefaultDropType == DROP_TYPE_SEND_FILE ||
+			 DefaultDropType == DROP_TYPE_SEND_FILE_BINARY ||
+			 DefaultDropType == DROP_TYPE_SCP))
+		{	// \x83f\x83t\x83H\x83\x8B\x83g\x82???ł?\x88\x97\x9D\x82ł\xAB\x82?\xA2\x91g\x82?\x87\x82?
+			DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+			AdapatSameProcess = false;
+		} else {
+			DropType = DefaultDropType;
+			AdapatSameProcess = ShowDialog ? false : true;
+		}
+	}
 
+	for (int i = 0; i < DropListCount; i++) {
+		const char *FileName = DropLists[i];
+
+		if (!AdapatSameProcess) {
+			bool DefaultProcess;
+			DropType =
+				ShowDropDialogBox(hInst, HVTWin,
+								  FileName, DropType,
+								  DropListCount - i,
+								  (DirectoryCount == 0 && isSSH) ? true : false,
+								  DirectoryCount == 0 ? true : false,
+								  &AdapatSameProcess, &DefaultProcess);
+			if (DropType == DROP_TYPE_CANCEL) {
+				goto finish;
+			}
+			if (DefaultProcess) {
+				DefaultDropType = DropType;
+			}
+		}
+			 
+		switch (DropType) {
+		case DROP_TYPE_CANCEL:
+		default:
+			// cancel
+			break;
+		case DROP_TYPE_SEND_FILE:
+		case DROP_TYPE_SEND_FILE_BINARY:
+			if (SendVar==NULL && NewFileVar(&SendVar)) {
+				HelpId = HlpFileSend;
+				strncpy_s(SendVar->FullName, sizeof(SendVar->FullName), FileName,  _TRUNCATE);
+				SendVar->DirLen = 0;
+				ts.TransBin = DropType == DROP_TYPE_SEND_FILE ? 0 : 1;
+				FileSendStart();
+#if 0
+				goto finish;	// send file\x82?A\x91\xB1\x82\xB5\x82Ăł\xAB\x82?\xA2
+#else
+				{
+					LONG lCount = 0;
+					CWinApp *app = AfxGetApp();
+					while(1) {
+						if (SendVar == NULL) {
+							break;
+						}
+						app->OnIdle(lCount++);
+					}
 				}
+#endif
 			}
+			break;
+		case DROP_TYPE_PASTE_FILENAME:
+		case DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE:
+		{
+			const bool escape = DropType == DROP_TYPE_PASTE_FILENAME ? false : true;
+			PasteString(&cv, FileName, escape);
+			if (DropListCount > 1) {
+				PasteString(&cv, "\n", false);
+			}
+			break;
 		}
-		else
-			FreeFileVar(&SendVar);
+		case DROP_TYPE_SCP:
+		{
+			// send by scp
+			char **FileNames = &DropLists[i];
+			int FileCount = AdapatSameProcess ? DropListCount - i : 1;
+			if (!SendScp(FileNames, FileCount, ts.ScpSendDir)) {
+				goto finish;
+			}
+			i += FileCount - 1;
+			break;
+		}
+		}
 	}
+
+finish:
+	DropListFree();
+	return 0;
+}
+
+void CVTWindow::OnDropFiles(HDROP hDropInfo)
+{
+	::SetForegroundWindow(HVTWin);
+	if (cv.Ready && SendVar==NULL)
+	{
+		const UINT ShowDialog =
+			((GetAsyncKeyState(VK_CONTROL) & 0x8000) != 0) ? 1 : 0;
+		DropListCount = DragQueryFile(hDropInfo, -1, NULL, 0);
+		DropLists = (char **)malloc(sizeof(char *) * DropListCount);
+
+		for (int i = 0; i < DropListCount; i++) {
+			const UINT cch = DragQueryFile(hDropInfo, i, NULL, 0) + 1;
+			char *FileName = (char *)malloc(cch);
+			DropLists[i] = FileName;
+			DragQueryFile(hDropInfo,i,FileName,cch);
+		}
+
+		::PostMessage(HVTWin, WM_USER_DROPNOTIFY, ShowDialog, 0);
+	}
 	DragFinish(hDropInfo);
 }
 

Modified: branches/drag_and_drop/teraterm/teraterm/vtwin.h
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtwin.h	2018-06-11 14:22:14 UTC (rev 7129)
+++ branches/drag_and_drop/teraterm/teraterm/vtwin.h	2018-06-11 14:34:12 UTC (rev 7130)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2004-2017 TeraTerm Project
+ * (C) 2004-2018 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,13 @@
   HMENU MainMenu, FileMenu, TransMenu, EditMenu,
     SetupMenu, ControlMenu, WinMenu, HelpMenu;
 
+  // drag and drop handle
+  char **DropLists;
+  int DropListCount;
+  void DropListFree();
+  bool DropWithLeftbutton;
+  bool DropWithRightbutton;
+
 protected:
 
 public:
@@ -214,6 +221,7 @@
 	afx_msg void OnHelpIndex();
 	afx_msg void OnHelpUsing();
 	afx_msg void OnHelpAbout();
+	afx_msg LONG OnDropNotify(UINT ShowMenu, LONG lParam);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP();
 	void Disconnect(BOOL confirm);

From scmnotify ＠ osdn.net  Thu Jun 14 17:43:42 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 17:43:42 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMzFdICBVSSDjgYvjgokgVGl0bGVGb3Jt?=
 =?utf-8?b?YXQg44KS5aSJ5pu05Y+v6IO944Gr44GX44Gf44CCICMzNTc2Ng==?=
Message-ID: <1528965822.190273.20318.nullmailer@users.osdn.me>

Revision: 7131
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7131
Author:   doda
Date:     2018-06-14 17:43:41 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
UI から TitleFormat を変更可能にした。 #35766

アクセスキーの選び方が微妙。改善案募集中。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/35766

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/setup-additional.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/setup-additional.html
    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/installer/release/lang/Korean.lng
    trunk/installer/release/lang/Russian.lng
    trunk/installer/release/lang/Simplified Chinese.lng
    trunk/installer/release/lang/Traditional Chinese.lng
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/ttermpro.rc

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/doc/en/html/about/history.html	2018-06-14 08:43:41 UTC (rev 7131)
@@ -33,6 +33,12 @@
 
 <h3><a name="teraterm_4.100">2018.08.xx (Ver 4.100)</a></h3>
 <ul class="history">
+  <li>Changes
+    <ul>
+      <li>added the <a href="../setup/teraterm-win.html#title">Title format configuration</a> on the General tab of the <a href="../menu/setup-additional.html#TitleFormat">Additional settings dialog</a>.</li>
+    </ul>
+  </li>
+
   <li>Misc
     <ul>
       <li>upgraded TTSSH to <a href="#ttssh_2.86">2.86</a>.</li>

Modified: trunk/doc/en/html/menu/setup-additional.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional.html	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/doc/en/html/menu/setup-additional.html	2018-06-14 08:43:41 UTC (rev 7131)
@@ -56,6 +56,28 @@
 	When this setting is enabled, whole fonts can be selected on the <a href="setup-font.html">Font setting dialog</a>.
       </dd>
 
+      <dt id="TitleFormat">Title format</dt>
+      <dd>Configures the window title format.
+        <dl>
+          <dt>Display host/port name</dt>
+          <dd>Displays hostname or serial port name</dd>
+
+          <dt>Display session number</dt>
+          <dd>Displays session number</dt>
+
+          <dt>Display VT/TEK</dt>
+          <dd>Displays VT or TEK</dt>
+
+          <dt>Swap hostname and title position</dt>
+          <dd>Swaps the hostname and <a href="setup-window.html#Title">title text</a>, displays hostname first.</dd>
+
+          <dt>Display tcp port number</dt>
+          <dd>Displays tcp port number (TCP/IP connection only)</dd>
+
+          <dt>Display serial port speed</dt>
+          <dd>Displays speed of serial port (serial connection only)</dd>
+        </dl>
+      </dd>
     </dl>
 
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/doc/ja/html/about/history.html	2018-06-14 08:43:41 UTC (rev 7131)
@@ -31,8 +31,14 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.99">2018.05.31 (Ver 4.99)</a></h3>
+<h3><a name="teraterm_4.100">2018.08.xx (Ver 4.100)</a></h3>
 <ul class="history">
+  <li>\x95ύX
+    <ul>
+      <li><a href="../menu/setup-additional.html#TitleFormat">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC General \x83^\x83u\x82\xC9<a href="../setup/teraterm-win.html#title">\x83^\x83C\x83g\x83\x8B\x8C`\x8E\xAE\x82??\xE8</a>\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+
   <li>\x82\xBB\x82?\xBC
     <ul>
       <li><a href="#ttssh_2.86">TTSSH(2.86)</a>\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B</li>

Modified: trunk/doc/ja/html/menu/setup-additional.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional.html	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/doc/ja/html/menu/setup-additional.html	2018-06-14 08:43:41 UTC (rev 7131)
@@ -55,6 +55,28 @@
 	Windows 7\x88?~\x82??e\x83t\x83H\x83\x93\x83g\x82\xF0\x83t\x83H\x83\x93\x83g\x88?\x82?\\x8E\xA6\x82\xB7\x82?\x94\xF1\x95\\x8E\xA6\x82?\xB7\x82?\x82\xF0\x90??\x82\xE9\x8B@\x94\\x82\xAA\x92?\xC1\x82\xB3\x82\xEA\x82?\xB5\x82\xBD\x81BTera Term \x82?\xB1\x82??\xE8\x82\xF0\x97L\x8C\xF8\x82?\xB7\x82\xE9\x82?AOS\x91\xA4\x82Ŕ\xF1\x95\\x8E\xA6\x82???\x82?\x83t\x83H\x83\x93\x83g\x82\xE0<a href="setup-font.html">\x83t\x83H\x83\x93\x83g\x90?\xE8\x83_\x83C\x83A\x83\x8D\x83O</a>\x82őI\x91\xF0\x82ł\xAB\x82\xE9\x82悤\x82??\xE8\x82?\xB7\x81B
       </dd>
 
+      <dt id="TitleFormat">Title format</dt>
+      <dd>\x83E\x83B\x83\x93\x83h\x83E\x83^\x83C\x83g\x83\x8B\x82?`\x8E\xAE\x82\xF0\x90??\x82?\xB7\x81B
+        <dl>
+          <dt>Display host/port name</dt>
+          <dd>\x83z\x83X\x83g\x96\xBC\x82?\xBD\x82?V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x96\xBC\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Display session number</dt>
+          <dd>\x83Z\x83b\x83V\x83\x87\x83\x93\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Display VT/TEK</dt>
+          <dd>VT\x82?\xBD\x82\xCDTEK\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Swap hostname and title position</dt>
+          <dd>\x83z\x83X\x83g\x96\xBC\x82\xC6<a href="setup-window.html#Title">\x83^\x83C\x83g\x83\x8B\x83e\x83L\x83X\x83g</a>\x82??u\x82\xF0\x93\xFC\x82?\x82\xA6\x81A\x83z\x83X\x83g\x96\xBC\x82\xF0\x90\xE6\x82?\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Display tcp port number</dt>
+          <dd>TCP \x83|\x81[\x83g\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7 (TCP/IP \x90?\xB1\x8E\x9E\x82?\xDD)</dd>
+
+          <dt>Display serial port speed</dt>
+          <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82?X\x83s\x81[\x83h\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7 (\x83V\x83\x8A\x83A\x83\x8B\x90?\xB1\x8E\x9E\x82?\xDD)</dd>
+        </dl>
+      </dd>
     </dl>
 
 

Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/English.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -184,6 +184,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/French.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (French language) by Francois MOCQ (2010-07-21)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=Effacer l'\xE9cran quand la fen\xEAtre est redimensionn\xE9e
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accepter les \xE9v\xE9nement souris
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=Accepter les \xE9v\xE9nement souris quand CTRL est appuy\xE9

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/German.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (German language) by Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/Japanese.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 
 [Tera Term]
 DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -184,6 +184,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95ύX\x8E\x9E\x82?\\x8E\xA6\x93\xE0\x97e\x82\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=&IME\x82?\xF3\x91??\xE6\x82\xC1\x82ăJ\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x95ύX\x82\xB7\x82\xE9
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=OS\x82Ŕ\xF1\x95\\x8E\xA6\x82?t\x83H\x83\x93\x83g\x82\xE0\x83t\x83H\x83\x93\x83g\x83_\x83C\x83A\x83\x8D\x83O\x82??\x82?\\x8E\xA6\x82\xB7\x82\xE9(&H)
+DLG_TAB_GENERAL_TITLEFMT_GROUP=\x83^\x83C\x83g\x83\x8B\x8C`\x8E\xAE
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=\x83z\x83X\x83g/\x83|\x81[\x83g\x96\xBC\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&D)
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=\x83Z\x83b\x83V\x83\x87\x83\x93\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&N)
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=&VT/TEK \x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=\x83^\x83C\x83g\x83\x8B\x82?z\x83X\x83g\x96\xBC\x82??\x82\xF0\x93\xFC\x82?\x82\xA6\x82\xE9(&T)
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=TCP \x83|\x81[\x83g\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&P)
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82?X\x83s\x81[\x83h\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&R)
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\x83}\x83E\x83X\x83C\x83x\x83\x93\x83g\x92?m\x97v\x8B\x81\x82\xF0\x8E?\xFC\x82\xEA\x82\xE9(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=Control\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ă\xA2\x82\xE9\x8A??}\x83E\x83X\x83C\x83x\x83\x93\x83g\x82\xF0\x92?m\x82\xB5\x82?\xA2(&D)

Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/Korean.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (Korean language) by Daehong Kim (2013-07-25)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=â ũ\xB1? \xC0?\xC1\xA4\xB5\xC9 \xB6\xA7 ?\xB8\xE9 \xBA\xF1\xBF\xEC\xB1\xE2(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=IME\xBB\xF3\xC5¿\xA1 \xB5\xFB\xB6\xF3 Ŀ\xBC\xAD \xB8\xF0\xBE\xE7 \xBA\xAF\xB0\xE6(&I)
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xB8\xB6\xBF? \xC0?\xA5? \xC3\xDFô \xBF\xE4û\xC0\xBB \xB9?\xC0\xB4?\xD9(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=\xC4\xC1?\xB7\xD1\xC0\xCC \xB4\xAD\xB7\xC8\xC0\xBB \xB6\xA7 \xB8\xB6\xBF? \xC0?\xA5? \xC3\xDF\xC0\xFB \xBA\xF1?\xBC\xBA?(&D)

Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/Russian.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&\xCE\xF7\xE8\xF1\xF2\xE8\xF2\xFC \xFD\xEA\xF0\xE0\xED \xEF\xF0\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE8 \xF0\xE0\xE7\xEC\xE5\xF0\xE0 \xEE\xEA\xED\xE0
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=&\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xE2\xE8\xE4 \xEA\xF3\xF0\xF1\xEE\xF0\xE0 \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xF0\xE5\xE6\xE8\xEC\xEE\xEC IME
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xCF\xF0\xE8\xED\xFF\xF2\xFC \xE7\xE0\xEF\xF0\xEE\xF1 \xED\xE0 \xEE\xF2\xF1\xEB\xE5\xE6\xE8\xE2\xE0\xED\xE8\xE5 \xF1\xEE\xE1\xFB\xF2\xE8\xE9 \xEC\xFB\xF8\xE8
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&\xCE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xF2\xF1\xEB\xE5\xE6\xE8\xE2\xE0\xED\xE8\xE5 \xF1\xEE\xE1\xFB\xF2\xE8\xE9 \xEC\xFB\xF8\xE8

Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/Simplified Chinese.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\xB8ı?\xBF?\xF3С?\xC7\xE5\xBF\xD5\xC6\xC1Ļ(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=\xB8\xF9\xBE\xDD\xCA\xE4\xC8???\xB8ı\xE4\xB9\xE2\xB1\xEA\xD0\xCE?(&I)
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xBD\xD3\xCA\xDC\xCA\xF3\xB1\xEA\xCA?\xFE\xB8\xFA\xD7\xD9\xC7\xEB\xC7\xF3(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=\xB0\xB4\xCF\xC2 Ctrl \xBC\xFC?\xA3\xAC\xBD\xFB\xD3\xC3\xCA\xF3\xB1\xEA\xCA?\xFE\xB8\xFA\xD7\xD9(&D)

Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/installer/release/lang/Traditional Chinese.lng	2018-06-14 08:43:41 UTC (rev 7131)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-13)
 ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\xA7\xEF\xC5?\xF8\xB5\xA1\xA4j\xA4p\xAE?M\xAA?ù\xF5(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=\xAE??\xE9\xA4J\xAAk\xAA\xAC\xBAA\xA7\xEF\xC5?\xE5\xBCЧΪ\xAC(&I)
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xB1\xB5\xA8\xFC\xB7?\xAB\xA8?\xF3\xB8\xF2\xC2?ШD(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=\xAB\xF6\xA4U Ctrl \xC1\xE4\xAE?A\xB8T\xA5η?\xAB\xA8?\xF3\xB8\xF2\xC2\xDC(&D)

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/teraterm/common/tt_res.h	2018-06-14 08:43:41 UTC (rev 7131)
@@ -218,6 +218,13 @@
 #define IDC_NORMALIZE_LINEBREAK         2565
 #define IDC_CLIPBOARD_NOTIFY            2566
 #define IDC_LIST_HIDDEN_FONTS           2567
+#define IDC_TITLEFMT_GROUP              2568
+#define IDC_TITLEFMT_DISPHOSTNAME       2569
+#define IDC_TITLEFMT_DISPSESSION        2570
+#define IDC_TITLEFMT_DISPVTTEK          2571
+#define IDC_TITLEFMT_SWAPHOSTTITLE      2572
+#define IDC_TITLEFMT_DISPTCPPORT        2573
+#define IDC_TITLEFMT_DISPSERIALSPEED    2574
 
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002
@@ -316,7 +323,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        126
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2568
+#define _APS_NEXT_CONTROL_VALUE         2575
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/teraterm/teraterm/addsetting.cpp	2018-06-14 08:43:41 UTC (rev 7131)
@@ -120,6 +120,13 @@
 		SendDlgItemMessage(IDC_CLEAR_ON_RESIZE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CURSOR_CHANGE_IME, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_LIST_HIDDEN_FONTS, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_GROUP, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPHOSTNAME, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPSESSION, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPVTTEK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_SWAPHOSTTITLE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPTCPPORT, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPSERIALSPEED, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 	}
 	else {
 		DlgGeneralFont = NULL;
@@ -150,6 +157,28 @@
 	get_lang_msg("DLG_TAB_GENERAL_LIST_HIDDEN_FONTS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_LIST_HIDDEN_FONTS, ts.UIMsg);
 
+	GetDlgItemText(IDC_TITLEFMT_GROUP, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_GROUP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_GROUP, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPHOSTNAME, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPHOSTNAME, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPSESSION, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPSESSION", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPSESSION, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPVTTEK, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPVTTEK, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_SWAPHOSTTITLE, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_SWAPHOSTTITLE, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPTCPPORT, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPTCPPORT, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPSERIALSPEED, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPSERIALSPEED, ts.UIMsg);
+
 	// (1)DisableAcceleratorSendBreak
 	btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK);
 	btn->SetCheck(ts.DisableAcceleratorSendBreak);
@@ -182,6 +211,25 @@
 	btn = (CButton *)GetDlgItem(IDC_LIST_HIDDEN_FONTS);
 	btn->SetCheck(ts.ListHiddenFonts);
 
+	// (9) Title Format
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPHOSTNAME);
+	btn->SetCheck((ts.TitleFormat & 1) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSESSION);
+	btn->SetCheck((ts.TitleFormat & (1<<1)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPVTTEK);
+	btn->SetCheck((ts.TitleFormat & (1<<2)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_SWAPHOSTTITLE);
+	btn->SetCheck((ts.TitleFormat & (1<<3)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPTCPPORT);
+	btn->SetCheck((ts.TitleFormat & (1<<4)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSERIALSPEED);
+	btn->SetCheck((ts.TitleFormat & (1<<5)) != 0);
+
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82?t\x83H\x81[\x83J\x83X\x82?Ă\xE9 (2004.12.7 yutaka)
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_CLICKABLE_URL));
 
@@ -231,6 +279,20 @@
 	// (8)IDC_LIST_HIDDEN_FONTS
 	btn = (CButton *)GetDlgItem(IDC_LIST_HIDDEN_FONTS);
 	ts.ListHiddenFonts = btn->GetCheck();
+
+	// (9) Title Format
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPHOSTNAME);
+	ts.TitleFormat = (btn->GetCheck() == BST_CHECKED);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSESSION);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 1);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPVTTEK);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 2);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_SWAPHOSTTITLE);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 3);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPTCPPORT);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 4);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSERIALSPEED);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 5);
 }
 
 

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2018-06-11 14:34:12 UTC (rev 7130)
+++ trunk/teraterm/teraterm/ttermpro.rc	2018-06-14 08:43:41 UTC (rev 7131)
@@ -66,6 +66,19 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10
     CONTROL         "List &hidden fonts in font dialog",IDC_LIST_HIDDEN_FONTS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,220,10
+    GROUPBOX        "Title format",IDC_TITLEFMT_GROUP,5,130,250,55
+    CONTROL         "&Display host/port name",IDC_TITLEFMT_DISPHOSTNAME,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,140,110,10
+    CONTROL         "Display session &number",IDC_TITLEFMT_DISPSESSION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,155,110,10
+    CONTROL         "Display &VT/TEK",IDC_TITLEFMT_DISPVTTEK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,170,110,10
+    CONTROL         "Swap hostname and &title position",IDC_TITLEFMT_SWAPHOSTTITLE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,140,130,10
+    CONTROL         "Display tcp &port number",IDC_TITLEFMT_DISPTCPPORT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,155,130,10
+    CONTROL         "Display se&rial port speed",IDC_TITLEFMT_DISPSERIALSPEED,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,170,130,10
 END
 
 IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 258, 188

From scmnotify ＠ osdn.net  Thu Jun 14 17:43:47 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 17:43:47 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7132=5D__TermIsWin_=E3=81=8C_on_?=
 =?utf-8?b?44Gu5pmC44Gv44K/44Kk44OI44Or44OQ44O844Gu44OA44OW44Or44Kv44Oq?=
 =?utf-8?b?44OD44Kv44Gn5pyA5aSn5YyW44GZ44KLICMzODA3NA==?=
Message-ID: <1528965827.218201.20467.nullmailer@users.osdn.me>

Revision: 7132
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7132
Author:   doda
Date:     2018-06-14 17:43:47 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
TermIsWin が on の時はタイトルバーのダブルクリックで最大化する #38074

タイトルバーのダブルクリックするとウィンドウサイズを端末に合わせるが、
TermIsWin が on の時はこの動作の意味が無いので、一般的なアプリと同じ
ようにウィンドウの最大化を行うようにする。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/38074

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/usage/mouse.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/usage/mouse.html
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/en/html/about/history.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -36,6 +36,7 @@
   <li>Changes
     <ul>
       <li>added the <a href="../setup/teraterm-win.html#title">Title format configuration</a> on the General tab of the <a href="../menu/setup-additional.html#TitleFormat">Additional settings dialog</a>.</li>
+      <li>Window size is maximized when the titlie bar is double-clicked if <a href="../menu/setup-terminal.html#TermIsWin">"Term size = win size"</a> setting is on.</li>
     </ul>
   </li>
 

Modified: trunk/doc/en/html/usage/mouse.html
===================================================================
--- trunk/doc/en/html/usage/mouse.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/en/html/usage/mouse.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -40,8 +40,16 @@
     It is effective when <a href="../menu/setup-additional.html">DisableMouseRButtonPaste</a> is disabled.</dd>
 
 <dt>Double clicking the left button on the title bar</dt>
-<dd>If the window size (real screen size) is not equal to the terminal size (logical size of the terminal), resizes the window to the terminal size. A further double clicking restores the original window size.</dd>
+<dd>
+  <dl>The behaviour is changed according to the <a href="../menu/setup-terminal.html#TermIsWin">"Term size = win size"</a> setting.
+    <dt>On</dt>
+    <dd>Maximize window. If the window is already maximized, restore to the original size.</dd>
 
+    <dt>Off</dt>
+    <dd>If the window size (real screen size) is not equal to the terminal size (logical size of the terminal), resizes the window to the terminal size. A further double clicking restores the original window size.</dd>
+  </dl>
+</dd>
+
 <dt>Clicking the left button while pressing the Ctrl key</dt>
 <dd>If the menu bar is hidden, the pop-up menu appears. To hide the menu bar, check the Hide menu bar option in the [Setup] Window dialog box.</dd>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/ja/html/about/history.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -36,6 +36,7 @@
   <li>\x95ύX
     <ul>
       <li><a href="../menu/setup-additional.html#TitleFormat">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC General \x83^\x83u\x82\xC9<a href="../setup/teraterm-win.html#title">\x83^\x83C\x83g\x83\x8B\x8C`\x8E\xAE\x82??\xE8</a>\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+      <li><a href="../menu/setup-terminal.html#TermIsWin">Term size = win size</a> \x90?肪 on \x82??\x82?A\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB5\x82\xBD\x8E\x9E\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8Dő?\x82\xB7\x82\xE9\x82悤\x82?ύX\x82\xB5\x82\xBD\x81B</a>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/usage/mouse.html
===================================================================
--- trunk/doc/ja/html/usage/mouse.html	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/doc/ja/html/usage/mouse.html	2018-06-14 08:43:47 UTC (rev 7132)
@@ -40,8 +40,16 @@
     <a href="../menu/setup-additional.html">DisableMouseRButtonPaste</a> \x82\xAA\x96\xB3\x8C\xF8\x82??\xAB\x82?\xAE\x8D?\x82\xE9\x81B</dd>
 
 <dt>\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82?\xE3\x82ō\xB6\x83{\x83^\x83\x93\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N</dt>
-<dd>\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83E\x83C\x83\x93\x83h\x83E\x82?\xC0\x8D???\x82\xB3)\x82\xAA\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x82?_\x97\x9D\x93I\x82?\xE6\x96???\x82\xB3)\x82???\xE9\x82?\xAB\x81A\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?\xAF\x82\xB6\x82??\xE9\x82悤\x82?ύX\x82\xB5\x82?\xB7\x81B\x82\xBB\x82?\xE3\x81A\x82\xE0\x82\xA4\x88\xEA\x93x\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB7\x82\xE9\x82?A\x82\xE0\x82??E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82??\xE8\x82?\xB7\x81B</dd>
+<dd><a href="../menu/setup-terminal.html#TermIsWin">Term size = win size</a>\x82??\xE8\x82?\xE6\x82\xC1\x82ē\xAE\x8D?\x95ς\xED\x82\xE8\x82?\xB7\x81B
+  <dl>
+    <dt>on\x82?\x9E</dt>
+    <dd>\x83E\x83B\x83\x93\x83h\x83E\x82?T\x83C\x83Y\x82\xF0\x8Dő?\x82\xB5\x82?\xB7\x81B\x8A\xF9\x82?ő?\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F?\x82?A\x82\xE0\x82??T\x83C\x83Y\x82??\xB5\x82?\xB7\x81B</dd>
 
+    <dt>off\x82?\x9E</dt>
+    <dd>\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83E\x83C\x83\x93\x83h\x83E\x82?\xC0\x8D???\x82\xB3)\x82\xAA\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x82?_\x97\x9D\x93I\x82?\xE6\x96???\x82\xB3)\x82???\xE9\x82?\xAB\x81A\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?\xAF\x82\xB6\x82??\xE9\x82悤\x82?ύX\x82\xB5\x82?\xB7\x81B\x82\xBB\x82?\xE3\x81A\x82\xE0\x82\xA4\x88\xEA\x93x\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB7\x82\xE9\x82?A\x82\xE0\x82??E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82??\xE8\x82?\xB7\x81B</dd>
+  </dl>
+</dd>
+
 <dt>Ctrl \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82?\xAA\x82?\x83{\x83^\x83\x93\x82\xF0\x83N\x83\x8A\x83b\x83N</dt>
 <dd>\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x82\xAA\x82?\xAF\x82\xEA\x82?A\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x82\xAA\x8C\xBB\x82\xEA\x82?\xB7\x81B\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x82\xF0\x89B\x82\xB7\x82??A<A HREF="../menu/setup-window.html">[Setup] Window</A> \x82\xC5 Hide menu bar \x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B</dd>
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2018-06-14 08:43:41 UTC (rev 7131)
+++ trunk/teraterm/teraterm/vtwin.cpp	2018-06-14 08:43:47 UTC (rev 7132)
@@ -2513,7 +2513,7 @@
 
 void CVTWindow::OnNcLButtonDblClk(UINT nHitTest, CPoint point)
 {
-	if (! Minimized && (nHitTest == HTCAPTION)) {
+	if (! Minimized && !ts.TermIsWin && (nHitTest == HTCAPTION)) {
 		DispRestoreWinSize();
 	}
 	else {

From scmnotify ＠ osdn.net  Thu Jun 14 19:57:14 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 19:57:14 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMzNdIGVuY3J5cHQvIGRlY3J5cHQg55So?=
 =?utf-8?b?44Gu44OQ44OD44OV44Kh44KS5q+O5ZueIG1hbGxvYyAvIGZyZWUg44GZ44KL?=
 =?utf-8?b?44Gu44Gn44Gv44Gq44GP5L2/44GE44G+44KP44GZ44KI44GG44Gr44GX44Gf?=
 =?utf-8?b?44CC?=
Message-ID: <1528973834.109398.40269.nullmailer@users.osdn.me>

Revision: 7133
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7133
Author:   doda
Date:     2018-06-14 19:57:13 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
encrypt/decrypt 用のバッファを毎回 malloc/free するのではなく使いまわすようにした。

多少は軽く(高速に)なるのを期待したが、あまり(ほとんど)効果は出なかった。

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

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c	2018-06-14 08:43:47 UTC (rev 7132)
+++ trunk/ttssh2/ttxssh/crypt.c	2018-06-14 10:57:13 UTC (rev 7133)
@@ -72,6 +72,8 @@
 
 #define CMP(a,b) memcmp(a, b, SSH_BLOCKSIZE)
 
+static unsigned char *encbuff = NULL;
+static unsigned int encbufflen = 0;
 
 static char *get_cipher_name(int cipher);
 
@@ -200,7 +202,7 @@
 
 BOOL CRYPT_encrypt_aead(PTInstVar pvar, unsigned char *data, unsigned int bytes, unsigned int aadlen, unsigned int authlen)
 {
-	unsigned char *newbuf = NULL;
+	unsigned char *newbuff = NULL;
 	unsigned int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
 	unsigned char lastiv[1];
 	char tmp[80];
@@ -218,8 +220,12 @@
 		return FALSE;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		goto err;
+	if (bytes > encbufflen) {
+		if ((newbuff = realloc(encbuff, bytes)) == NULL)
+			goto err;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
 	if (!EVP_CIPHER_CTX_ctrl(evp, EVP_CTRL_GCM_IV_GEN, 1, lastiv))
 		goto err;
@@ -227,10 +233,10 @@
 	if (aadlen && !EVP_Cipher(evp, NULL, data, aadlen) < 0)
 		goto err;
 
-	if (EVP_Cipher(evp, newbuf, data+aadlen, bytes) < 0)
+	if (EVP_Cipher(evp, encbuff, data+aadlen, bytes) < 0)
 		goto err;
 
-	memcpy(data+aadlen, newbuf, bytes);
+	memcpy(data+aadlen, encbuff, bytes);
 
 	if (EVP_Cipher(evp, NULL, NULL, 0) < 0)
 		goto err;
@@ -238,13 +244,9 @@
 	if (!EVP_CIPHER_CTX_ctrl(evp, EVP_CTRL_GCM_GET_TAG, authlen, data+aadlen+bytes))
 		goto err;
 
-	free(newbuf);
-
 	return TRUE;
 
 err:
-	free(newbuf);
-
 	UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 	            get_cipher_name(pvar->crypt_state.sender_cipher));
@@ -254,7 +256,7 @@
 
 BOOL CRYPT_decrypt_aead(PTInstVar pvar, unsigned char *data, unsigned int bytes, unsigned int aadlen, unsigned int authlen)
 {
-	unsigned char *newbuf = NULL;
+	unsigned char *newbuff = NULL;
 	unsigned int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
 	unsigned char lastiv[1];
 	char tmp[80];
@@ -272,8 +274,12 @@
 		return FALSE;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		goto err;
+	if (bytes > encbufflen) {
+		if ((newbuff = realloc(encbuff, bytes)) == NULL)
+			goto err;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
 	if (!EVP_CIPHER_CTX_ctrl(evp, EVP_CTRL_GCM_IV_GEN, 1, lastiv))
 		goto err;
@@ -284,11 +290,10 @@
 	if (aadlen && !EVP_Cipher(evp, NULL, data, aadlen) < 0)
 		goto err;
 
-	if (EVP_Cipher(evp, newbuf, data+aadlen, bytes) < 0)
+	if (EVP_Cipher(evp, encbuff, data+aadlen, bytes) < 0)
 		goto err;
 
-	memcpy(data+aadlen, newbuf, bytes);
-	free(newbuf);
+	memcpy(data+aadlen, encbuff, bytes);
 
 	if (EVP_Cipher(evp, NULL, NULL, 0) < 0)
 		return FALSE;
@@ -296,8 +301,6 @@
 		return TRUE;
 
 err:
-	free(newbuf);
-
 	UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 	            get_cipher_name(pvar->crypt_state.receiver_cipher));
@@ -311,7 +314,7 @@
 
 static void crypt_SSH2_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	unsigned char *newbuf;
+	unsigned char *newbuff;
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
 	char tmp[80];
 
@@ -328,24 +331,26 @@
 		return;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		return;
+	if (bytes > encbufflen) {
+		if ((newbuff = realloc(encbuff, bytes)) == NULL)
+			return;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
-	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], newbuf, buf, bytes) == 0) {
+	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], encbuff, buf, bytes) == 0) {
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            get_cipher_name(pvar->crypt_state.sender_cipher));
 		notify_fatal_error(pvar, tmp, TRUE);
 	} else {
-		memcpy(buf, newbuf, bytes);
+		memcpy(buf, encbuff, bytes);
 	}
-
-	free(newbuf);
 }
 
 static void crypt_SSH2_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	unsigned char *newbuf;
+	unsigned char *newbuff;
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
 	char tmp[80];
 
@@ -362,19 +367,21 @@
 		return;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		return;
+	if (bytes > encbufflen) {
+		if ((newbuff = malloc(bytes)) == NULL)
+			return;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
-	if (EVP_Cipher(&pvar->evpcip[MODE_IN], newbuf, buf, bytes) == 0) {
+	if (EVP_Cipher(&pvar->evpcip[MODE_IN], encbuff, buf, bytes) == 0) {
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            get_cipher_name(pvar->crypt_state.receiver_cipher));
 		notify_fatal_error(pvar, tmp, TRUE);
 	} else {
-		memcpy(buf, newbuf, bytes);
+		memcpy(buf, encbuff, bytes);
 	}
-
-	free(newbuf);
 }
 
 static void c3DES_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
@@ -1307,6 +1314,10 @@
 
 void CRYPT_end(PTInstVar pvar)
 {
+	free(encbuff);
+	encbuff = NULL;
+	encbufflen = 0;
+
 	destroy_public_key(&pvar->crypt_state.host_key);
 	destroy_public_key(&pvar->crypt_state.server_key);
 

From scmnotify ＠ osdn.net  Thu Jun 14 19:57:20 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 19:57:20 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMzVdICDmma7mrrXkvb/jgYTnlKjjgas=?=
 =?utf-8?b?5YWx5pyJ44Oh44Oi44Oq5ZCN44KS6YCa5bi444Gu44OQ44O844K444On44Oz?=
 =?utf-8?b?44GL44KJ5aSJ5pu0?=
Message-ID: <1528973840.797197.40533.nullmailer@users.osdn.me>

Revision: 7135
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7135
Author:   doda
Date:     2018-06-14 19:57:20 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
普段使い用に共有メモリ名を通常のバージョンから変更

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

-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2018-06-14 10:57:17 UTC (rev 7134)
+++ trunk/teraterm/common/tttypes.h	2018-06-14 10:57:20 UTC (rev 7135)
@@ -1142,4 +1142,4 @@
 // TMap \x82\xF0\x8Ai\x94[\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x83}\x83b\x83s\x83\x93\x83O\x83I\x83u\x83W\x83F\x83N\x83g(\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A)\x82?\xBC\x91O
 // TMap(\x82?\xBB\x82?\x81\x83\x93\x83o)\x82?X\x90V\x8E\x9E\x82?\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82??\xAF\x8E\x9E\x8BN\x93\xAE\x82???ς\xA6\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82邪
 // \x98A\x94?\xA9\x82\xE7\x83o\x81[\x83W\x83\x87\x83\x93\x94?\x86\x82\xF0\x8Eg\x82\xA4\x82悤\x82?ύX\x82\xB5\x82\xBD\x88?A\x92?\xED\x82?蓮\x82ŕύX\x82\xB7\x82\xE9\x95K\x97v\x82?\xB3\x82\xA2
-#define TT_FILEMAPNAME "ttset_memfilemap_" TT_VERSION_STR("_")
+#define TT_FILEMAPNAME "ttset_memfilemap_" TT_VERSION_STR("_") "_S"

From scmnotify ＠ osdn.net  Thu Jun 14 19:57:17 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 19:57:17 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7134=5D__Local_to_Remote_=E3=81=AE_s?=
 =?utf-8?b?Y3Ag44Gn44CBc2NwIOWFiCBwYXRoIOOCkiBob3N0IDovc29tZS8gd2hlcmUg?=
 =?utf-8?b?44Go44GX44Gf5pmC44Gr?=
Message-ID: <1528973837.561844.40392.nullmailer@users.osdn.me>

Revision: 7134
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7134
Author:   doda
Date:     2018-06-14 19:57:17 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
Local to Remote の scp で、scp 先 path を host:/some/where とした時に
相手先で host への ssh 接続を行い、そこで scp を起動するようにした。

現在の制限:
・pageant 等でパスフレーズ入力が発生しないようにする必要がある
・path のエスケープ等は行っていない
・小さいファイルの転送が失敗する事がある?

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

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2018-06-14 10:57:13 UTC (rev 7133)
+++ trunk/ttssh2/ttxssh/ssh.c	2018-06-14 10:57:17 UTC (rev 7134)
@@ -7653,6 +7653,7 @@
 	int id, remote_id;
 	Channel_t *c;
 	char buff[MAX_PATH + 30];
+	char *host_p, *path_p;
 
 #ifdef DONT_WANTCONFIRM
 	int want_reply = 0; // false
@@ -7717,8 +7718,17 @@
 
 	case TYPE_SCP:
 		if (c->scp.dir == TOREMOTE) {
-			_snprintf_s(buff, sizeof(buff), _TRUNCATE, "scp -t %s", c->scp.remotefile);
-
+			if ((path_p = strchr(c->scp.remotefile, ':')) != NULL) {
+				host_p = c->scp.remotefile;
+				*path_p++ = 0;
+				if (*path_p == 0) {
+					path_p = ".";
+				}
+				_snprintf_s(buff, sizeof(buff), _TRUNCATE, "ssh %s scp -t %s", host_p, path_p);
+			}
+			else {
+				_snprintf_s(buff, sizeof(buff), _TRUNCATE, "scp -t %s", c->scp.remotefile);
+			}
 		} else {
 			// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82??\xF0\x8A??\xEA\x82Ă\xA2\x82Ă\xE0\x82悢\x82悤\x82?A\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x93\xF1\x8Fd\x88\xF8\x97p\x95\x84\x82ň??B
 			// (2014.7.13 yutaka)

From scmnotify ＠ osdn.net  Thu Jun 14 19:57:23 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 19:57:23 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMzZdICDlvq7lppnjgavph43jgarjgaM=?=
 =?utf-8?b?44Gm44GE44Gf44Gu44Gn6Kq/5pW0?=
Message-ID: <1528973843.900800.40627.nullmailer@users.osdn.me>

Revision: 7136
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7136
Author:   doda
Date:     2018-06-14 19:57:23 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
微妙に重なっていたので調整

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.rc

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2018-06-14 10:57:20 UTC (rev 7135)
+++ trunk/teraterm/teraterm/ttermpro.rc	2018-06-14 10:57:23 UTC (rev 7136)
@@ -68,11 +68,11 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,220,10
     GROUPBOX        "Title format",IDC_TITLEFMT_GROUP,5,130,250,55
     CONTROL         "&Display host/port name",IDC_TITLEFMT_DISPHOSTNAME,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,140,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,140,108,10
     CONTROL         "Display session &number",IDC_TITLEFMT_DISPSESSION,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,155,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,155,108,10
     CONTROL         "Display &VT/TEK",IDC_TITLEFMT_DISPVTTEK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,170,110,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,170,108,10
     CONTROL         "Swap hostname and &title position",IDC_TITLEFMT_SWAPHOSTTITLE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,140,130,10
     CONTROL         "Display tcp &port number",IDC_TITLEFMT_DISPTCPPORT,

From scmnotify ＠ osdn.net  Thu Jun 14 19:59:53 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 19:59:53 +0900
Subject: [Ttssh2-commit] [7137] revert r7134
Message-ID: <1528973993.429469.48883.nullmailer@users.osdn.me>

Revision: 7137
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7137
Author:   doda
Date:     2018-06-14 19:59:53 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
revert r7134

push するブランチを間違えた orz

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7134

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

-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2018-06-14 10:57:23 UTC (rev 7136)
+++ trunk/teraterm/common/tttypes.h	2018-06-14 10:59:53 UTC (rev 7137)
@@ -1142,4 +1142,4 @@
 // TMap \x82\xF0\x8Ai\x94[\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x83}\x83b\x83s\x83\x93\x83O\x83I\x83u\x83W\x83F\x83N\x83g(\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A)\x82?\xBC\x91O
 // TMap(\x82?\xBB\x82?\x81\x83\x93\x83o)\x82?X\x90V\x8E\x9E\x82?\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82??\xAF\x8E\x9E\x8BN\x93\xAE\x82???ς\xA6\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82邪
 // \x98A\x94?\xA9\x82\xE7\x83o\x81[\x83W\x83\x87\x83\x93\x94?\x86\x82\xF0\x8Eg\x82\xA4\x82悤\x82?ύX\x82\xB5\x82\xBD\x88?A\x92?\xED\x82?蓮\x82ŕύX\x82\xB7\x82\xE9\x95K\x97v\x82?\xB3\x82\xA2
-#define TT_FILEMAPNAME "ttset_memfilemap_" TT_VERSION_STR("_") "_S"
+#define TT_FILEMAPNAME "ttset_memfilemap_" TT_VERSION_STR("_")

From scmnotify ＠ osdn.net  Thu Jun 14 20:07:20 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 14 Jun 2018 20:07:20 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMzhdICByNzEzNCDjgoLkuIDml6YgcmV2?=
 =?utf-8?q?ert?=
Message-ID: <1528974440.365693.70510.nullmailer@users.osdn.me>

Revision: 7138
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7138
Author:   doda
Date:     2018-06-14 20:07:19 +0900 (Thu, 14 Jun 2018)
Log Message:
-----------
r7134 も一旦 revert

r7137 の revert 対象は r7135 です。

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7134
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7137
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7135

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

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2018-06-14 10:59:53 UTC (rev 7137)
+++ trunk/ttssh2/ttxssh/ssh.c	2018-06-14 11:07:19 UTC (rev 7138)
@@ -7653,7 +7653,6 @@
 	int id, remote_id;
 	Channel_t *c;
 	char buff[MAX_PATH + 30];
-	char *host_p, *path_p;
 
 #ifdef DONT_WANTCONFIRM
 	int want_reply = 0; // false
@@ -7718,17 +7717,8 @@
 
 	case TYPE_SCP:
 		if (c->scp.dir == TOREMOTE) {
-			if ((path_p = strchr(c->scp.remotefile, ':')) != NULL) {
-				host_p = c->scp.remotefile;
-				*path_p++ = 0;
-				if (*path_p == 0) {
-					path_p = ".";
-				}
-				_snprintf_s(buff, sizeof(buff), _TRUNCATE, "ssh %s scp -t %s", host_p, path_p);
-			}
-			else {
-				_snprintf_s(buff, sizeof(buff), _TRUNCATE, "scp -t %s", c->scp.remotefile);
-			}
+			_snprintf_s(buff, sizeof(buff), _TRUNCATE, "scp -t %s", c->scp.remotefile);
+
 		} else {
 			// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82??\xF0\x8A??\xEA\x82Ă\xA2\x82Ă\xE0\x82悢\x82悤\x82?A\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x93\xF1\x8Fd\x88\xF8\x97p\x95\x84\x82ň??B
 			// (2014.7.13 yutaka)

From scmnotify ＠ osdn.net  Mon Jun 18 11:56:00 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 18 Jun 2018 11:56:00 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxMzldICBkcmFnIGFuZCBkcm9w44OA44Kk?=
 =?utf-8?b?44Ki44Ot44Kw44Gu44OH44K244Kk44Oz5aSJ5pu0?=
Message-ID: <1529290560.795923.70607.nullmailer@users.osdn.me>

Revision: 7139
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7139
Author:   zmatsuo
Date:     2018-06-18 11:56:00 +0900 (Mon, 18 Jun 2018)
Log Message:
-----------
drag and dropダイアログのデザイン変更

Modified Paths:
--------------
    branches/drag_and_drop/teraterm/common/tt_res.h
    branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
    branches/drag_and_drop/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: branches/drag_and_drop/teraterm/common/tt_res.h
===================================================================
--- branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-14 11:07:19 UTC (rev 7138)
+++ branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-18 02:56:00 UTC (rev 7139)
@@ -64,7 +64,6 @@
 #define IDC_SHELL                       1038
 #define IDC_TERM_EDIT                   1039
 #define IDC_ENV1                        1040
-#define IDC_EDIT7                       1041
 #define IDC_ENV2                        1041
 #define IDC_MOUSE                       1042
 #define IDC_DELIMITER                   1043
@@ -129,7 +128,6 @@
 #define IDC_REALTIME_CHECK              2508
 #define IDC_LIST1                       2509
 #define IDC_LIST                        2509
-#define IDC_EDIT1                       2510
 #define IDC_EDIT                        2510
 #define IDC_SCROLL_LINE                 2510
 #define IDC_PASTEDELAY_EDIT             2510
@@ -138,7 +136,6 @@
 #define IDC_ROTATE_SIZE                 2510
 #define IDC_INI_SETUPDIR_EDIT           2510
 #define IDC_KEYCNF_SETUPDIR_EDIT        2511
-#define IDC_CHECK1                      2512
 #define IDC_CONFIRM_CHANGE_PASTE        2512
 #define IDC_CURSOR_CTRL_SEQ             2512
 #define IDC_LOG_ROTATE                  2512
@@ -199,7 +196,6 @@
 #define IDC_CYGTERM_SETUPDIR_BUTTON_FILE2 2551
 #define IDC_SSH_SETUPDIR_BUTTON_FILE    2551
 #define IDC_BGIMG_BRIGHTNESS            2551
-#define IDC_EDIT2                       2552
 #define IDC_EDIT_BGIMG_BRIGHTNESS       2552
 #define IDC_INI_SETUPDIR_EDIT_VSTORE    2552
 #define IDC_INI_SETUPDIR_STATIC_VSTORE  2553
@@ -224,9 +220,13 @@
 #define IDC_SENDFILE_RADIO              2572
 #define IDC_PASTE_RADIO                 2573
 #define IDC_ESCAPE_CHECK                2574
-#define IDC_DEFAULT_CHECK               2575
-#define IDC_SCP_PATH_LABEL              2576
-#define IDC_SCP_PATH_NOTE               2577
+#define IDC_SCP_PATH_LABEL              2575
+#define IDC_SCP_PATH_NOTE               2576
+#define IDC_SPACE_RADIO                 2577
+#define IDC_NEWLINE_RADIO               2578
+#define IDC_DAD_NOTE                    2579
+#define IDC_SAME_PROCESS_CHECK          2580
+#define IDC_DONTSHOW_CHECK              2581
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002
 #define ID_ACC_NEWCONNECTION            50003
@@ -324,7 +324,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        126
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2578
+#define _APS_NEXT_CONTROL_VALUE         2582
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-14 11:07:19 UTC (rev 7138)
+++ branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-18 02:56:00 UTC (rev 7139)
@@ -26,7 +26,7 @@
 // Dialog
 //
 
-IDD_DAD_DIALOG DIALOGEX 0, 0, 187, 207
+IDD_DAD_DIALOG DIALOGEX 0, 0, 187, 267
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Tera Term: File Drag and Drop"
 FONT 8, "Tahoma", 400, 0, 0x0
@@ -42,12 +42,17 @@
     LTEXT           "dest is home directory if empty",IDC_SCP_PATH_NOTE,50,64,120,8
     CONTROL         "Bina&ry",IDC_BINARY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,92,151,10
     CONTROL         "Es&cape",IDC_ESCAPE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,125,151,10
+    CONTROL         "Separat&or is Space",IDC_SPACE_RADIO,"Button",BS_AUTORADIOBUTTON,19,139,160,10
+    CONTROL         "Separator is &NewLine",IDC_NEWLINE_RADIO,"Button",BS_AUTORADIOBUTTON,19,154,160,10
     CONTROL         "&Adapt same process to remaing %d files",IDC_ADAPT_SAME_CHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144,172,10
-    CONTROL         "&Default process from next drop\n(Drop with CTRL, this dialog is dispalyed)",IDC_DEFAULT_CHECK,
-                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,160,172,18
-    DEFPUSHBUTTON   "OK",IDOK,69,185,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,130,185,50,14
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,173,172,10
+    CONTROL         "Do sa&me process, next drop",IDC_SAME_PROCESS_CHECK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,188,172,10
+    CONTROL         "&Do not display this dialog, next drop",IDC_DONTSHOW_CHECK,
+                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,203,172,11
+    DEFPUSHBUTTON   "OK",IDOK,69,245,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,130,245,50,14
+    LTEXT           "Drop with CTRL, this dialog is dispalyed",IDC_DAD_NOTE,7,221,172,8
 END
 
 IDD_COMMENT_DIALOG DIALOGEX 0, 0, 239, 19

Modified: branches/drag_and_drop/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-14 11:07:19 UTC (rev 7138)
+++ branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-18 02:56:00 UTC (rev 7139)
@@ -2038,19 +2038,25 @@
 	DROP_TYPE_SEND_FILE,		// past contents of file
 	DROP_TYPE_SEND_FILE_BINARY,
 	DROP_TYPE_PASTE_FILENAME,
-	DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE,
 };
 
+#define DROP_TYPE_PASTE_ESCAPE	0x01
+#define	DROP_TYPE_PASTE_NEWLINE	0x02
+
 struct DrapDropDlgParam {
 	const char *TargetFilename;
 	enum drop_type DropType;
+	unsigned char DropTypePaste;
 	bool ScpEnable;
 	char *ScpSendDirPtr;
 	int ScpSendDirSize;
 	bool SendfileEnable;
+	bool PasteNewlineEnable;
 	int RemaingFileCount;
 	bool AdaptSameProcess;
-	bool DefaultProcess;
+	bool DoSameProcess;
+	bool DoNotShowDialogEnable;
+	bool DoNotShowDialog;
 };
 
 struct DrapDropDlgData {
@@ -2081,8 +2087,10 @@
 					IDC_DAD_STATIC,
 					IDC_SCP_RADIO, IDC_SENDFILE_RADIO, IDC_PASTE_RADIO,
 					IDC_SCP_PATH_LABEL, IDC_SCP_PATH, IDC_SCP_PATH_NOTE,
-					IDC_BINARY_CHECK, IDC_ESCAPE_CHECK,
-					IDC_ADAPT_SAME_CHECK, IDC_DEFAULT_CHECK,
+					IDC_BINARY_CHECK,
+					IDC_ESCAPE_CHECK, IDC_NEWLINE_RADIO, IDC_SPACE_RADIO,
+					IDC_ADAPT_SAME_CHECK, IDC_DONTSHOW_CHECK,
+					IDC_DAD_NOTE,
 					IDOK, IDCANCEL,
 				};
 				SetDlgFonts(hDlgWnd, IDs, _countof(IDs), DlgDragDropFont);
@@ -2105,8 +2113,7 @@
 			CheckRadioButton(hDlgWnd, IDC_SCP_RADIO, IDC_PASTE_RADIO,
 							 (Param->DropType == DROP_TYPE_SEND_FILE ||
 							  Param->DropType == DROP_TYPE_SEND_FILE_BINARY) ? IDC_SENDFILE_RADIO :
-							 (Param->DropType == DROP_TYPE_PASTE_FILENAME ||
-							  Param->DropType == DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE) ? IDC_PASTE_RADIO :
+							 Param->DropType == DROP_TYPE_PASTE_FILENAME  ? IDC_PASTE_RADIO :
 							 IDC_SCP_RADIO);
 
 			// SCP
@@ -2130,9 +2137,16 @@
 			}
 
 			// Paste Filename
-			if (Param->DropType != DROP_TYPE_PASTE_FILENAME) {
+			if (Param->DropTypePaste & DROP_TYPE_PASTE_ESCAPE) {
 				SendMessage(GetDlgItem(hDlgWnd, IDC_ESCAPE_CHECK), BM_SETCHECK, BST_CHECKED, 0);
 			}
+			CheckRadioButton(hDlgWnd, IDC_SPACE_RADIO, IDC_NEWLINE_RADIO, 
+							 Param->DropTypePaste & DROP_TYPE_PASTE_NEWLINE?
+							 IDC_NEWLINE_RADIO : IDC_SPACE_RADIO);
+			if (Param->RemaingFileCount < 2) {
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_SPACE_RADIO), FALSE);
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_NEWLINE_RADIO), FALSE);
+			}
 
 			// Adapt same process
 			GetDlgItemText(hDlgWnd, IDC_ADAPT_SAME_CHECK, uimsg, sizeof(uimsg));
@@ -2143,6 +2157,15 @@
 				EnableWindow(GetDlgItem(hDlgWnd, IDC_ADAPT_SAME_CHECK), FALSE);
 			}
 
+			// Dont Show Dialog
+			if (Param->DoNotShowDialog) {
+				SendMessage(GetDlgItem(hDlgWnd, IDC_DONTSHOW_CHECK), BM_SETCHECK, BST_CHECKED, 0);
+			}
+			if (!Param->DoNotShowDialogEnable) {
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_DONTSHOW_CHECK), FALSE);
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_DAD_NOTE), FALSE);
+			}
+
 			// focus to "SCP dest textbox" or "Cancel"
 			if (Param->ScpEnable) {
 				// "SCP" \x97L\x8C\xF8\x8E\x9E\x82\xCD Cancel \x82?t\x83H\x81[\x83J\x83X\x82?āA\x8D?I\x93I\x82\xC9 SCP PATH \x82?t\x83H\x81[\x83J\x83X\x82\xAA
@@ -2185,16 +2208,24 @@
 						DROP_TYPE_SEND_FILE_BINARY : DROP_TYPE_SEND_FILE;
 				} else /* if (IsDlgButtonChecked(hDlgWnd, IDC_PASTE_RADIO) == BST_CHECKED) */ {
 					// Paste Filename
-					DlgData->Param->DropType =
+					DlgData->Param->DropType = DROP_TYPE_PASTE_FILENAME;
+					DlgData->Param->DropTypePaste = 0;
+					DlgData->Param->DropTypePaste |=
 						(IsDlgButtonChecked(hDlgWnd, IDC_ESCAPE_CHECK) == BST_CHECKED) ?
-						DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE : DROP_TYPE_PASTE_FILENAME;
+						DROP_TYPE_PASTE_ESCAPE : 0;
+					DlgData->Param->DropTypePaste |=
+						(IsDlgButtonChecked(hDlgWnd, IDC_NEWLINE_RADIO) == BST_CHECKED) ?
+						DROP_TYPE_PASTE_NEWLINE : 0;
 				}
 				DlgData->Param->AdaptSameProcess = 
 					(IsDlgButtonChecked(hDlgWnd, IDC_ADAPT_SAME_CHECK) == BST_CHECKED) ?
 					true : false;
-				DlgData->Param->DefaultProcess = 
-					(IsDlgButtonChecked(hDlgWnd, IDC_DEFAULT_CHECK) == BST_CHECKED) ?
+				DlgData->Param->DoSameProcess =
+					(IsDlgButtonChecked(hDlgWnd, IDC_SAME_PROCESS_CHECK) == BST_CHECKED) ?
 					true : false;
+				DlgData->Param->DoNotShowDialog = 
+					(IsDlgButtonChecked(hDlgWnd, IDC_DONTSHOW_CHECK) == BST_CHECKED) ?
+					true : false;
 			}
 			if (wID == IDCANCEL) {
 				DlgData->Param->DropType = DROP_TYPE_CANCEL;
@@ -2223,17 +2254,24 @@
 	int RemaingFileCount,
 	bool EnableSCP,
 	bool EnableSendFile,
+	bool EnableDoNotShowDialog,
+	unsigned char *DropTypePaste,
 	bool *AdaptSameProcess,
-	bool *DefaultProcess)
+	bool *DoSameProcess,
+	bool *DoNotShowDialog)
 {
 	struct DrapDropDlgParam Param;
 	Param.TargetFilename = TargetFilename;
 	Param.DropType = DefaultDropType;
+	Param.DropTypePaste = *DropTypePaste;
 	Param.ScpEnable = EnableSCP;
 	Param.ScpSendDirPtr = ts.ScpSendDir;
 	Param.ScpSendDirSize = sizeof(ts.ScpSendDir);
 	Param.SendfileEnable = EnableSendFile;
+	Param.PasteNewlineEnable = true;
 	Param.RemaingFileCount = RemaingFileCount;
+	Param.DoNotShowDialog = *DoNotShowDialog;
+	Param.DoNotShowDialogEnable = EnableDoNotShowDialog;
 	int ret = DialogBoxParam(
 		hInstance, MAKEINTRESOURCE(IDD_DAD_DIALOG),
 		hWndParent, (DLGPROC)OnDragDropDlgProc,
@@ -2241,8 +2279,10 @@
 	if (ret != IDOK) {
 		return DROP_TYPE_CANCEL;
 	}
+	*DropTypePaste = Param.DropTypePaste;
 	*AdaptSameProcess = Param.AdaptSameProcess;
-	*DefaultProcess = Param.DefaultProcess;
+	*DoSameProcess = Param.DoSameProcess;
+	*DoNotShowDialog = Param.DoNotShowDialog;
 	return Param.DropType;
 }
 
@@ -2343,7 +2383,10 @@
 
 LONG CVTWindow::OnDropNotify(UINT ShowDialog, LONG lParam)
 {
+	// ini\x82??\xB6\x82\xB3\x82\xEA\x82?\xA2\x81A\x8D\xA1\x8E\xC0\x8Ds\x82\xB5\x82Ă\xA2\x82\xE9Tera Term\x82ł??L\x8C\xF8\x82??\xE8
 	static enum drop_type DefaultDropType = DROP_TYPE_CANCEL;
+	static unsigned char DefaultDropTypePaste = DROP_TYPE_PASTE_ESCAPE;
+	static bool DefaultShowDialog = ts.ConfirmFileDragAndDrop ? true : false;
 
 	(void)lParam;
 	int FileCount = 0;
@@ -2364,6 +2407,7 @@
 	bool AdapatSameProcess = false;
 	const bool isSSH = (cv.isSSH == 2);
 	enum drop_type DropType;
+	unsigned char DropTypePaste = DROP_TYPE_PASTE_ESCAPE;
 	if (DefaultDropType == DROP_TYPE_CANCEL) {
 		// default is not set
 		if (!ShowDialog) {
@@ -2377,13 +2421,13 @@
 					AdapatSameProcess = false;
 				} else {
 					DropType = DROP_TYPE_SEND_FILE;
-					AdapatSameProcess = true;
+					AdapatSameProcess = DefaultShowDialog ? false : true;
 				}
 			} else if (FileCount == 0 && DirectoryCount == 1) {
-				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
-				AdapatSameProcess = true;
+				DropType = DROP_TYPE_PASTE_FILENAME;
+				AdapatSameProcess = DefaultShowDialog ? false : true;
 			} else if (FileCount > 0 && DirectoryCount > 0) {
-				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+				DropType = DROP_TYPE_PASTE_FILENAME;
 				AdapatSameProcess = false;
 			} else if (FileCount > 0 && DirectoryCount == 0) {
 				// filename only
@@ -2395,13 +2439,13 @@
 				AdapatSameProcess = false;
 			} else {
 				// directory only
-				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+				DropType = DROP_TYPE_PASTE_FILENAME;
 				AdapatSameProcess = ts.ConfirmFileDragAndDrop ? false : true;
 			}
 		} else {
 			// show dialog
 			if (DirectoryCount > 0) {
-				DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+				DropType = DROP_TYPE_PASTE_FILENAME;
 			} else {
 				if (isSSH) {
 					DropType = DROP_TYPE_SCP;
@@ -2417,11 +2461,13 @@
 			 DefaultDropType == DROP_TYPE_SEND_FILE_BINARY ||
 			 DefaultDropType == DROP_TYPE_SCP))
 		{	// \x83f\x83t\x83H\x83\x8B\x83g\x82???ł?\x88\x97\x9D\x82ł\xAB\x82?\xA2\x91g\x82?\x87\x82?
-			DropType = DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE;
+			DropType = DROP_TYPE_PASTE_FILENAME;
+			DropTypePaste = DefaultDropTypePaste;
 			AdapatSameProcess = false;
 		} else {
 			DropType = DefaultDropType;
-			AdapatSameProcess = ShowDialog ? false : true;
+			DropTypePaste = DefaultDropTypePaste;
+			AdapatSameProcess = (ShowDialog || DefaultShowDialog) ? false : true;
 		}
 	}
 
@@ -2429,7 +2475,8 @@
 		const char *FileName = DropLists[i];
 
 		if (!AdapatSameProcess) {
-			bool DefaultProcess;
+			bool DoSameProcess;
+			bool DoNotShowDialog = !DefaultShowDialog;
 			DropType =
 				ShowDropDialogBox(hInst, HVTWin,
 								  FileName, DropType,
@@ -2436,13 +2483,21 @@
 								  DropListCount - i,
 								  (DirectoryCount == 0 && isSSH) ? true : false,
 								  DirectoryCount == 0 ? true : false,
-								  &AdapatSameProcess, &DefaultProcess);
+								  ts.ConfirmFileDragAndDrop ? false : true,
+								  &DropTypePaste,
+								  &AdapatSameProcess,
+								  &DoSameProcess,
+								  &DoNotShowDialog);
 			if (DropType == DROP_TYPE_CANCEL) {
 				goto finish;
 			}
-			if (DefaultProcess) {
+			if (DoSameProcess) {
 				DefaultDropType = DropType;
+				DefaultDropTypePaste = DropTypePaste;
 			}
+			if (!ts.ConfirmFileDragAndDrop) {
+				DefaultShowDialog = !DoNotShowDialog;
+			}
 		}
 			 
 		switch (DropType) {
@@ -2475,12 +2530,12 @@
 			}
 			break;
 		case DROP_TYPE_PASTE_FILENAME:
-		case DROP_TYPE_PASTE_FILENAME_WITH_ESCAPE:
 		{
-			const bool escape = DropType == DROP_TYPE_PASTE_FILENAME ? false : true;
+			const bool escape = (DropTypePaste & DROP_TYPE_PASTE_ESCAPE) ? true : false;
 			PasteString(&cv, FileName, escape);
-			if (DropListCount > 1) {
-				PasteString(&cv, "\n", false);
+			if (DropListCount > 1 && i < DropListCount - 1) {
+				const char *separator = (DropTypePaste & DROP_TYPE_PASTE_NEWLINE) ? "\n" : " ";
+				PasteString(&cv, separator, false);
 			}
 			break;
 		}

From scmnotify ＠ osdn.net  Thu Jun 28 18:54:15 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 28 Jun 2018 18:54:15 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B7140=5D__Bracketed_Paste_Mode_?=
 =?utf-8?b?44KS5Y+N5pig44GX44Gf6LK844KK5LuY44GR55So6Zai5pWw44KS6L+95Yqg?=
 =?utf-8?b?44CC?=
Message-ID: <1530179655.414300.33885.nullmailer@users.osdn.me>

Revision: 7140
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7140
Author:   doda
Date:     2018-06-28 18:54:14 +0900 (Thu, 28 Jun 2018)
Log Message:
-----------
Bracketed Paste Mode を反映した貼り付け用関数を追加。

TermSendStartBracket() -- Bracketed Paste Mode が有効か判断し、必要ならば開始 Bracket を送信する。
TermSendEndBracket()   -- Bracketed Paste Mode が有効か判断し、必要ならば終了 Bracket を送信する。
TermPasteString(char *str, int len) -- Bracketed Paste Mode を考慮した文字列貼り付け。

使い方:

TermSendStartBracket();

CommTextOut(&cv, str, len);
if (ts.LocalEcho)
	CommTextEcho(&cv, str, len);
// 必要なだけ上記を行う

TermSendEndBracket();

上記を一まとめにしたのが TermPasteString(str, len)

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

-------------- next part --------------
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2018-06-18 02:56:00 UTC (rev 7139)
+++ trunk/teraterm/teraterm/clipboar.c	2018-06-28 09:54:14 UTC (rev 7140)
@@ -31,6 +31,7 @@
 #include "teraterm.h"
 #include "tttypes.h"
 #include "vtdisp.h"
+#include "vtterm.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -372,12 +373,8 @@
 	}
 }
 
-#define BracketStartLen	(sizeof(BracketStart)-1)
-#define BracketEndLen	(sizeof(BracketEnd)-1)
 void CBStartPaste(HWND HWin, BOOL AddCR, BOOL Bracketed)
 {
-	static char BracketStart[] = "\033[200~";
-	static char BracketEnd[] = "\033[201~";
 	UINT Cf;
 	PCHAR TmpPtr;
 	LPWSTR TmpPtrW;

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2018-06-18 02:56:00 UTC (rev 7139)
+++ trunk/teraterm/teraterm/vtterm.c	2018-06-28 09:54:14 UTC (rev 7140)
@@ -98,8 +98,13 @@
 static BOOL AltScr;
 static BOOL LRMarginMode;
 static BOOL RectangleMode;
-BOOL BracketedPaste;
+static BOOL BracketedPaste;
 
+char BracketStart[] = "\033[200~";
+char BracketEnd[] = "\033[201~";
+int BracketStartLen = (sizeof(BracketStart)-1);
+int BracketEndLen = (sizeof(BracketEnd)-1);
+
 static int VTlevel;
 
 BOOL AcceptWheelToCursor;
@@ -6104,3 +6109,33 @@
 		Send8BitMode = ts.Send8BitCtrl;
 	}
 }
+
+void TermPasteString(char *str, int len)
+{
+	TermSendStartBracket();
+	CommTextOut(&cv, str, len);
+	if (ts.LocalEcho) {
+		CommTextEcho(&cv, str, len);
+	}
+	TermSendEndBracket();
+
+	return;
+}
+
+void TermSendStartBracket()
+{
+	if (BracketedPaste) {
+		CommBinaryOut(&cv, BracketStart, BracketStartLen);
+	}
+
+	return;
+}
+
+void TermSendEndBracket()
+{
+	if (BracketedPaste) {
+		CommBinaryOut(&cv, BracketEnd, BracketEndLen);
+	}
+
+	return;
+}

Modified: trunk/teraterm/teraterm/vtterm.h
===================================================================
--- trunk/teraterm/teraterm/vtterm.h	2018-06-18 02:56:00 UTC (rev 7139)
+++ trunk/teraterm/teraterm/vtterm.h	2018-06-28 09:54:14 UTC (rev 7140)
@@ -46,7 +46,15 @@
 BOOL WheelToCursorMode();
 void EndTerm();
 void ChangeTerminalID();
+void TermPasteString(char *str, int len);
+void TermSendStartBracket(void);
+void TermSendEndBracket(void);
 
 #ifdef __cplusplus
 }
 #endif
+
+extern int BracketStartLen;
+extern int BracketEndLen;
+extern char BracketStart[];
+extern char BracketEnd[];

From scmnotify ＠ osdn.net  Thu Jun 28 23:24:08 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 28 Jun 2018 23:24:08 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxNDFdICBkcmFnIGFuZCBkcm9w44OA44Kk?=
 =?utf-8?b?44Ki44Ot44Kw44Gu6Kq/5pW0?=
Message-ID: <1530195848.865683.73022.nullmailer@users.osdn.me>

Revision: 7141
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7141
Author:   zmatsuo
Date:     2018-06-28 23:24:07 +0900 (Thu, 28 Jun 2018)
Log Message:
-----------
drag and dropダイアログの調整
- 文言修正
- ラジオボタンの動作改良

Modified Paths:
--------------
    branches/drag_and_drop/installer/release/lang/Japanese.lng
    branches/drag_and_drop/teraterm/common/tt_res.h
    branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
    branches/drag_and_drop/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: branches/drag_and_drop/installer/release/lang/Japanese.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/Japanese.lng	2018-06-28 09:54:14 UTC (rev 7140)
+++ branches/drag_and_drop/installer/release/lang/Japanese.lng	2018-06-28 14:24:07 UTC (rev 7141)
@@ -143,8 +143,6 @@
 ; vtwin.cpp
 MSG_ALL_TERMINATE_CONF=\x91STera Term\x82\xF0\x8B\xAD\x90\xA7\x8FI\x97\xB9\x82\xB5\x82?\xB7\x82\xA9\x81H
 MSG_DISCONNECT_CONF=\x90?f\x82\xB5\x82?\xB7\x82\xA9\x81H
-MSG_DANDD_CONF=\x83t\x83@\x83C\x83\x8B\x93]\x91\x97\x82\xF0\x8Ds\x82\xA2\x82?\xB7\x82\xA9\x81H
-MSG_DANDD_CONF_TITLE=Tera Term: \x83t\x83@\x83C\x83\x8B \x83h\x83\x89\x83b\x83O&\x83h\x83\x8D\x83b\x83v
 MSG_EXEC_TT_ERROR=Tera Term \x82\xF0\x8E\xC0\x8Ds\x82ł\xAB\x82?\xB9\x82\xF1 (%d)
 MSG_FIND_CYGTERM_DIR_ERROR=Cygwin \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xAA\x8C\xA9\x82?\xA9\x82\xE8\x82?\xB9\x82\xF1
 MSG_CYGTERM_ENV_ALLOC_ERROR=\x8A?\xAB\x95?\x94\x97p\x82?\x81\x83\x82\x83\x8A\x82\xAA\x8Am\x95?ł\xAB\x82?\xB9\x82\xF1
@@ -168,6 +166,10 @@
 MSG_LOGFILE_TOOLONG_ERROR=\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x92\xB7\x82\xB7\x82\xAC\x82?\xB7
 MSG_SAVESETUP_PERMISSION_ERROR=TERATERM.INI \x82?\x91\x82\xAB\x8D\x9E\x82?\xA0\x8C\xC0\x82\xAA\x82\xA0\x82\xE8\x82?\xB9\x82\xF1
 
+MSG_DANDD_CONF_TITLE=Tera Term: \x83t\x83@\x83C\x83\x8B \x83h\x83\x89\x83b\x83O&\x83h\x83\x8D\x83b\x83v
+MSG_DANDD_CONF=\x83t\x83@\x83C\x83\x8B\x93]\x91\x97\x82\xF0\x8Ds\x82\xA2\x82?\xB7\x82\xA9\x81H
+MSG_DANDD_CONF_CONFLICTS=\x93\xAF\x82\xB6\x8F\x88\x97\x9D\x82\xF0\x8E\x9F\x82\xCC %d \x8C??\xA3\x8D\x87\x82?K\x97p
+
 DLG_TABSHEET_TITLE=Tera Term: \x82\xBB\x82?\xBC\x82??\xE8
 DLG_TABSHEET_TITLE_GENERAL=\x91S\x94\xCA
 DLG_TABSHEET_TITLE_SEQUENCE=\x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X

Modified: branches/drag_and_drop/teraterm/common/tt_res.h
===================================================================
--- branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-28 09:54:14 UTC (rev 7140)
+++ branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-28 14:24:07 UTC (rev 7141)
@@ -214,7 +214,7 @@
 #define IDC_CLIPBOARD_NOTIFY            2566
 #define IDC_LIST_HIDDEN_FONTS           2567
 #define IDC_BINARY_CHECK                2568
-#define IDC_ADAPT_SAME_CHECK            2569
+#define IDC_SAME_PROCESS_CHECK          2569
 #define IDC_FILENAME_EDIT               2570
 #define IDC_SCP_RADIO                   2571
 #define IDC_SENDFILE_RADIO              2572
@@ -225,7 +225,7 @@
 #define IDC_SPACE_RADIO                 2577
 #define IDC_NEWLINE_RADIO               2578
 #define IDC_DAD_NOTE                    2579
-#define IDC_SAME_PROCESS_CHECK          2580
+#define IDC_SAME_PROCESS_NEXTDROP_CHECK 2580
 #define IDC_DONTSHOW_CHECK              2581
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002

Modified: branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-28 09:54:14 UTC (rev 7140)
+++ branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-28 14:24:07 UTC (rev 7141)
@@ -37,22 +37,22 @@
     CONTROL         "S&end File (Paste content of file)",IDC_SENDFILE_RADIO,
                     "Button",BS_AUTORADIOBUTTON | BS_NOTIFY,7,77,172,10
     CONTROL         "&Paste Filename",IDC_PASTE_RADIO,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY,7,109,172,10
-    LTEXT           "SCP des&t:",IDC_SCP_PATH_LABEL,19,50,36,8
-    EDITTEXT        IDC_SCP_PATH,57,47,122,14,ES_AUTOHSCROLL
+    LTEXT           "des&t:",IDC_SCP_PATH_LABEL,19,50,22,8
+    EDITTEXT        IDC_SCP_PATH,46,47,133,14,ES_AUTOHSCROLL
     LTEXT           "dest is home directory if empty",IDC_SCP_PATH_NOTE,50,64,120,8
     CONTROL         "Bina&ry",IDC_BINARY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,92,151,10
     CONTROL         "Es&cape",IDC_ESCAPE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,125,151,10
     CONTROL         "Separat&or is Space",IDC_SPACE_RADIO,"Button",BS_AUTORADIOBUTTON,19,139,160,10
     CONTROL         "Separator is &NewLine",IDC_NEWLINE_RADIO,"Button",BS_AUTORADIOBUTTON,19,154,160,10
-    CONTROL         "&Adapt same process to remaing %d files",IDC_ADAPT_SAME_CHECK,
+    CONTROL         "&Do this for the next %d conflicts",IDC_SAME_PROCESS_CHECK,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,173,172,10
-    CONTROL         "Do sa&me process, next drop",IDC_SAME_PROCESS_CHECK,
+    CONTROL         "Do sa&me process, next drop",IDC_SAME_PROCESS_NEXTDROP_CHECK,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,188,172,10
-    CONTROL         "&Do not display this dialog, next drop",IDC_DONTSHOW_CHECK,
+    CONTROL         "Do not d&isplay this dialog, next drop",IDC_DONTSHOW_CHECK,
                     "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,203,172,11
     DEFPUSHBUTTON   "OK",IDOK,69,245,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,130,245,50,14
-    LTEXT           "Drop with CTRL, this dialog is dispalyed",IDC_DAD_NOTE,7,221,172,8
+    LTEXT           "Drop with CTRL, this dialog is displayed",IDC_DAD_NOTE,7,221,172,8
 END
 
 IDD_COMMENT_DIALOG DIALOGEX 0, 0, 239, 19
@@ -348,8 +348,8 @@
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 179
-        TOPMARGIN, 1
-        BOTTOMMARGIN, 67
+        TOPMARGIN, 6
+        BOTTOMMARGIN, 259
     END
 
     IDD_COMMENT_DIALOG, DIALOG

Modified: branches/drag_and_drop/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-28 09:54:14 UTC (rev 7140)
+++ branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-28 14:24:07 UTC (rev 7141)
@@ -2032,6 +2032,28 @@
 	}
 }
 
+typedef struct {
+	int nIDDlgItem;
+	char *key;
+} DlgTextInfo;
+
+static void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, char *UILanguageFile)
+{
+	for (int i = 0 ; i < infoCount; i++) {
+		char *key = infos[i].key;
+		char uimsg[MAX_UIMSG];
+		get_lang_msg(key, uimsg, sizeof(uimsg), "", UILanguageFile);
+		if (uimsg[0] != '\0') {
+			const int nIDDlgItem = infos[i].nIDDlgItem;
+			if (nIDDlgItem == 0) {
+				SetWindowText(hDlgWnd, uimsg);
+			} else {
+				SetDlgItemText(hDlgWnd, nIDDlgItem, uimsg);
+			}
+		}
+	}
+}
+
 enum drop_type {
 	DROP_TYPE_CANCEL,
 	DROP_TYPE_SCP,
@@ -2053,8 +2075,8 @@
 	bool SendfileEnable;
 	bool PasteNewlineEnable;
 	int RemaingFileCount;
-	bool AdaptSameProcess;
 	bool DoSameProcess;
+	bool DoSameProcessNextDrop;
 	bool DoNotShowDialogEnable;
 	bool DoNotShowDialog;
 };
@@ -2071,7 +2093,6 @@
 	switch (msg) {
 		case WM_INITDIALOG:
 		{
-			char uimsg[MAX_UIMSG];
 			LOGFONT logfont;
 			HFONT font;
 			HFONT DlgDragDropFont = NULL;
@@ -2082,7 +2103,7 @@
 			font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
 			GetObject(font, sizeof(LOGFONT), &logfont);
 			if (get_lang_font("DLG_TAHOMA_FONT", hDlgWnd, &logfont, &DlgDragDropFont, ts.UILanguageFile)) {
-				const static int IDs[] = {
+				static const int IDs[] = {
 					IDC_FILENAME_EDIT,
 					IDC_DAD_STATIC,
 					IDC_SCP_RADIO, IDC_SENDFILE_RADIO, IDC_PASTE_RADIO,
@@ -2089,7 +2110,7 @@
 					IDC_SCP_PATH_LABEL, IDC_SCP_PATH, IDC_SCP_PATH_NOTE,
 					IDC_BINARY_CHECK,
 					IDC_ESCAPE_CHECK, IDC_NEWLINE_RADIO, IDC_SPACE_RADIO,
-					IDC_ADAPT_SAME_CHECK, IDC_DONTSHOW_CHECK,
+					IDC_SAME_PROCESS_CHECK, IDC_SAME_PROCESS_NEXTDROP_CHECK, IDC_DONTSHOW_CHECK,
 					IDC_DAD_NOTE,
 					IDOK, IDCANCEL,
 				};
@@ -2099,15 +2120,15 @@
 			}
 			DlgData->DlgDragDropFont = DlgDragDropFont;
 
-			GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
-			get_lang_msg("MSG_DANDD_CONF_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetWindowText(hDlgWnd, ts.UIMsg);
+			static const DlgTextInfo textInfos[] = {
+				{ 0, "MSG_DANDD_CONF_TITLE" },
+				{ IDC_DAD_STATIC, "MSG_DANDD_CONF" },
+				{ IDC_SAME_PROCESS_CHECK, "MSG_DANDD_CONF_CONFLICTS" },
+			};
+			SetDlgTexts(hDlgWnd, textInfos, _countof(textInfos), ts.UILanguageFile);
 
+			// target file
 			SetDlgItemText(hDlgWnd, IDC_FILENAME_EDIT, Param->TargetFilename);
-
-			get_lang_msg("MSG_DANDD_CONF", ts.UIMsg, sizeof(ts.UIMsg),
-			             "Are you sure that you want to send the file content?", ts.UILanguageFile);
-			SetDlgItemText(hDlgWnd, IDC_DAD_STATIC, ts.UIMsg);
 			
 			// checkbox
 			CheckRadioButton(hDlgWnd, IDC_SCP_RADIO, IDC_PASTE_RADIO,
@@ -2148,13 +2169,14 @@
 				EnableWindow(GetDlgItem(hDlgWnd, IDC_NEWLINE_RADIO), FALSE);
 			}
 
-			// Adapt same process
-			GetDlgItemText(hDlgWnd, IDC_ADAPT_SAME_CHECK, uimsg, sizeof(uimsg));
-			char b[MAX_UIMSG];
-			_snprintf_s(b, sizeof(b), _TRUNCATE, uimsg, Param->RemaingFileCount);
-			SetDlgItemText(hDlgWnd, IDC_ADAPT_SAME_CHECK, b);
+			// Do this for the next %d conflicts
+			char orgmsg[MAX_UIMSG];
+			GetDlgItemText(hDlgWnd, IDC_SAME_PROCESS_CHECK, orgmsg, sizeof(orgmsg));
+			char uimsg[MAX_UIMSG];
+			_snprintf_s(uimsg, sizeof(uimsg), _TRUNCATE, orgmsg, Param->RemaingFileCount - 1);
+			SetDlgItemText(hDlgWnd, IDC_SAME_PROCESS_CHECK, uimsg);
 			if (Param->RemaingFileCount < 2) {
-				EnableWindow(GetDlgItem(hDlgWnd, IDC_ADAPT_SAME_CHECK), FALSE);
+				EnableWindow(GetDlgItem(hDlgWnd, IDC_SAME_PROCESS_CHECK), FALSE);
 			}
 
 			// Dont Show Dialog
@@ -2194,6 +2216,17 @@
 			{	// radio buttons double click
 				wID = IDOK;
 			}
+			if (wCMD == EN_SETFOCUS && wID == IDC_SCP_PATH) {
+				CheckRadioButton(hDlgWnd, IDC_SCP_RADIO, IDC_PASTE_RADIO, IDC_SCP_RADIO);
+			}
+			if (wID == IDC_BINARY_CHECK) {
+				CheckRadioButton(hDlgWnd, IDC_SCP_RADIO, IDC_PASTE_RADIO, IDC_SENDFILE_RADIO);
+			}
+			if (wID == IDC_ESCAPE_CHECK ||
+				wID == IDC_SPACE_RADIO || wID == IDC_NEWLINE_RADIO)
+			{
+				CheckRadioButton(hDlgWnd, IDC_SCP_RADIO, IDC_PASTE_RADIO, IDC_PASTE_RADIO);
+			}
 			if (wID == IDOK) {
 				if (IsDlgButtonChecked(hDlgWnd, IDC_SCP_RADIO) == BST_CHECKED) {
 					// SCP
@@ -2217,12 +2250,12 @@
 						(IsDlgButtonChecked(hDlgWnd, IDC_NEWLINE_RADIO) == BST_CHECKED) ?
 						DROP_TYPE_PASTE_NEWLINE : 0;
 				}
-				DlgData->Param->AdaptSameProcess = 
-					(IsDlgButtonChecked(hDlgWnd, IDC_ADAPT_SAME_CHECK) == BST_CHECKED) ?
-					true : false;
-				DlgData->Param->DoSameProcess =
+				DlgData->Param->DoSameProcess = 
 					(IsDlgButtonChecked(hDlgWnd, IDC_SAME_PROCESS_CHECK) == BST_CHECKED) ?
 					true : false;
+				DlgData->Param->DoSameProcessNextDrop =
+					(IsDlgButtonChecked(hDlgWnd, IDC_SAME_PROCESS_NEXTDROP_CHECK) == BST_CHECKED) ?
+					true : false;
 				DlgData->Param->DoNotShowDialog = 
 					(IsDlgButtonChecked(hDlgWnd, IDC_DONTSHOW_CHECK) == BST_CHECKED) ?
 					true : false;
@@ -2256,8 +2289,8 @@
 	bool EnableSendFile,
 	bool EnableDoNotShowDialog,
 	unsigned char *DropTypePaste,
-	bool *AdaptSameProcess,
 	bool *DoSameProcess,
+	bool *DoSameProcessNextDrop,
 	bool *DoNotShowDialog)
 {
 	struct DrapDropDlgParam Param;
@@ -2280,8 +2313,8 @@
 		return DROP_TYPE_CANCEL;
 	}
 	*DropTypePaste = Param.DropTypePaste;
-	*AdaptSameProcess = Param.AdaptSameProcess;
 	*DoSameProcess = Param.DoSameProcess;
+	*DoSameProcessNextDrop = Param.DoSameProcessNextDrop;
 	*DoNotShowDialog = Param.DoNotShowDialog;
 	return Param.DropType;
 }
@@ -2404,7 +2437,7 @@
 		}
 	}
 
-	bool AdapatSameProcess = false;
+	bool DoSameProcess = false;
 	const bool isSSH = (cv.isSSH == 2);
 	enum drop_type DropType;
 	unsigned char DropTypePaste = DROP_TYPE_PASTE_ESCAPE;
@@ -2418,17 +2451,17 @@
 					} else {
 						DropType = DROP_TYPE_SEND_FILE;
 					}
-					AdapatSameProcess = false;
+					DoSameProcess = false;
 				} else {
 					DropType = DROP_TYPE_SEND_FILE;
-					AdapatSameProcess = DefaultShowDialog ? false : true;
+					DoSameProcess = DefaultShowDialog ? false : true;
 				}
 			} else if (FileCount == 0 && DirectoryCount == 1) {
 				DropType = DROP_TYPE_PASTE_FILENAME;
-				AdapatSameProcess = DefaultShowDialog ? false : true;
+				DoSameProcess = DefaultShowDialog ? false : true;
 			} else if (FileCount > 0 && DirectoryCount > 0) {
 				DropType = DROP_TYPE_PASTE_FILENAME;
-				AdapatSameProcess = false;
+				DoSameProcess = false;
 			} else if (FileCount > 0 && DirectoryCount == 0) {
 				// filename only
 				if (isSSH) {
@@ -2436,11 +2469,11 @@
 				} else {
 					DropType = DROP_TYPE_SEND_FILE;
 				}
-				AdapatSameProcess = false;
+				DoSameProcess = false;
 			} else {
 				// directory only
 				DropType = DROP_TYPE_PASTE_FILENAME;
-				AdapatSameProcess = ts.ConfirmFileDragAndDrop ? false : true;
+				DoSameProcess = ts.ConfirmFileDragAndDrop ? false : true;
 			}
 		} else {
 			// show dialog
@@ -2453,7 +2486,7 @@
 					DropType = DROP_TYPE_SEND_FILE;
 				}
 			}
-			AdapatSameProcess = false;
+			DoSameProcess = false;
 		}
 	} else {
 		if (DirectoryCount > 0 &&
@@ -2463,11 +2496,11 @@
 		{	// \x83f\x83t\x83H\x83\x8B\x83g\x82???ł?\x88\x97\x9D\x82ł\xAB\x82?\xA2\x91g\x82?\x87\x82?
 			DropType = DROP_TYPE_PASTE_FILENAME;
 			DropTypePaste = DefaultDropTypePaste;
-			AdapatSameProcess = false;
+			DoSameProcess = false;
 		} else {
 			DropType = DefaultDropType;
 			DropTypePaste = DefaultDropTypePaste;
-			AdapatSameProcess = (ShowDialog || DefaultShowDialog) ? false : true;
+			DoSameProcess = (ShowDialog || DefaultShowDialog) ? false : true;
 		}
 	}
 
@@ -2474,8 +2507,8 @@
 	for (int i = 0; i < DropListCount; i++) {
 		const char *FileName = DropLists[i];
 
-		if (!AdapatSameProcess) {
-			bool DoSameProcess;
+		if (!DoSameProcess) {
+			bool DoSameProcessNextDrop;
 			bool DoNotShowDialog = !DefaultShowDialog;
 			DropType =
 				ShowDropDialogBox(hInst, HVTWin,
@@ -2485,13 +2518,13 @@
 								  DirectoryCount == 0 ? true : false,
 								  ts.ConfirmFileDragAndDrop ? false : true,
 								  &DropTypePaste,
-								  &AdapatSameProcess,
 								  &DoSameProcess,
+								  &DoSameProcessNextDrop,
 								  &DoNotShowDialog);
 			if (DropType == DROP_TYPE_CANCEL) {
 				goto finish;
 			}
-			if (DoSameProcess) {
+			if (DoSameProcessNextDrop) {
 				DefaultDropType = DropType;
 				DefaultDropTypePaste = DropTypePaste;
 			}
@@ -2543,7 +2576,7 @@
 		{
 			// send by scp
 			char **FileNames = &DropLists[i];
-			int FileCount = AdapatSameProcess ? DropListCount - i : 1;
+			int FileCount = DoSameProcess ? DropListCount - i : 1;
 			if (!SendScp(FileNames, FileCount, ts.ScpSendDir)) {
 				goto finish;
 			}

From scmnotify ＠ osdn.net  Sat Jun 30 00:29:02 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 30 Jun 2018 00:29:02 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzcxNDJdICB0cnVua+OBrnI3MTQw44G+44Gn?=
 =?utf-8?b?44Oe44O844K4?=
Message-ID: <1530286142.004627.140481.nullmailer@users.osdn.me>

Revision: 7142
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7142
Author:   zmatsuo
Date:     2018-06-30 00:29:01 +0900 (Sat, 30 Jun 2018)
Log Message:
-----------
trunkのr7140までマージ

Modified Paths:
--------------
    branches/drag_and_drop/doc/en/html/about/history.html
    branches/drag_and_drop/doc/en/html/menu/setup-additional.html
    branches/drag_and_drop/doc/en/html/usage/mouse.html
    branches/drag_and_drop/doc/ja/html/about/history.html
    branches/drag_and_drop/doc/ja/html/menu/setup-additional.html
    branches/drag_and_drop/doc/ja/html/usage/mouse.html
    branches/drag_and_drop/installer/release/lang/English.lng
    branches/drag_and_drop/installer/release/lang/French.lng
    branches/drag_and_drop/installer/release/lang/German.lng
    branches/drag_and_drop/installer/release/lang/Japanese.lng
    branches/drag_and_drop/installer/release/lang/Korean.lng
    branches/drag_and_drop/installer/release/lang/Russian.lng
    branches/drag_and_drop/installer/release/lang/Simplified Chinese.lng
    branches/drag_and_drop/installer/release/lang/Traditional Chinese.lng
    branches/drag_and_drop/teraterm/common/tt_res.h
    branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj
    branches/drag_and_drop/teraterm/svnrev/svnrev.v15.vcxproj
    branches/drag_and_drop/teraterm/teraterm/addsetting.cpp
    branches/drag_and_drop/teraterm/teraterm/clipboar.c
    branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
    branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj
    branches/drag_and_drop/teraterm/teraterm/vtterm.c
    branches/drag_and_drop/teraterm/teraterm/vtterm.h
    branches/drag_and_drop/teraterm/teraterm/vtwin.cpp
    branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj.filters
    branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj
    branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj.filters
    branches/drag_and_drop/ttssh2/ttxssh/crypt.c

Property Changed:
----------------
    branches/drag_and_drop/
    branches/drag_and_drop/teraterm/

-------------- next part --------------
Index: branches/drag_and_drop
===================================================================
--- branches/drag_and_drop	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop	2018-06-29 15:29:01 UTC (rev 7142)

Property changes on: branches/drag_and_drop
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/ssh_ed25519:5495-5544
 /branches/vs2015_warn:6194-6285
-/tags/teraterm-4_89:6182
\ No newline at end of property
+/tags/teraterm-4_89:6182
+/trunk:7131-7140
\ No newline at end of property
Modified: branches/drag_and_drop/doc/en/html/about/history.html
===================================================================
--- branches/drag_and_drop/doc/en/html/about/history.html	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/doc/en/html/about/history.html	2018-06-29 15:29:01 UTC (rev 7142)
@@ -33,6 +33,13 @@
 
 <h3><a name="teraterm_4.100">2018.08.xx (Ver 4.100)</a></h3>
 <ul class="history">
+  <li>Changes
+    <ul>
+      <li>added the <a href="../setup/teraterm-win.html#title">Title format configuration</a> on the General tab of the <a href="../menu/setup-additional.html#TitleFormat">Additional settings dialog</a>.</li>
+      <li>Window size is maximized when the titlie bar is double-clicked if <a href="../menu/setup-terminal.html#TermIsWin">"Term size = win size"</a> setting is on.</li>
+    </ul>
+  </li>
+
   <li>Misc
     <ul>
       <li>upgraded TTSSH to <a href="#ttssh_2.86">2.86</a>.</li>

Modified: branches/drag_and_drop/doc/en/html/menu/setup-additional.html
===================================================================
--- branches/drag_and_drop/doc/en/html/menu/setup-additional.html	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/doc/en/html/menu/setup-additional.html	2018-06-29 15:29:01 UTC (rev 7142)
@@ -56,6 +56,28 @@
 	When this setting is enabled, whole fonts can be selected on the <a href="setup-font.html">Font setting dialog</a>.
       </dd>
 
+      <dt id="TitleFormat">Title format</dt>
+      <dd>Configures the window title format.
+        <dl>
+          <dt>Display host/port name</dt>
+          <dd>Displays hostname or serial port name</dd>
+
+          <dt>Display session number</dt>
+          <dd>Displays session number</dt>
+
+          <dt>Display VT/TEK</dt>
+          <dd>Displays VT or TEK</dt>
+
+          <dt>Swap hostname and title position</dt>
+          <dd>Swaps the hostname and <a href="setup-window.html#Title">title text</a>, displays hostname first.</dd>
+
+          <dt>Display tcp port number</dt>
+          <dd>Displays tcp port number (TCP/IP connection only)</dd>
+
+          <dt>Display serial port speed</dt>
+          <dd>Displays speed of serial port (serial connection only)</dd>
+        </dl>
+      </dd>
     </dl>
 
 

Modified: branches/drag_and_drop/doc/en/html/usage/mouse.html
===================================================================
--- branches/drag_and_drop/doc/en/html/usage/mouse.html	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/doc/en/html/usage/mouse.html	2018-06-29 15:29:01 UTC (rev 7142)
@@ -40,8 +40,16 @@
     It is effective when <a href="../menu/setup-additional.html">DisableMouseRButtonPaste</a> is disabled.</dd>
 
 <dt>Double clicking the left button on the title bar</dt>
-<dd>If the window size (real screen size) is not equal to the terminal size (logical size of the terminal), resizes the window to the terminal size. A further double clicking restores the original window size.</dd>
+<dd>
+  <dl>The behaviour is changed according to the <a href="../menu/setup-terminal.html#TermIsWin">"Term size = win size"</a> setting.
+    <dt>On</dt>
+    <dd>Maximize window. If the window is already maximized, restore to the original size.</dd>
 
+    <dt>Off</dt>
+    <dd>If the window size (real screen size) is not equal to the terminal size (logical size of the terminal), resizes the window to the terminal size. A further double clicking restores the original window size.</dd>
+  </dl>
+</dd>
+
 <dt>Clicking the left button while pressing the Ctrl key</dt>
 <dd>If the menu bar is hidden, the pop-up menu appears. To hide the menu bar, check the Hide menu bar option in the [Setup] Window dialog box.</dd>
 

Modified: branches/drag_and_drop/doc/ja/html/about/history.html
===================================================================
--- branches/drag_and_drop/doc/ja/html/about/history.html	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/doc/ja/html/about/history.html	2018-06-29 15:29:01 UTC (rev 7142)
@@ -31,8 +31,15 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
-<h3><a name="teraterm_4.99">2018.05.31 (Ver 4.99)</a></h3>
+<h3><a name="teraterm_4.100">2018.08.xx (Ver 4.100)</a></h3>
 <ul class="history">
+  <li>\x95ύX
+    <ul>
+      <li><a href="../menu/setup-additional.html#TitleFormat">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC General \x83^\x83u\x82\xC9<a href="../setup/teraterm-win.html#title">\x83^\x83C\x83g\x83\x8B\x8C`\x8E\xAE\x82??\xE8</a>\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B</li>
+      <li><a href="../menu/setup-terminal.html#TermIsWin">Term size = win size</a> \x90?肪 on \x82??\x82?A\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB5\x82\xBD\x8E\x9E\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8Dő?\x82\xB7\x82\xE9\x82悤\x82?ύX\x82\xB5\x82\xBD\x81B</a>
+    </ul>
+  </li>
+
   <li>\x82\xBB\x82?\xBC
     <ul>
       <li><a href="#ttssh_2.86">TTSSH(2.86)</a>\x82?\xB7\x82\xB5\x91?\xA6\x82\xBD\x81B</li>

Modified: branches/drag_and_drop/doc/ja/html/menu/setup-additional.html
===================================================================
--- branches/drag_and_drop/doc/ja/html/menu/setup-additional.html	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/doc/ja/html/menu/setup-additional.html	2018-06-29 15:29:01 UTC (rev 7142)
@@ -55,6 +55,28 @@
 	Windows 7\x88?~\x82??e\x83t\x83H\x83\x93\x83g\x82\xF0\x83t\x83H\x83\x93\x83g\x88?\x82?\\x8E\xA6\x82\xB7\x82?\x94\xF1\x95\\x8E\xA6\x82?\xB7\x82?\x82\xF0\x90??\x82\xE9\x8B@\x94\\x82\xAA\x92?\xC1\x82\xB3\x82\xEA\x82?\xB5\x82\xBD\x81BTera Term \x82?\xB1\x82??\xE8\x82\xF0\x97L\x8C\xF8\x82?\xB7\x82\xE9\x82?AOS\x91\xA4\x82Ŕ\xF1\x95\\x8E\xA6\x82???\x82?\x83t\x83H\x83\x93\x83g\x82\xE0<a href="setup-font.html">\x83t\x83H\x83\x93\x83g\x90?\xE8\x83_\x83C\x83A\x83\x8D\x83O</a>\x82őI\x91\xF0\x82ł\xAB\x82\xE9\x82悤\x82??\xE8\x82?\xB7\x81B
       </dd>
 
+      <dt id="TitleFormat">Title format</dt>
+      <dd>\x83E\x83B\x83\x93\x83h\x83E\x83^\x83C\x83g\x83\x8B\x82?`\x8E\xAE\x82\xF0\x90??\x82?\xB7\x81B
+        <dl>
+          <dt>Display host/port name</dt>
+          <dd>\x83z\x83X\x83g\x96\xBC\x82?\xBD\x82?V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x96\xBC\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Display session number</dt>
+          <dd>\x83Z\x83b\x83V\x83\x87\x83\x93\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Display VT/TEK</dt>
+          <dd>VT\x82?\xBD\x82\xCDTEK\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Swap hostname and title position</dt>
+          <dd>\x83z\x83X\x83g\x96\xBC\x82\xC6<a href="setup-window.html#Title">\x83^\x83C\x83g\x83\x8B\x83e\x83L\x83X\x83g</a>\x82??u\x82\xF0\x93\xFC\x82?\x82\xA6\x81A\x83z\x83X\x83g\x96\xBC\x82\xF0\x90\xE6\x82?\\x8E\xA6\x82\xB5\x82?\xB7</dd>
+
+          <dt>Display tcp port number</dt>
+          <dd>TCP \x83|\x81[\x83g\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7 (TCP/IP \x90?\xB1\x8E\x9E\x82?\xDD)</dd>
+
+          <dt>Display serial port speed</dt>
+          <dd>\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82?X\x83s\x81[\x83h\x82\xF0\x95\\x8E\xA6\x82\xB5\x82?\xB7 (\x83V\x83\x8A\x83A\x83\x8B\x90?\xB1\x8E\x9E\x82?\xDD)</dd>
+        </dl>
+      </dd>
     </dl>
 
 

Modified: branches/drag_and_drop/doc/ja/html/usage/mouse.html
===================================================================
--- branches/drag_and_drop/doc/ja/html/usage/mouse.html	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/doc/ja/html/usage/mouse.html	2018-06-29 15:29:01 UTC (rev 7142)
@@ -40,8 +40,16 @@
     <a href="../menu/setup-additional.html">DisableMouseRButtonPaste</a> \x82\xAA\x96\xB3\x8C\xF8\x82??\xAB\x82?\xAE\x8D?\x82\xE9\x81B</dd>
 
 <dt>\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82?\xE3\x82ō\xB6\x83{\x83^\x83\x93\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N</dt>
-<dd>\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83E\x83C\x83\x93\x83h\x83E\x82?\xC0\x8D???\x82\xB3)\x82\xAA\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x82?_\x97\x9D\x93I\x82?\xE6\x96???\x82\xB3)\x82???\xE9\x82?\xAB\x81A\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?\xAF\x82\xB6\x82??\xE9\x82悤\x82?ύX\x82\xB5\x82?\xB7\x81B\x82\xBB\x82?\xE3\x81A\x82\xE0\x82\xA4\x88\xEA\x93x\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB7\x82\xE9\x82?A\x82\xE0\x82??E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82??\xE8\x82?\xB7\x81B</dd>
+<dd><a href="../menu/setup-terminal.html#TermIsWin">Term size = win size</a>\x82??\xE8\x82?\xE6\x82\xC1\x82ē\xAE\x8D?\x95ς\xED\x82\xE8\x82?\xB7\x81B
+  <dl>
+    <dt>on\x82?\x9E</dt>
+    <dd>\x83E\x83B\x83\x93\x83h\x83E\x82?T\x83C\x83Y\x82\xF0\x8Dő?\x82\xB5\x82?\xB7\x81B\x8A\xF9\x82?ő?\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F?\x82?A\x82\xE0\x82??T\x83C\x83Y\x82??\xB5\x82?\xB7\x81B</dd>
 
+    <dt>off\x82?\x9E</dt>
+    <dd>\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83E\x83C\x83\x93\x83h\x83E\x82?\xC0\x8D???\x82\xB3)\x82\xAA\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x82?_\x97\x9D\x93I\x82?\xE6\x96???\x82\xB3)\x82???\xE9\x82?\xAB\x81A\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?\xAF\x82\xB6\x82??\xE9\x82悤\x82?ύX\x82\xB5\x82?\xB7\x81B\x82\xBB\x82?\xE3\x81A\x82\xE0\x82\xA4\x88\xEA\x93x\x83^\x83C\x83g\x83\x8B\x83o\x81[\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB7\x82\xE9\x82?A\x82\xE0\x82??E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82??\xE8\x82?\xB7\x81B</dd>
+  </dl>
+</dd>
+
 <dt>Ctrl \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82?\xAA\x82?\x83{\x83^\x83\x93\x82\xF0\x83N\x83\x8A\x83b\x83N</dt>
 <dd>\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x82\xAA\x82?\xAF\x82\xEA\x82?A\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x82\xAA\x8C\xBB\x82\xEA\x82?\xB7\x81B\x83\x81\x83j\x83\x85\x81[\x83o\x81[\x82\xF0\x89B\x82\xB7\x82??A<A HREF="../menu/setup-window.html">[Setup] Window</A> \x82\xC5 Hide menu bar \x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B</dd>
 

Modified: branches/drag_and_drop/installer/release/lang/English.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/English.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/English.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -184,6 +184,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed

Modified: branches/drag_and_drop/installer/release/lang/French.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/French.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/French.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (French language) by Francois MOCQ (2010-07-21)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=Effacer l'\xE9cran quand la fen\xEAtre est redimensionn\xE9e
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accepter les \xE9v\xE9nement souris
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=Accepter les \xE9v\xE9nement souris quand CTRL est appuy\xE9

Modified: branches/drag_and_drop/installer/release/lang/German.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/German.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/German.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (German language) by Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&Clear display when window resized
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=Change cursor shape with &IME state
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=Accept &mouse event tracking request
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&Disable mouse event tracking when Control is pressed

Modified: branches/drag_and_drop/installer/release/lang/Japanese.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/Japanese.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/Japanese.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 
 [Tera Term]
 DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -186,6 +186,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95ύX\x8E\x9E\x82?\\x8E\xA6\x93\xE0\x97e\x82\xF0\x83N\x83\x8A\x83A\x82\xB7\x82\xE9(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=&IME\x82?\xF3\x91??\xE6\x82\xC1\x82ăJ\x81[\x83\\x83\x8B\x8C`\x8F\xF3\x82\xF0\x95ύX\x82\xB7\x82\xE9
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=OS\x82Ŕ\xF1\x95\\x8E\xA6\x82?t\x83H\x83\x93\x83g\x82\xE0\x83t\x83H\x83\x93\x83g\x83_\x83C\x83A\x83\x8D\x83O\x82??\x82?\\x8E\xA6\x82\xB7\x82\xE9(&H)
+DLG_TAB_GENERAL_TITLEFMT_GROUP=\x83^\x83C\x83g\x83\x8B\x8C`\x8E\xAE
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=\x83z\x83X\x83g/\x83|\x81[\x83g\x96\xBC\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&D)
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=\x83Z\x83b\x83V\x83\x87\x83\x93\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&N)
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=&VT/TEK \x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=\x83^\x83C\x83g\x83\x8B\x82?z\x83X\x83g\x96\xBC\x82??\x82\xF0\x93\xFC\x82?\x82\xA6\x82\xE9(&T)
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=TCP \x83|\x81[\x83g\x94?\x86\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&P)
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82?X\x83s\x81[\x83h\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9(&R)
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\x83}\x83E\x83X\x83C\x83x\x83\x93\x83g\x92?m\x97v\x8B\x81\x82\xF0\x8E?\xFC\x82\xEA\x82\xE9(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=Control\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ă\xA2\x82\xE9\x8A??}\x83E\x83X\x83C\x83x\x83\x93\x83g\x82\xF0\x92?m\x82\xB5\x82?\xA2(&D)

Modified: branches/drag_and_drop/installer/release/lang/Korean.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/Korean.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/Korean.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (Korean language) by Daehong Kim (2013-07-25)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=â ũ\xB1? \xC0?\xC1\xA4\xB5\xC9 \xB6\xA7 ?\xB8\xE9 \xBA\xF1\xBF\xEC\xB1\xE2(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=IME\xBB\xF3\xC5¿\xA1 \xB5\xFB\xB6\xF3 Ŀ\xBC\xAD \xB8\xF0\xBE\xE7 \xBA\xAF\xB0\xE6(&I)
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xB8\xB6\xBF? \xC0?\xA5? \xC3\xDFô \xBF\xE4û\xC0\xBB \xB9?\xC0\xB4?\xD9(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=\xC4\xC1?\xB7\xD1\xC0\xCC \xB4\xAD\xB7\xC8\xC0\xBB \xB6\xA7 \xB8\xB6\xBF? \xC0?\xA5? \xC3\xDF\xC0\xFB \xBA\xF1?\xBC\xBA?(&D)

Modified: branches/drag_and_drop/installer/release/lang/Russian.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/Russian.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/Russian.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (Russian language) by Ryumik Sergey (2017-07-19)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=&\xCE\xF7\xE8\xF1\xF2\xE8\xF2\xFC \xFD\xEA\xF0\xE0\xED \xEF\xF0\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE8 \xF0\xE0\xE7\xEC\xE5\xF0\xE0 \xEE\xEA\xED\xE0
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=&\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xE2\xE8\xE4 \xEA\xF3\xF0\xF1\xEE\xF0\xE0 \xE2 \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE8 \xF1 \xF0\xE5\xE6\xE8\xEC\xEE\xEC IME
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xCF\xF0\xE8\xED\xFF\xF2\xFC \xE7\xE0\xEF\xF0\xEE\xF1 \xED\xE0 \xEE\xF2\xF1\xEB\xE5\xE6\xE8\xE2\xE0\xED\xE8\xE5 \xF1\xEE\xE1\xFB\xF2\xE8\xE9 \xEC\xFB\xF8\xE8
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=&\xCE\xF2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xEE\xF2\xF1\xEB\xE5\xE6\xE8\xE2\xE0\xED\xE8\xE5 \xF1\xEE\xE1\xFB\xF2\xE8\xE9 \xEC\xFB\xF8\xE8

Modified: branches/drag_and_drop/installer/release/lang/Simplified Chinese.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/Simplified Chinese.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/Simplified Chinese.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-14)
 ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\xB8ı?\xBF?\xF3С?\xC7\xE5\xBF\xD5\xC6\xC1Ļ(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=\xB8\xF9\xBE\xDD\xCA\xE4\xC8???\xB8ı\xE4\xB9\xE2\xB1\xEA\xD0\xCE?(&I)
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xBD\xD3\xCA\xDC\xCA\xF3\xB1\xEA\xCA?\xFE\xB8\xFA\xD7\xD9\xC7\xEB\xC7\xF3(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=\xB0\xB4\xCF\xC2 Ctrl \xBC\xFC?\xA3\xAC\xBD\xFB\xD3\xC3\xCA\xF3\xB1\xEA\xCA?\xFE\xB8\xFA\xD7\xD9(&D)

Modified: branches/drag_and_drop/installer/release/lang/Traditional Chinese.lng
===================================================================
--- branches/drag_and_drop/installer/release/lang/Traditional Chinese.lng	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/installer/release/lang/Traditional Chinese.lng	2018-06-29 15:29:01 UTC (rev 7142)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2018-05-17)
+; Updated by TeraTerm Project (2018-06-13)
 ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
 
 [Tera Term]
@@ -185,6 +185,13 @@
 DLG_TAB_GENERAL_CLEAR_ON_RESIZE=\xA7\xEF\xC5?\xF8\xB5\xA1\xA4j\xA4p\xAE?M\xAA?ù\xF5(&C)
 DLG_TAB_GENERAL_CURSOR_CHANGE_IME=\xAE??\xE9\xA4J\xAAk\xAA\xAC\xBAA\xA7\xEF\xC5?\xE5\xBCЧΪ\xAC(&I)
 DLG_TAB_GENERAL_LIST_HIDDEN_FONTS=List &hidden fonts in font dialog
+DLG_TAB_GENERAL_TITLEFMT_GROUP=Title format
+DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME=&Display host/port name
+DLG_TAB_GENERAL_TITLEFMT_DISPSESSION=Display session &number
+DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK=Display &VT/TEK
+DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE=Swap hostname and &title position
+DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT=Display tcp &port number
+DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED=Display se&rial port speed
 
 DLG_TAB_SEQUENCE_ACCEPT_MOUSE_EVENT_TRACKING=\xB1\xB5\xA8\xFC\xB7?\xAB\xA8?\xF3\xB8\xF2\xC2?ШD(&M)
 DLG_TAB_SEQUENCE_DISABLE_MOUSE_TRACKING_CTRL=\xAB\xF6\xA4U Ctrl \xC1\xE4\xAE?A\xB8T\xA5η?\xAB\xA8?\xF3\xB8\xF2\xC2\xDC(&D)

Index: branches/drag_and_drop/teraterm
===================================================================
--- branches/drag_and_drop/teraterm	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm	2018-06-29 15:29:01 UTC (rev 7142)

Property changes on: branches/drag_and_drop/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
-/branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
+/branches/vs2015_warn/teraterm:6194-6285
+/trunk/teraterm:7131-7140
\ No newline at end of property
Modified: branches/drag_and_drop/teraterm/common/tt_res.h
===================================================================
--- branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/common/tt_res.h	2018-06-29 15:29:01 UTC (rev 7142)
@@ -213,20 +213,27 @@
 #define IDC_NORMALIZE_LINEBREAK         2565
 #define IDC_CLIPBOARD_NOTIFY            2566
 #define IDC_LIST_HIDDEN_FONTS           2567
-#define IDC_BINARY_CHECK                2568
-#define IDC_SAME_PROCESS_CHECK          2569
-#define IDC_FILENAME_EDIT               2570
-#define IDC_SCP_RADIO                   2571
-#define IDC_SENDFILE_RADIO              2572
-#define IDC_PASTE_RADIO                 2573
-#define IDC_ESCAPE_CHECK                2574
-#define IDC_SCP_PATH_LABEL              2575
-#define IDC_SCP_PATH_NOTE               2576
-#define IDC_SPACE_RADIO                 2577
-#define IDC_NEWLINE_RADIO               2578
-#define IDC_DAD_NOTE                    2579
-#define IDC_SAME_PROCESS_NEXTDROP_CHECK 2580
-#define IDC_DONTSHOW_CHECK              2581
+#define IDC_TITLEFMT_GROUP              2568
+#define IDC_TITLEFMT_DISPHOSTNAME       2569
+#define IDC_TITLEFMT_DISPSESSION        2570
+#define IDC_TITLEFMT_DISPVTTEK          2571
+#define IDC_TITLEFMT_SWAPHOSTTITLE      2572
+#define IDC_TITLEFMT_DISPTCPPORT        2573
+#define IDC_TITLEFMT_DISPSERIALSPEED    2574
+#define IDC_FILENAME_EDIT               2575
+#define IDC_SCP_RADIO                   2576
+#define IDC_SENDFILE_RADIO              2577
+#define IDC_PASTE_RADIO                 2578
+#define IDC_SCP_PATH_LABEL              2579
+#define IDC_SCP_PATH_NOTE               2580
+#define IDC_BINARY_CHECK                2581
+#define IDC_ESCAPE_CHECK                2582
+#define IDC_SPACE_RADIO                 2583
+#define IDC_NEWLINE_RADIO               2584
+#define IDC_SAME_PROCESS_CHECK          2585
+#define IDC_SAME_PROCESS_NEXTDROP_CHECK 2586
+#define IDC_DONTSHOW_CHECK              2587
+#define IDC_DAD_NOTE                    2588
 #define ID_ACC_SENDBREAK                50001
 #define ID_ACC_COPY                     50002
 #define ID_ACC_NEWCONNECTION            50003
@@ -324,7 +331,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        126
 #define _APS_NEXT_COMMAND_VALUE         52031
-#define _APS_NEXT_CONTROL_VALUE         2582
+#define _APS_NEXT_CONTROL_VALUE         2589
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -14,7 +14,7 @@
     <ProjectGuid>{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}</ProjectGuid>
     <RootNamespace>keycode</RootNamespace>
     <ProjectName>keycode</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -133,4 +133,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/svnrev/svnrev.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/svnrev/svnrev.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/svnrev/svnrev.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -15,7 +15,7 @@
     <RootNamespace>svnrev</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>svnrev</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

Modified: branches/drag_and_drop/teraterm/teraterm/addsetting.cpp
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/addsetting.cpp	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/teraterm/addsetting.cpp	2018-06-29 15:29:01 UTC (rev 7142)
@@ -120,6 +120,13 @@
 		SendDlgItemMessage(IDC_CLEAR_ON_RESIZE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_CURSOR_CHANGE_IME, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 		SendDlgItemMessage(IDC_LIST_HIDDEN_FONTS, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_GROUP, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPHOSTNAME, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPSESSION, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPVTTEK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_SWAPHOSTTITLE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPTCPPORT, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
+		SendDlgItemMessage(IDC_TITLEFMT_DISPSERIALSPEED, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
 	}
 	else {
 		DlgGeneralFont = NULL;
@@ -150,6 +157,28 @@
 	get_lang_msg("DLG_TAB_GENERAL_LIST_HIDDEN_FONTS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	SetDlgItemText(IDC_LIST_HIDDEN_FONTS, ts.UIMsg);
 
+	GetDlgItemText(IDC_TITLEFMT_GROUP, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_GROUP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_GROUP, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPHOSTNAME, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPHOSTNAME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPHOSTNAME, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPSESSION, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPSESSION", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPSESSION, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPVTTEK, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPVTTEK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPVTTEK, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_SWAPHOSTTITLE, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_SWAPHOSTTITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_SWAPHOSTTITLE, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPTCPPORT, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPTCPPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPTCPPORT, ts.UIMsg);
+	GetDlgItemText(IDC_TITLEFMT_DISPSERIALSPEED, uimsg, sizeof(uimsg));
+	get_lang_msg("DLG_TAB_GENERAL_TITLEFMT_DISPSERIALSPEED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	SetDlgItemText(IDC_TITLEFMT_DISPSERIALSPEED, ts.UIMsg);
+
 	// (1)DisableAcceleratorSendBreak
 	btn = (CButton *)GetDlgItem(IDC_DISABLE_SENDBREAK);
 	btn->SetCheck(ts.DisableAcceleratorSendBreak);
@@ -182,6 +211,25 @@
 	btn = (CButton *)GetDlgItem(IDC_LIST_HIDDEN_FONTS);
 	btn->SetCheck(ts.ListHiddenFonts);
 
+	// (9) Title Format
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPHOSTNAME);
+	btn->SetCheck((ts.TitleFormat & 1) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSESSION);
+	btn->SetCheck((ts.TitleFormat & (1<<1)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPVTTEK);
+	btn->SetCheck((ts.TitleFormat & (1<<2)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_SWAPHOSTTITLE);
+	btn->SetCheck((ts.TitleFormat & (1<<3)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPTCPPORT);
+	btn->SetCheck((ts.TitleFormat & (1<<4)) != 0);
+
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSERIALSPEED);
+	btn->SetCheck((ts.TitleFormat & (1<<5)) != 0);
+
 	// \x83_\x83C\x83A\x83\x8D\x83O\x82?t\x83H\x81[\x83J\x83X\x82?Ă\xE9 (2004.12.7 yutaka)
 	::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_CLICKABLE_URL));
 
@@ -231,6 +279,20 @@
 	// (8)IDC_LIST_HIDDEN_FONTS
 	btn = (CButton *)GetDlgItem(IDC_LIST_HIDDEN_FONTS);
 	ts.ListHiddenFonts = btn->GetCheck();
+
+	// (9) Title Format
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPHOSTNAME);
+	ts.TitleFormat = (btn->GetCheck() == BST_CHECKED);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSESSION);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 1);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPVTTEK);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 2);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_SWAPHOSTTITLE);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 3);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPTCPPORT);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 4);
+	btn = (CButton *)GetDlgItem(IDC_TITLEFMT_DISPSERIALSPEED);
+	ts.TitleFormat |= ((btn->GetCheck() == BST_CHECKED) << 5);
 }
 
 

Modified: branches/drag_and_drop/teraterm/teraterm/clipboar.c
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/clipboar.c	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/teraterm/clipboar.c	2018-06-29 15:29:01 UTC (rev 7142)
@@ -31,6 +31,7 @@
 #include "teraterm.h"
 #include "tttypes.h"
 #include "vtdisp.h"
+#include "vtterm.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -372,12 +373,8 @@
 	}
 }
 
-#define BracketStartLen	(sizeof(BracketStart)-1)
-#define BracketEndLen	(sizeof(BracketEnd)-1)
 void CBStartPaste(HWND HWin, BOOL AddCR, BOOL Bracketed)
 {
-	static char BracketStart[] = "\033[200~";
-	static char BracketEnd[] = "\033[201~";
 	UINT Cf;
 	PCHAR TmpPtr;
 	LPWSTR TmpPtrW;

Modified: branches/drag_and_drop/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/teraterm/ttermpro.rc	2018-06-29 15:29:01 UTC (rev 7142)
@@ -82,6 +82,19 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10
     CONTROL         "List &hidden fonts in font dialog",IDC_LIST_HIDDEN_FONTS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,220,10
+    GROUPBOX        "Title format",IDC_TITLEFMT_GROUP,5,130,250,55
+    CONTROL         "&Display host/port name",IDC_TITLEFMT_DISPHOSTNAME,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,140,108,10
+    CONTROL         "Display session &number",IDC_TITLEFMT_DISPSESSION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,155,108,10
+    CONTROL         "Display &VT/TEK",IDC_TITLEFMT_DISPVTTEK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,170,108,10
+    CONTROL         "Swap hostname and &title position",IDC_TITLEFMT_SWAPHOSTTITLE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,140,130,10
+    CONTROL         "Display tcp &port number",IDC_TITLEFMT_DISPTCPPORT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,155,130,10
+    CONTROL         "Display se&rial port speed",IDC_TITLEFMT_DISPSERIALSPEED,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,170,130,10
 END
 
 IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 258, 188

Modified: branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -15,7 +15,7 @@
     <RootNamespace>ttermpro</RootNamespace>
     <Keyword>MFCProj</Keyword>
     <ProjectName>ttermpro</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -219,4 +219,4 @@
       <UserProperties RESOURCE_FILE="ttermpro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/teraterm/vtterm.c
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtterm.c	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/teraterm/vtterm.c	2018-06-29 15:29:01 UTC (rev 7142)
@@ -98,8 +98,13 @@
 static BOOL AltScr;
 static BOOL LRMarginMode;
 static BOOL RectangleMode;
-BOOL BracketedPaste;
+static BOOL BracketedPaste;
 
+char BracketStart[] = "\033[200~";
+char BracketEnd[] = "\033[201~";
+int BracketStartLen = (sizeof(BracketStart)-1);
+int BracketEndLen = (sizeof(BracketEnd)-1);
+
 static int VTlevel;
 
 BOOL AcceptWheelToCursor;
@@ -6104,3 +6109,33 @@
 		Send8BitMode = ts.Send8BitCtrl;
 	}
 }
+
+void TermPasteString(char *str, int len)
+{
+	TermSendStartBracket();
+	CommTextOut(&cv, str, len);
+	if (ts.LocalEcho) {
+		CommTextEcho(&cv, str, len);
+	}
+	TermSendEndBracket();
+
+	return;
+}
+
+void TermSendStartBracket()
+{
+	if (BracketedPaste) {
+		CommBinaryOut(&cv, BracketStart, BracketStartLen);
+	}
+
+	return;
+}
+
+void TermSendEndBracket()
+{
+	if (BracketedPaste) {
+		CommBinaryOut(&cv, BracketEnd, BracketEndLen);
+	}
+
+	return;
+}

Modified: branches/drag_and_drop/teraterm/teraterm/vtterm.h
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtterm.h	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/teraterm/vtterm.h	2018-06-29 15:29:01 UTC (rev 7142)
@@ -46,7 +46,15 @@
 BOOL WheelToCursorMode();
 void EndTerm();
 void ChangeTerminalID();
+void TermPasteString(char *str, int len);
+void TermSendStartBracket(void);
+void TermSendEndBracket(void);
 
 #ifdef __cplusplus
 }
 #endif
+
+extern int BracketStartLen;
+extern int BracketEndLen;
+extern char BracketStart[];
+extern char BracketEnd[];

Modified: branches/drag_and_drop/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-29 15:29:01 UTC (rev 7142)
@@ -2899,7 +2899,7 @@
 
 void CVTWindow::OnNcLButtonDblClk(UINT nHitTest, CPoint point)
 {
-	if (! Minimized && (nHitTest == HTCAPTION)) {
+	if (! Minimized && !ts.TermIsWin && (nHitTest == HTCAPTION)) {
 		DispRestoreWinSize();
 	}
 	else {

Modified: branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -14,7 +14,7 @@
     <ProjectGuid>{118E0D32-5553-4F73-9927-E873C1C500E4}</ProjectGuid>
     <RootNamespace>ttpcmn</RootNamespace>
     <ProjectName>ttpcmn</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -152,4 +152,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -14,7 +14,7 @@
     <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
     <RootNamespace>ttpdlg</RootNamespace>
     <ProjectName>ttpdlg</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -167,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -14,7 +14,7 @@
     <ProjectGuid>{311F2B21-AEC4-4384-8209-BB83B54749B4}</ProjectGuid>
     <RootNamespace>ttpfile</RootNamespace>
     <ProjectName>ttpfile</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -166,4 +166,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -15,7 +15,7 @@
     <RootNamespace>ttpmacro</RootNamespace>
     <Keyword>MFCProj</Keyword>
     <ProjectName>ttpmacro</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -191,4 +191,4 @@
       <UserProperties RESOURCE_FILE="ttpmacro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -14,7 +14,7 @@
     <ProjectGuid>{5CF58947-E861-4A5C-B0B1-E85486F149CD}</ProjectGuid>
     <RootNamespace>ttpset</RootNamespace>
     <ProjectName>ttpset</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -153,4 +153,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj.filters
===================================================================
--- branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj.filters	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj.filters	2018-06-29 15:29:01 UTC (rev 7142)
@@ -50,10 +50,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc">
-      <Filter>Resource File</Filter>
+      <Filter>Source Files</Filter>
     </ResourceCompile>
     <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
+      <Filter>Source Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj	2018-06-29 15:29:01 UTC (rev 7142)
@@ -14,7 +14,7 @@
     <ProjectGuid>{6D08053B-1C68-4A7E-8766-3553F5AF010B}</ProjectGuid>
     <RootNamespace>ttptek</RootNamespace>
     <ProjectName>ttptek</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -149,4 +149,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj.filters
===================================================================
--- branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj.filters	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj.filters	2018-06-29 15:29:01 UTC (rev 7142)
@@ -43,11 +43,11 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResouceCompile Include="ttptek-version.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
+    <ResourceCompile Include="ttptek-version.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="ttptek.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: branches/drag_and_drop/ttssh2/ttxssh/crypt.c
===================================================================
--- branches/drag_and_drop/ttssh2/ttxssh/crypt.c	2018-06-28 14:24:07 UTC (rev 7141)
+++ branches/drag_and_drop/ttssh2/ttxssh/crypt.c	2018-06-29 15:29:01 UTC (rev 7142)
@@ -72,6 +72,8 @@
 
 #define CMP(a,b) memcmp(a, b, SSH_BLOCKSIZE)
 
+static unsigned char *encbuff = NULL;
+static unsigned int encbufflen = 0;
 
 static char *get_cipher_name(int cipher);
 
@@ -200,7 +202,7 @@
 
 BOOL CRYPT_encrypt_aead(PTInstVar pvar, unsigned char *data, unsigned int bytes, unsigned int aadlen, unsigned int authlen)
 {
-	unsigned char *newbuf = NULL;
+	unsigned char *newbuff = NULL;
 	unsigned int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
 	unsigned char lastiv[1];
 	char tmp[80];
@@ -218,8 +220,12 @@
 		return FALSE;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		goto err;
+	if (bytes > encbufflen) {
+		if ((newbuff = realloc(encbuff, bytes)) == NULL)
+			goto err;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
 	if (!EVP_CIPHER_CTX_ctrl(evp, EVP_CTRL_GCM_IV_GEN, 1, lastiv))
 		goto err;
@@ -227,10 +233,10 @@
 	if (aadlen && !EVP_Cipher(evp, NULL, data, aadlen) < 0)
 		goto err;
 
-	if (EVP_Cipher(evp, newbuf, data+aadlen, bytes) < 0)
+	if (EVP_Cipher(evp, encbuff, data+aadlen, bytes) < 0)
 		goto err;
 
-	memcpy(data+aadlen, newbuf, bytes);
+	memcpy(data+aadlen, encbuff, bytes);
 
 	if (EVP_Cipher(evp, NULL, NULL, 0) < 0)
 		goto err;
@@ -238,13 +244,9 @@
 	if (!EVP_CIPHER_CTX_ctrl(evp, EVP_CTRL_GCM_GET_TAG, authlen, data+aadlen+bytes))
 		goto err;
 
-	free(newbuf);
-
 	return TRUE;
 
 err:
-	free(newbuf);
-
 	UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 	            get_cipher_name(pvar->crypt_state.sender_cipher));
@@ -254,7 +256,7 @@
 
 BOOL CRYPT_decrypt_aead(PTInstVar pvar, unsigned char *data, unsigned int bytes, unsigned int aadlen, unsigned int authlen)
 {
-	unsigned char *newbuf = NULL;
+	unsigned char *newbuff = NULL;
 	unsigned int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
 	unsigned char lastiv[1];
 	char tmp[80];
@@ -272,8 +274,12 @@
 		return FALSE;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		goto err;
+	if (bytes > encbufflen) {
+		if ((newbuff = realloc(encbuff, bytes)) == NULL)
+			goto err;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
 	if (!EVP_CIPHER_CTX_ctrl(evp, EVP_CTRL_GCM_IV_GEN, 1, lastiv))
 		goto err;
@@ -284,11 +290,10 @@
 	if (aadlen && !EVP_Cipher(evp, NULL, data, aadlen) < 0)
 		goto err;
 
-	if (EVP_Cipher(evp, newbuf, data+aadlen, bytes) < 0)
+	if (EVP_Cipher(evp, encbuff, data+aadlen, bytes) < 0)
 		goto err;
 
-	memcpy(data+aadlen, newbuf, bytes);
-	free(newbuf);
+	memcpy(data+aadlen, encbuff, bytes);
 
 	if (EVP_Cipher(evp, NULL, NULL, 0) < 0)
 		return FALSE;
@@ -296,8 +301,6 @@
 		return TRUE;
 
 err:
-	free(newbuf);
-
 	UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 	            get_cipher_name(pvar->crypt_state.receiver_cipher));
@@ -311,7 +314,7 @@
 
 static void crypt_SSH2_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	unsigned char *newbuf;
+	unsigned char *newbuff;
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
 	char tmp[80];
 
@@ -328,24 +331,26 @@
 		return;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		return;
+	if (bytes > encbufflen) {
+		if ((newbuff = realloc(encbuff, bytes)) == NULL)
+			return;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
-	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], newbuf, buf, bytes) == 0) {
+	if (EVP_Cipher(&pvar->evpcip[MODE_OUT], encbuff, buf, bytes) == 0) {
 		UTIL_get_lang_msg("MSG_ENCRYPT_ERROR2", pvar, "%s encrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            get_cipher_name(pvar->crypt_state.sender_cipher));
 		notify_fatal_error(pvar, tmp, TRUE);
 	} else {
-		memcpy(buf, newbuf, bytes);
+		memcpy(buf, encbuff, bytes);
 	}
-
-	free(newbuf);
 }
 
 static void crypt_SSH2_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	unsigned char *newbuf;
+	unsigned char *newbuff;
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
 	char tmp[80];
 
@@ -362,19 +367,21 @@
 		return;
 	}
 
-	if ((newbuf = malloc(bytes)) == NULL)
-		return;
+	if (bytes > encbufflen) {
+		if ((newbuff = malloc(bytes)) == NULL)
+			return;
+		encbuff = newbuff;
+		encbufflen = bytes;
+	}
 
-	if (EVP_Cipher(&pvar->evpcip[MODE_IN], newbuf, buf, bytes) == 0) {
+	if (EVP_Cipher(&pvar->evpcip[MODE_IN], encbuff, buf, bytes) == 0) {
 		UTIL_get_lang_msg("MSG_DECRYPT_ERROR2", pvar, "%s decrypt error(2)");
 		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, pvar->ts->UIMsg,
 		            get_cipher_name(pvar->crypt_state.receiver_cipher));
 		notify_fatal_error(pvar, tmp, TRUE);
 	} else {
-		memcpy(buf, newbuf, bytes);
+		memcpy(buf, encbuff, bytes);
 	}
-
-	free(newbuf);
 }
 
 static void c3DES_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
@@ -1307,6 +1314,10 @@
 
 void CRYPT_end(PTInstVar pvar)
 {
+	free(encbuff);
+	encbuff = NULL;
+	encbufflen = 0;
+
 	destroy_public_key(&pvar->crypt_state.host_key);
 	destroy_public_key(&pvar->crypt_state.server_key);
 

From scmnotify ＠ osdn.net  Sat Jun 30 00:52:53 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 30 Jun 2018 00:52:53 +0900
Subject: [Ttssh2-commit] [7143] Support Bracketed Paste Mode when Drag And
	Drop Paste filename
Message-ID: <1530287573.972285.73896.nullmailer@users.osdn.me>

Revision: 7143
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7143
Author:   zmatsuo
Date:     2018-06-30 00:52:53 +0900 (Sat, 30 Jun 2018)
Log Message:
-----------
Support Bracketed Paste Mode when Drag And Drop Paste filename

Modified Paths:
--------------
    branches/drag_and_drop/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: branches/drag_and_drop/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-29 15:29:01 UTC (rev 7142)
+++ branches/drag_and_drop/teraterm/teraterm/vtwin.cpp	2018-06-29 15:52:53 UTC (rev 7143)
@@ -2565,6 +2565,9 @@
 		case DROP_TYPE_PASTE_FILENAME:
 		{
 			const bool escape = (DropTypePaste & DROP_TYPE_PASTE_ESCAPE) ? true : false;
+			if (!BracketedPasteMode()) {
+				TermSendStartBracket();
+			}
 			PasteString(&cv, FileName, escape);
 			if (DropListCount > 1 && i < DropListCount - 1) {
 				const char *separator = (DropTypePaste & DROP_TYPE_PASTE_NEWLINE) ? "\n" : " ";
@@ -2587,6 +2590,9 @@
 	}
 
 finish:
+	if (BracketedPasteMode()) {
+		TermSendEndBracket();
+	}
 	DropListFree();
 	return 0;
 }

From scmnotify ＠ osdn.net  Sat Jun 30 00:54:17 2018
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 30 Jun 2018 00:54:17 +0900
Subject: [Ttssh2-commit] [7144] Enable Multi Processor Compilation on VS2017
Message-ID: <1530287657.445752.76056.nullmailer@users.osdn.me>

Revision: 7144
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7144
Author:   zmatsuo
Date:     2018-06-30 00:54:17 +0900 (Sat, 30 Jun 2018)
Log Message:
-----------
Enable Multi Processor Compilation on VS2017

Modified Paths:
--------------
    branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj
    branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj
    branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj

-------------- next part --------------
Modified: branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/keycode/keycode.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -68,6 +68,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -99,6 +100,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

Modified: branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/teraterm/ttermpro.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -73,6 +73,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -114,6 +115,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -71,6 +71,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -109,6 +110,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/ttpdlg/ttpdlg.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -74,6 +74,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -113,6 +114,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/ttpfile/ttpfile.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -71,6 +71,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -107,6 +108,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -73,6 +73,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -109,6 +110,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/ttpset/ttpset.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -71,6 +71,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -109,6 +110,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj
===================================================================
--- branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj	2018-06-29 15:52:53 UTC (rev 7143)
+++ branches/drag_and_drop/teraterm/ttptek/ttptek.v15.vcxproj	2018-06-29 15:54:17 UTC (rev 7144)
@@ -69,6 +69,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -107,6 +108,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>