svnno****@sourc*****
svnno****@sourc*****
2009年 7月 6日 (月) 12:10:47 JST
Tera TermRevision: 3580
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3580
Author: doda
Date: 2009-07-06 12:10:47 +0900 (Mon, 06 Jul 2009)
Log Message:
-----------
・接続å‰ã«è¡Œã£ãŸãƒãƒ¼ã‚«ãƒ«ã‚¨ã‚³ãƒ¼ã‚„é€ä¿¡æ”¹è¡Œã‚³ãƒ¼ãƒ‰ã®è¨å®šãŒç„¡è¦–ã•ã‚Œã‚‹ã®ã‚’ä¿®æ£
・シリアル接続時ã€å‰ã®æŽ¥ç¶šã§é©ç”¨ã•ã‚ŒãŸTCPLocalEcho/TCPCRSendã®è¨å®šãŒãƒªã‚»ãƒƒãƒˆã•ã‚Œãªã„ã®ã‚’ä¿®æ£
https://sourceforge.jp/ticket/browse.php?group_id=1412&tid=17591
https://sourceforge.jp/ticket/browse.php?group_id=1412&tid=17593
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2009-07-06 02:56:52 UTC (rev 3579)
+++ trunk/doc/en/html/about/history.html 2009-07-06 03:10:47 UTC (rev 3580)
@@ -37,10 +37,12 @@
</ul>
</li-->
- <!--li>Bug fixes
+ <li>Bug fixes
<ul>
+ <!--li>Ú‘±‘O‚És‚Á‚½ƒ[ƒJƒ‹ƒGƒR[‚Æ‘—M‰üsƒR[ƒh‚Ìݒ肪–³Ž‹‚³‚ê‚鎖‚ª‚ ‚é‚Ì‚ðC³‚µ‚½B</li-->
+ <!--li>ƒVƒŠƒAƒ‹Ú‘±Žž‚ÉA‘O‚ÌÚ‘±‚ÅŽg‚í‚ꂽTCPLocalEcho/TCPCRSend‚Ìݒ肪ƒŠƒZƒbƒg‚³‚ê‚È‚¢‚Ì‚ðC³‚µ‚½B</li-->
</ul>
- </li-->
+ </li>
<li>Misc
<ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2009-07-06 02:56:52 UTC (rev 3579)
+++ trunk/doc/ja/html/about/history.html 2009-07-06 03:10:47 UTC (rev 3580)
@@ -34,16 +34,21 @@
<ul class="history">
<!--li>•ÏX
<ul>
- </ul></li-->
+ </ul>
+ </li-->
- <!--li>ƒoƒOC³
+ <li>ƒoƒOC³
<ul>
- </ul></li-->
+ <li>Ú‘±‘O‚És‚Á‚½ƒ[ƒJƒ‹ƒGƒR[‚Æ‘—M‰üsƒR[ƒh‚Ìݒ肪–³Ž‹‚³‚ê‚鎖‚ª‚ ‚é‚Ì‚ðC³‚µ‚½B</li>
+ <li>ƒVƒŠƒAƒ‹Ú‘±Žž‚ÉA‘O‚ÌÚ‘±‚ÅŽg‚í‚ꂽTCPLocalEcho/TCPCRSend‚Ìݒ肪ƒŠƒZƒbƒg‚³‚ê‚È‚¢‚Ì‚ðC³‚µ‚½B<li-->
+ </ul>
+ </li>
<li>‚»‚Ì‘¼
<ul>
<li><a href="#ttssh_2.52">SSH2‘ΉžTTSSH(2.52)</a>‚Ö·‚µ‘Ö‚¦‚½B</li>
- </ul></li>
+ </ul>
+ </li>
</ul>
<h3><a name="teraterm_4.63">2009.7.5 (Ver 4.63)</a></h3>
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2009-07-06 02:56:52 UTC (rev 3579)
+++ trunk/teraterm/teraterm/vtwin.cpp 2009-07-06 03:10:47 UTC (rev 3580)
@@ -78,6 +78,9 @@
static HFONT DlgBroadcastFont;
static HFONT DlgCommentFont;
+static BOOL TCPLocalEchoUsed = FALSE;
+static BOOL TCPCRSendUsed = FALSE;
+
// –{‘Ì‚Í addsetting.cpp
extern mouse_cursor_t MouseCursor[];
@@ -3086,6 +3089,17 @@
CommProcRRQ(&cv);
break;
case FD_CLOSE:
+ if (cv.PortType == IdTCPIP) {
+ if (TCPLocalEchoUsed) {
+ TCPLocalEchoUsed=FALSE;
+ ts.LocalEcho = ts.LocalEcho_ini;
+ }
+ if (TCPCRSendUsed) {
+ TCPCRSendUsed = FALSE;
+ ts.CRSend = ts.CRSend_ini;
+ cv.CRSend = ts.CRSend_ini;
+ }
+ }
Connecting = FALSE;
TCPIPClosed = TRUE;
// disable transmition
@@ -3155,29 +3169,16 @@
TelEnableHisOpt(BINARY);
}
- // ’¼‘O‚ÌÚ‘±‚ª”ñTelnetÚ‘±‚¾‚Á‚½ê‡AWindow ‚ð•Â‚¶‚Ä‚¢‚È‚¢‚Æݒ肪Žc‚Á‚Ä‚¢‚é
- // (LocalEcho, CRSend ‚ª TCPLocalEcho, TCPCRSend ‚Ì’l‚Åã‘‚«‚³‚ê‚Ä‚¢‚é)
- // Telnet ‚Ì‚Æ‚«‚É‚Í LocalEcho/CRSend ‚ðŒ³‚Ì’l‚É–ß‚·‚½‚ß‚ÉA
- // “Ç‚Ýž‚ÝŽž‚ÌÝ’è‚ðŽ‚Á‚Ä‚‚é (2008.4.22 maya)
- ts.CRSend = ts.CRSend_ini;
- cv.CRSend = ts.CRSend_ini;
- ts.LocalEcho = ts.LocalEcho_ini;
-
TelStartKeepAliveThread();
}
- // SSH, Cygwin ‚È‚Ç‚ÅÚ‘±‚·‚é‚Æ‚«‚É—˜—p‚³‚ê‚é
- else if (ts.DisableTCPEchoCR) {
- // ã‚Æ“¯‚¶——R‚ÅA“Ç‚Ýž‚ÝŽž‚ÌÝ’è‚ðŽ‚Á‚Ä‚‚é (2008.4.22 maya)
- ts.CRSend = ts.CRSend_ini;
- cv.CRSend = ts.CRSend_ini;
- ts.LocalEcho = ts.LocalEcho_ini;
- }
- else {
+ else if (!ts.DisableTCPEchoCR) {
if (ts.TCPCRSend>0) {
+ TCPCRSendUsed = TRUE;
ts.CRSend = ts.TCPCRSend;
cv.CRSend = ts.TCPCRSend;
}
if (ts.TCPLocalEcho>0) {
+ TCPLocalEchoUsed = TRUE;
ts.LocalEcho = ts.TCPLocalEcho;
}
}