svnno****@sourc*****
svnno****@sourc*****
2015年 11月 5日 (木) 21:58:43 JST
Tera TermRevision: 6083
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6083
Author: maya
Date: 2015-11-05 21:58:43 +0900 (Thu, 05 Nov 2015)
Log Message:
-----------
r6076 の COM ポート切断・再接続を検出する機能を使うか使わないか設定できるようにした
Revision Links:
--------------
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6076
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2015-11-05 12:45:50 UTC (rev 6082)
+++ trunk/teraterm/common/tttypes.h 2015-11-05 12:58:43 UTC (rev 6083)
@@ -586,6 +586,7 @@
WORD AcceleratorCygwinConnection;
int SendBreakTime;
WORD FileSendBulkPacket;
+ WORD AutoComDisReConnect;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -1051,6 +1052,7 @@
*
* - At version 4.89, ttset_memfilemap was replaced with ttset_memfilemap_26.
* added tttset.FileSendBulkPacket
+ * added tttset.AutoComDisReConnect
*
* - At version 4.85, ttset_memfilemap was replaced with ttset_memfilemap_25.
* added tttset.AcceleratorNewConnection
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2015-11-05 12:45:50 UTC (rev 6082)
+++ trunk/teraterm/teraterm/vtwin.cpp 2015-11-05 12:58:43 UTC (rev 6083)
@@ -2982,6 +2982,10 @@
{
if (nEventType == DBT_DEVICEARRIVAL || nEventType ==DBT_DEVICEREMOVECOMPLETE) {
if (ts.PortType == IdSerial) {
+ if (!ts.AutoComDisReConnect) {
+ return CFrameWnd::OnDeviceChange(nEventType, dwData);
+ }
+
if (cv.Open != 0) {
/* \x90ڑ\xB1\x92\x86 */
if (CheckComPort(cv.ComPort) == 0) {
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2015-11-05 12:45:50 UTC (rev 6082)
+++ trunk/teraterm/ttpset/ttset.c 2015-11-05 12:58:43 UTC (rev 6083)
@@ -839,6 +839,9 @@
(ts->KanjiOut == IdKanjiOutH))
ts->KanjiOut = IdKanjiOutJ;
+ // Detect disconnect/reconnect of serial port --- special option
+ ts->AutoComDisReConnect = GetOnOff(Section, "AutoComDisReConnect", FName, TRUE);
+
// Auto file renaming --- special option
if (GetOnOff(Section, "AutoFileRename", FName, FALSE))
ts->FTFlag |= FT_RENAME;
@@ -2218,6 +2221,9 @@
WriteOnOff(Section, "AllowWrongSequence", FName,
(WORD) (ts->TermFlag & TF_ALLOWWRONGSEQUENCE));
+ /* Detect disconnect/reconnect of serial port --- special option */
+ WriteOnOff(Section, "AutoComDisReConnect", FName, ts->AutoComDisReConnect);
+
/* Auto file renaming --- special option */
WriteOnOff(Section, "AutoFileRename", FName,
(WORD) (ts->FTFlag & FT_RENAME));