svnno****@sourc*****
svnno****@sourc*****
2009年 4月 6日 (月) 23:28:21 JST
Tera TermRevision: 3282
http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3282
Author: maya
Date: 2009-04-06 23:28:21 +0900 (Mon, 06 Apr 2009)
Log Message:
-----------
Duplicate session ã®ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã‚ーを無効ã«ã™ã‚‹ DisableAcceleratorDuplicateSession ã‚’è¿½åŠ ã—ãŸã€‚
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/setup/teraterm-misc.html
trunk/doc/en/html/setup/teraterm.html
trunk/doc/jp/html/about/history.html
trunk/doc/jp/html/setup/teraterm-misc.html
trunk/doc/jp/html/setup/teraterm.html
trunk/installer/release/TERATERM.INI
trunk/installer/teraterm.iss
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/doc/en/html/about/history.html 2009-04-06 14:28:21 UTC (rev 3282)
@@ -46,6 +46,10 @@
<ul>
<li>added <a href="../setup/teraterm-misc.html#ClearScreenOnCloseConnection">ClearScreenOnCloseConnection</a> in teraterm.ini file. The default is off.</li>
</ul></li>
+ <li>added new optional setting that can disable accelerator key of Duplicate session.
+ <ul>
+ <li>added <a href="../setup/teraterm-misc.html#DisableAcceleratorSendBreak">DisableAcceleratorDuplicateSession</a> entry to teraterm.ini. The default is off.</li>
+ </ul></li>
</ul></li>
<li>Misc
Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/doc/en/html/setup/teraterm-misc.html 2009-04-06 14:28:21 UTC (rev 3282)
@@ -168,5 +168,21 @@
</pre>
+<h1><a name="DisableAcceleratorDuplicateSession">Disable accelerator key of Duplicate session</a></h1>
+
+<p>
+In order to disable accelerator key of "Duplicate session", change the DisableAcceleratorDuplicateSession line at [Tera Term] section of the setup file like the following:
+</p>
+
+<pre>
+DisableAcceleratorDuplicateSession=on
+</pre>
+
+<pre>
+Default:
+DisableAcceleratorDuplicateSession=off
+</pre>
+
+
</BODY>
</HTML>
Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/doc/en/html/setup/teraterm.html 2009-04-06 14:28:21 UTC (rev 3282)
@@ -116,6 +116,7 @@
<li><a href="teraterm-misc.html#DisablePasteMouseMButton">Enable paste by clicking the middle button of mouse</a></li>
<li><a href="teraterm-misc.html#DisableAcceleratorMenu">Disable "Send break" menu</a></li>
<li><a href="teraterm-misc.html#ClearScreenOnCloseConnection"><!--Ø’fŽž‚ɉæ–Ê‚ðƒNƒŠƒA‚·‚é--></a></li>
+ <li><a href="teraterm-misc.html#DisableAcceleratorDuplicateSession">Disable accelerator key of Duplicate session</a></li>
</ul>
</body>
Modified: trunk/doc/jp/html/about/history.html
===================================================================
--- trunk/doc/jp/html/about/history.html 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/doc/jp/html/about/history.html 2009-04-06 14:28:21 UTC (rev 3282)
@@ -46,6 +46,10 @@
<ul>
<li>teraterm.ini ‚É <a href="../setup/teraterm-misc.html#ClearScreenOnCloseConnection">ClearScreenOnCloseConnectionu</a> ƒGƒ“ƒgƒŠ‚ð’ljÁ‚µ‚½BƒfƒtƒHƒ‹ƒg‚Í offB</li>
</ul></li>
+ <li>Duplicate session ‚̃AƒNƒZƒ‰ƒŒ[ƒ^ƒL[‚𖳌ø‚É‚Å‚«‚é‚悤‚É‚µ‚½B
+ <ul>
+ <li>teraterm.ini ‚É <a href="../setup/teraterm-misc.html#DisableAcceleratorSendBreak">DisableAcceleratorSendBreak</a> ƒGƒ“ƒgƒŠ‚ð’ljÁ‚µ‚½BƒfƒtƒHƒ‹ƒg‚Í offB</li>
+ </ul></li>
</ul></li>
<li>‚»‚Ì‘¼
Modified: trunk/doc/jp/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/jp/html/setup/teraterm-misc.html 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/doc/jp/html/setup/teraterm-misc.html 2009-04-06 14:28:21 UTC (rev 3282)
@@ -195,5 +195,21 @@
</pre>
+<h1><a name="DisableAcceleratorDuplicateSession">Duplicate session ‚̃AƒNƒZƒ‰ƒŒ[ƒ^ƒL[‚𖳌ø‚É‚·‚é</a></h1>
+
+<p>
+Duplicate session ‚̃AƒNƒZƒ‰ƒŒ[ƒ^ƒL[‚𖳌ø‚É‚·‚é‚É‚ÍAÝ’èƒtƒ@ƒCƒ‹‚Ì [Tera Term] ƒZƒNƒVƒ‡ƒ“‚Ì DisableAcceleratorDuplicateSession s‚ðˆÈ‰º‚̂悤‚É•ÏX‚µ‚Ä‚‚¾‚³‚¢B
+</p>
+
+<pre>
+DisableAcceleratorDuplicateSession=on
+</pre>
+
+<pre>
+È—ªŽž:
+DisableAcceleratorDuplicateSession=off
+</pre>
+
+
</BODY>
</HTML>
Modified: trunk/doc/jp/html/setup/teraterm.html
===================================================================
--- trunk/doc/jp/html/setup/teraterm.html 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/doc/jp/html/setup/teraterm.html 2009-04-06 14:28:21 UTC (rev 3282)
@@ -120,6 +120,7 @@
<li><a href="teraterm-misc.html#DisablePasteMouseMButton">ƒ}ƒEƒX‚Ì’†ƒ{ƒ^ƒ“‚É‚æ‚é“\‚è•t‚¯‚ð—LŒø‚É‚·‚é</a></li>
<li><a href="teraterm-misc.html#DisableAcceleratorMenu">ƒƒjƒ…[‚Ì Send break ‚𖳌ø‚É‚·‚é</a></li>
<li><a href="teraterm-misc.html#ClearScreenOnCloseConnection">Ø’fŽž‚ɉæ–Ê‚ðƒNƒŠƒA‚·‚é</a></li>
+ <li><a href="teraterm-misc.html#DisableAcceleratorDuplicateSession">Duplicate session ‚̃AƒNƒZƒ‰ƒŒ[ƒ^ƒL[‚𖳌ø‚É‚·‚é</a></li>
</ul>
</body>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/installer/release/TERATERM.INI 2009-04-06 14:28:21 UTC (rev 3282)
@@ -60,6 +60,9 @@
; Starting the selection only by a left button.
SelectOnlyByLButton=on
+; Duplicate session by Alt-D Accelerator key disabled
+DisableAcceleratorDuplicateSession=off
+
; Send break by Alt-B Accelerator key disabled
DisableAcceleratorSendBreak=off
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/installer/teraterm.iss 2009-04-06 14:28:21 UTC (rev 3282)
@@ -141,6 +141,8 @@
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\cyglaunch; Filename: {app}\cyglaunch.exe; WorkingDir: {app}; IconFilename: {app}\cyglaunch.exe; Components: cygterm; Tasks: quickcyglaunch; IconIndex: 0; Flags: createonlyiffileexists
[INI]
+Filename: {app}\teraterm.ini; Section: Tera Term; Key: DisableAcceleratorDuplicateSession; String: off; Flags: createkeyifdoesntexist; Components: TeraTerm
+Filename: {userdocs}\teraterm.ini; Section: Tera Term; Key: DisableAcceleratorDuplicateSession; String: off; Flags: createkeyifdoesntexist; Check: isUserIniExists; Components: TeraTerm
Filename: {app}\teraterm.ini; Section: Tera Term; Key: ClearScreenOnCloseConnection; String: off; Flags: createkeyifdoesntexist; Components: TeraTerm
Filename: {userdocs}\teraterm.ini; Section: Tera Term; Key: ClearScreenOnCloseConnection; String: off; Flags: createkeyifdoesntexist; Check: isUserIniExists; Components: TeraTerm
Filename: {app}\teraterm.ini; Section: Tera Term; Key: DisableAcceleratorMenu; String: off; Flags: createkeyifdoesntexist; Components: TeraTerm
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/teraterm/common/tttypes.h 2009-04-06 14:28:21 UTC (rev 3282)
@@ -452,6 +452,7 @@
WORD Wait4allMacroCommand;
WORD DisableAcceleratorMenu;
WORD ClearScreenOnCloseConnection;
+ WORD DisableAcceleratorDuplicateSession;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -889,6 +890,7 @@
* added tttset.Wait4allMacroCommand.
* added tttset.DisableAcceleratorMenu.
* added tttset.ClearScreenOnCloseConnection.
+ * added tttset.DisableAcceleratorDuplicateSession.
*
* - At version 4.62, ttset_memfilemap was replaced with ttset_memfilemap_10.
* added tttset.DisableMouseTrackingByCtrl.
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/teraterm/teraterm/vtwin.cpp 2009-04-06 14:28:21 UTC (rev 3282)
@@ -1542,6 +1542,11 @@
case ID_ACC_DISCONNECT:
OnFileDisconnect();
return TRUE;
+ case ID_FILE_DUPLICATESESSION:
+ // added DisableAcceleratorDuplicateSession (2009.4.6 maya)
+ if (!ts.DisableAcceleratorDuplicateSession)
+ OnControlSendBreak();
+ return TRUE;
}
if (ActiveWin==IdVT) {
switch (wID) {
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2009-04-06 13:35:35 UTC (rev 3281)
+++ trunk/teraterm/ttpset/ttset.c 2009-04-06 14:28:21 UTC (rev 3282)
@@ -1254,6 +1254,10 @@
// added DisableAcceleratorMenu (2009.4.6 maya)
ts->DisableAcceleratorMenu =
GetOnOff(Section, "DisableAcceleratorMenu", FName, FALSE);
+
+ // added DisableAcceleratorMenu (2009.4.6 maya)
+ ts->DisableAcceleratorDuplicateSession =
+ GetOnOff(Section, "DisableAcceleratorDuplicateSession", FName, FALSE);
}
void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2164,6 +2168,10 @@
// ClearScreenOnCloseConnection
WriteOnOff(Section, "ClearScreenOnCloseConnection", FName,
ts->ClearScreenOnCloseConnection);
+
+ // DisableAcceleratorDuplicateSession
+ WriteOnOff(Section, "DisableAcceleratorDuplicateSession", FName,
+ ts->DisableAcceleratorDuplicateSession);
}
#define VTEditor "VT editor keypad"