svnno****@sourc*****
svnno****@sourc*****
2009年 6月 15日 (月) 00:12:00 JST
Tera TermRevision: 3479
http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3479
Author: maya
Date: 2009-06-15 00:12:00 +0900 (Mon, 15 Jun 2009)
Log Message:
-----------
ウィンドウ制御シーケンス・カーソル形状制御シーケンス㮠on/off ãƒ•ãƒ©ã‚°ã‚’è¿½åŠ ã—ãŸã€‚
è¨å®šã®èªã¿æ›¸ãã¨ãƒ‰ã‚ュメントã®ã¿è¿½åŠ 。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/setup/teraterm-win.html
trunk/doc/en/html/setup/teraterm.html
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/setup/teraterm-win.html
trunk/doc/ja/html/setup/teraterm.html
trunk/installer/release/TERATERM.INI
trunk/installer/teraterm.iss
trunk/teraterm/common/tttypes.h
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/doc/en/html/about/history.html 2009-06-14 15:12:00 UTC (rev 3479)
@@ -30,14 +30,10 @@
<ul>
<li>added the Wait4allMacroCommand entry in the teraterm.ini file. The default is off. Turn on the value to enable the `wait4all' macro command.</li>
<li>added a Subversion(SVN) revision number on the version dialog.</li>
- <li>added support for DECSCUSR (Set Cursor Style), WYSTCURM (Wyse Steady Cursor Mode), WYULCURM (Wyse Underline Cursor Mode) and AT&T 610 cursor blinking control sequences.<br>
- Add the below configuration in the ~/.vimrc file for vim editor.
- <pre>
- set t_SI=^[[3\ q
- set t_EI=^[[1\ q
- NOTE: Input ^[ by using Control-V Control-[.
- </pre>
- </li>
+ <li>added support for cursor control sequences.
+ <ul>
+ <li>added the <a href="../setup/teraterm-win.html#CursorCtrlSequence">CursorCtrlSequence</a> entry in the teraterm.ini file. The default is off.</li>
+ </ul></li>
<li>added configuring the delay time per a carriage return when a user pastes multiple lines. The default is 10 msec.
<ul>
<li>A user can change the setup value on the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
@@ -54,7 +50,10 @@
<ul>
<li>added the <a href="../setup/teraterm-misc.html#DisableAcceleratorSendBreak">DisableAcceleratorDuplicateSession</a> entry in the teraterm.ini file. The default is off.</li>
</ul></li>
- <li>added support for the position moving, the minimization, the maximization, the most front, the most back and the refresh control sequences regarding the dtterm window operation.</li>
+ <li>added support for the control sequences for window operation.
+ <ul>
+ <li>added the <a href="../setup/teraterm-win.html#WindowCtrlSequence">WindowCtrlSequence</a> entry in the teraterm.ini file. The default is off.</li>
+ </ul></li>
<li>Changed the BroadcastCommand functional specification. When the BroadcastCommand is not the realtime mode, a user cand send a message at the selected window in the listbox.</li>
<li>added the millisecond at the log timestamp line.</li>
<li>changed Korean language implementation
Modified: trunk/doc/en/html/setup/teraterm-win.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-win.html 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/doc/en/html/setup/teraterm-win.html 2009-06-14 15:12:00 UTC (rev 3479)
@@ -546,5 +546,46 @@
</pre>
+<!--h1><a name="WindowCtrlSequence">ƒEƒBƒ“ƒhƒE§Œä‚̃V[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></h1>
+<p>
+added support for the position moving, the minimization, the maximization, the most front, the most back and the refresh control sequences regarding the dtterm window operation.
+‚±‚Ìݒ肪 on ‚É‚È‚Á‚Ä‚¢‚é‚ÆAdtterm‚̃EƒBƒ“ƒhƒE‘€ì§ŒäƒV[ƒPƒ“ƒX‚Ì“àAˆÊ’uˆÚ“®, Ŭ‰», ő剻, Å‘O–Ê, Å”w–Ê, ƒŠƒtƒŒƒbƒVƒ…, ƒEƒBƒ“ƒhƒEƒTƒCƒY•ÏX(ƒsƒNƒZƒ‹’PˆÊ), ƒEƒBƒ“ƒhƒEó‘Ô•ñ, ƒEƒBƒ“ƒhƒEˆÊ’u•ñ, ƒ‹[ƒgƒEƒBƒ“ƒhƒEƒTƒCƒY•ñ ‚ª—LŒø‚É‚È‚è‚Ü‚·B
+</p>
+
+<pre>
+WindowCtrlSequence=on
+</pre>
+
+<pre>
+Default:
+WindowCtrlSequence=off
+</pre>
+
+
+<h1><a name="CursorCtrlSequence">ƒJ[ƒ\ƒ‹Œ`ó‚ð§Œä‚·‚éƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></h1>
+<p>
+‚±‚Ìݒ肪 on ‚É‚È‚Á‚Ä‚¢‚é‚ÆADECSCUSR(ƒJ[ƒ\ƒ‹Œ`ó•ÏX), WYSTCURM(Wyse”ñ“_–ŃJ[ƒ\ƒ‹), WYULCURM(Wyse‰ºüƒJ[ƒ\ƒ‹), AT&T 610‚̃J[ƒ\ƒ‹“_–ŧŒäƒV[ƒPƒ“ƒX‚ɉž‚¶‚ÄAƒJ[ƒ\ƒ‹Œ`󂪕ÏX‚³‚ê‚Ü‚·B
+</p>
+
+<pre>
+CursorCtrlSequence=on
+</pre>
+
+<pre>
+Default:
+CursorCtrlSequence=off
+</pre>
+
+<p>
+Add the below configuration in the ~/.vimrc file for vim editor.
+</p>
+
+<pre>
+set t_SI=^[[3\ q
+set t_EI=^[[1\ q
+NOTE: Input ^[ by using Control-V Control-[.
+</pre-->
+
+
</body>
</html>
Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/doc/en/html/setup/teraterm.html 2009-06-14 15:12:00 UTC (rev 3479)
@@ -64,6 +64,8 @@
<li><a href="teraterm-win.html#killfocus">Display the cursor even if the window comes out of focus</a></li>
<li><a href="teraterm-win.html#savevtwinpos">Save the window position</a></li>
<li><a href="teraterm-win.html#WindowIcon">Change the window icon</a></li>
+ <!--li><a href="teraterm-win.html#WindowCtrlSequence">ƒEƒBƒ“ƒhƒE§Œä‚̃V[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li>
+ <li><a href="teraterm-win.html#CursorCtrlSequence">ƒJ[ƒ\ƒ‹Œ`ó‚ð§Œä‚·‚éƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li-->
</ul>
<h3>Communication</h3>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/doc/ja/html/about/history.html 2009-06-14 15:12:00 UTC (rev 3479)
@@ -30,14 +30,10 @@
<ul>
<li>teraterm.ini ‚É Wait4allMacroCommand ƒGƒ“ƒgƒŠ‚ð’ljÁ‚µ‚½BƒfƒtƒHƒ‹ƒg‚ÍoffBon‚É‚·‚é‚ÆA`wait4all'ƒ}ƒNƒƒRƒ}ƒ“ƒh‚ª—LŒø‚Æ‚È‚éB</li>
<li>ƒo[ƒWƒ‡ƒ“î•ñ‚ÉASubversion(SVN)‚̃ŠƒrƒWƒ‡ƒ“”Ô†‚ð•\Ž¦‚·‚é‚悤‚É‚µ‚½B</li>
- <li>DECSCUSR(ƒJ[ƒ\ƒ‹Œ`ó•ÏX), WYSTCURM(Wyse”ñ“_–ŃJ[ƒ\ƒ‹), WYULCURM(Wyse‰ºüƒJ[ƒ\ƒ‹), AT&T 610‚̃J[ƒ\ƒ‹“_–ŧŒäƒV[ƒPƒ“ƒX‚ɑΉž‚µ‚½B<br>
- vim‚Ìê‡A~/.vimrc ‚Ɉȉº‚̂悤‚ɒljÁ‚·‚éB
- <pre>
- set t_SI=^[[3\ q
- set t_EI=^[[1\ q
- ’: ^[ ‚ÍControl-V Control-[‚Å“ü—Í‚·‚é
- </pre>
- </li>
+ <li>ƒJ[ƒ\ƒ‹§ŒäƒV[ƒPƒ“ƒX‚ɑΉž‚µ‚½B
+ <ul>
+ <li>teraterm.ini ‚É <a href="../setup/teraterm-win.html#CursorCtrlSequence">CursorCtrlSequence</a> ƒGƒ“ƒgƒŠ‚ð’ljÁ‚µ‚½BƒfƒtƒHƒ‹ƒg‚Í offB</li>
+ </ul></li>
<li>•¡”s‚Ì“\‚è•t‚¯ŽžA‰üs‚²‚Æ‚É’x‰„‚·‚鎞ŠÔ‚ðÝ’è‚Å‚«‚é‚悤‚É‚µ‚½BƒfƒtƒHƒ‹ƒg‚Í 10(ƒ~ƒŠ•b)B
<ul>
<li><a href="../menu/setup-additional.html">Additional settings ƒ_ƒCƒAƒƒO</a>‚ÅÝ’è’l‚ð•ÏX‚Å‚«‚é‚悤‚É‚µ‚½B</li>
@@ -54,7 +50,10 @@
<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>
- <li>dtterm‚̃EƒBƒ“ƒhƒE‘€ì§ŒäƒV[ƒPƒ“ƒX‚Ì“àAˆÊ’uˆÚ“®, Ŭ‰», ő剻, Å‘O–Ê, Å”w–Ê, ƒŠƒtƒŒƒbƒVƒ…‚ɑΉž‚µ‚½B</li>
+ <li>ƒEƒBƒ“ƒhƒE‘€ì§ŒäƒV[ƒPƒ“ƒX‘Ήž‚µ‚½B
+ <ul>
+ <li>teraterm.ini ‚É <a href="../setup/teraterm-win.html#WindowCtrlSequence">WindowCtrlSequence</a> ƒGƒ“ƒgƒŠ‚ð’ljÁ‚µ‚½BƒfƒtƒHƒ‹ƒg‚Í offB</li>
+ </ul></li>
<li>BroadcastCommandi”ñRealtime modej‚É‚¨‚¢‚ÄAƒŠƒXƒgƒ{ƒbƒNƒX‚Å‘I‘ð‚³‚ê‚½’[––‚ɑ΂µ‚Ä‚Ì‚ÝAƒƒbƒZ[ƒW‚ð‘—M‚·‚é‚悤‚É‚µ‚½B</li>
<li>ƒƒO‚Ƀ^ƒCƒ€ƒXƒ^ƒ“ƒv‚ð‘‚«ž‚Þ‚Æ‚«‚Ƀ~ƒŠ•b‚à‹L˜^‚·‚é‚悤‚É‚µ‚½B</li>
<li>ŠØ‘Œêƒ‚[ƒh‚Ì’²®
Modified: trunk/doc/ja/html/setup/teraterm-win.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-win.html 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/doc/ja/html/setup/teraterm-win.html 2009-06-14 15:12:00 UTC (rev 3479)
@@ -562,5 +562,46 @@
TEKIcon=Default
</pre>
+
+<h1><a name="WindowCtrlSequence">ƒEƒBƒ“ƒhƒE§Œä‚̃V[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></h1>
+<p>
+‚±‚Ìݒ肪 on ‚É‚È‚Á‚Ä‚¢‚é‚ÆAdtterm‚̃EƒBƒ“ƒhƒE‘€ì§ŒäƒV[ƒPƒ“ƒX‚Ì“àAˆÊ’uˆÚ“®, Ŭ‰», ő剻, Å‘O–Ê, Å”w–Ê, ƒŠƒtƒŒƒbƒVƒ…, ƒEƒBƒ“ƒhƒEƒTƒCƒY•ÏX(ƒsƒNƒZƒ‹’PˆÊ), ƒEƒBƒ“ƒhƒEó‘Ô•ñ, ƒEƒBƒ“ƒhƒEˆÊ’u•ñ, ƒ‹[ƒgƒEƒBƒ“ƒhƒEƒTƒCƒY•ñ ‚ª—LŒø‚É‚È‚è‚Ü‚·B
+</p>
+
+<pre>
+WindowCtrlSequence=on
+</pre>
+
+<pre>
+È—ªŽž:
+WindowCtrlSequence=off
+</pre>
+
+
+<h1><a name="CursorCtrlSequence">ƒJ[ƒ\ƒ‹Œ`ó‚ð§Œä‚·‚éƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></h1>
+<p>
+‚±‚Ìݒ肪 on ‚É‚È‚Á‚Ä‚¢‚é‚ÆADECSCUSR(ƒJ[ƒ\ƒ‹Œ`ó•ÏX), WYSTCURM(Wyse”ñ“_–ŃJ[ƒ\ƒ‹), WYULCURM(Wyse‰ºüƒJ[ƒ\ƒ‹), AT&T 610‚̃J[ƒ\ƒ‹“_–ŧŒäƒV[ƒPƒ“ƒX‚ɉž‚¶‚ÄAƒJ[ƒ\ƒ‹Œ`󂪕ÏX‚³‚ê‚Ü‚·B
+</p>
+
+<pre>
+CursorCtrlSequence=on
+</pre>
+
+<pre>
+È—ªŽž:
+CursorCtrlSequence=off
+</pre>
+
+<p>
+vim‚Ìê‡A~/.vimrc ‚Ɉȉº‚̂悤‚ɒljÁ‚·‚éB
+</p>
+
+<pre>
+set t_SI=^[[3\ q
+set t_EI=^[[1\ q
+’: ^[ ‚ÍControl-V Control-[‚Å“ü—Í‚·‚é
+</pre>
+
+
</body>
</html>
Modified: trunk/doc/ja/html/setup/teraterm.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm.html 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/doc/ja/html/setup/teraterm.html 2009-06-14 15:12:00 UTC (rev 3479)
@@ -66,6 +66,8 @@
<li><a href="teraterm-win.html#killfocus">ƒtƒH[ƒJƒX‚ªŠO‚ꂽŽž‚É‚àƒJ[ƒ\ƒ‹‚ð•\Ž¦‚·‚é</a></li>
<li><a href="teraterm-win.html#savevtwinpos">ƒEƒBƒ“ƒhƒEˆÊ’u‚ð•Û‘¶‚·‚é</a></li>
<li><a href="teraterm-win.html#WindowIcon">ƒEƒBƒ“ƒhƒEƒAƒCƒRƒ“‚ð•ÏX‚·‚é</a></li>
+ <li><a href="teraterm-win.html#WindowCtrlSequence">ƒEƒBƒ“ƒhƒE§Œä‚̃V[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li>
+ <li><a href="teraterm-win.html#CursorCtrlSequence">ƒJ[ƒ\ƒ‹Œ`ó‚ð§Œä‚·‚éƒV[ƒPƒ“ƒX‚ðŽg—p‚·‚é</a></li>
</ul>
<h3>’ÊM</h3>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/installer/release/TERATERM.INI 2009-06-14 15:12:00 UTC (rev 3479)
@@ -351,6 +351,9 @@
; Confirm send a file when drag and drop
ConfirmFileDragAndDrop=on
+; allow the sequences related to cursor control
+CursorCtrlSequence=off
+
; Display all characters (debug mode)
Debug=off
@@ -525,6 +528,9 @@
; `wait4all' macro command
Wait4allMacroCommand=off
+; allow the sequences related to window control
+WindowCtrlSequence=off
+
; [Window] menu
WindowMenu=on
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/installer/teraterm.iss 2009-06-14 15:12:00 UTC (rev 3479)
@@ -141,6 +141,10 @@
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: CursorCtrlSequence; String: off; Flags: createkeyifdoesntexist; Components: TeraTerm
+Filename: {userdocs}\teraterm.ini; Section: Tera Term; Key: CursorCtrlSequence; String: off; Flags: createkeyifdoesntexist; Check: isUserIniExists; Components: TeraTerm
+Filename: {app}\teraterm.ini; Section: Tera Term; Key: WindowCtrlSequence; String: off; Flags: createkeyifdoesntexist; Components: TeraTerm
+Filename: {userdocs}\teraterm.ini; Section: Tera Term; Key: WindowCtrlSequence; String: off; Flags: createkeyifdoesntexist; Check: isUserIniExists; Components: TeraTerm
Filename: {app}\teraterm.ini; Section: Tera Term; Key: Meta8Bit; String: off; Flags: createkeyifdoesntexist; Components: TeraTerm
Filename: {userdocs}\teraterm.ini; Section: Tera Term; Key: Meta8Bit; String: off; Flags: createkeyifdoesntexist; Check: isUserIniExists; Components: TeraTerm
Filename: {app}\teraterm.ini; Section: Tera Term; Key: PasteDelayPerLine; String: 10; Flags: createkeyifdoesntexist; Components: TeraTerm
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/teraterm/common/tttypes.h 2009-06-14 15:12:00 UTC (rev 3479)
@@ -457,6 +457,8 @@
int PasteDelayPerLine;
WORD FontScaling;
WORD Meta8Bit;
+ WORD WindowCtrlSequence;
+ WORD CursorCtrlSequence;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -898,6 +900,8 @@
* added tttset.PasteDelayPerLine.
* added tttset.FontScaling.
* added tttset.Meta8Bit.
+ * added tttset.WindowCtrlSequence.
+ * added tttset.CursorCtrlSequence.
*
* - At version 4.62, ttset_memfilemap was replaced with ttset_memfilemap_10.
* added tttset.DisableMouseTrackingByCtrl.
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2009-06-13 10:36:57 UTC (rev 3478)
+++ trunk/teraterm/ttpset/ttset.c 2009-06-14 15:12:00 UTC (rev 3479)
@@ -1294,6 +1294,12 @@
// Meta sets MSB
ts->Meta8Bit = GetOnOff(Section, "Meta8Bit", FName, FALSE);
+
+ // Window control sequence
+ ts->WindowCtrlSequence = GetOnOff(Section, "WindowCtrlSequence", FName, FALSE);
+
+ // Cursor control sequence
+ ts->CursorCtrlSequence = GetOnOff(Section, "CursorCtrlSequence", FName, FALSE);
}
void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2242,6 +2248,12 @@
// Meta sets MSB
WriteOnOff(Section, "Meta8Bit", FName, ts->Meta8Bit);
+
+ // Window control sequence
+ WriteOnOff(Section, "WindowCtrlSequence", FName, ts->WindowCtrlSequence);
+
+ // Cursor control sequence
+ WriteOnOff(Section, "CursorCtrlSequence", FName, ts->CursorCtrlSequence);
}
#define VTEditor "VT editor keypad"