svnno****@sourc*****
svnno****@sourc*****
2016年 3月 19日 (土) 22:55:49 JST
Tera TermRevision: 6349
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6349
Author: salarm
Date: 2016-03-19 22:55:49 +0900 (Sat, 19 Mar 2016)
Log Message:
-----------
r6347の改善
起動時にシリアルポートの接続を待つ/WAITCOM コマンドラインオプションを追加した。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/commandline/teraterm.html
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/commandline/teraterm.html
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 2016-03-15 14:22:49 UTC (rev 6348)
+++ trunk/doc/en/html/about/history.html 2016-03-19 13:55:49 UTC (rev 6349)
@@ -36,12 +36,7 @@
<ul class="history">
<li>Changes
<ul>
- <li>When serial port is specified with with /C= option and the port does not exist, Tera Term will wait for port connection.
- <ul>
- <li>This feature can be enabled with <a href="../setup/teraterm-com.html#AutoComPortReconnect">AutoComPortReconnect</a>=on.</li>
- <li>Connection error message does not be shown until connection.</li>
- </ul>
- </li>
+ <li>added the <a href="../commandline/teraterm.html#waitcom">/WAITCOM</a> command line option. When serial port is specified with with /C= option and the port does not exist, Tera Term will wait for port connection.</li>
</ul>
</li>
Modified: trunk/doc/en/html/commandline/teraterm.html
===================================================================
--- trunk/doc/en/html/commandline/teraterm.html 2016-03-15 14:22:49 UTC (rev 6348)
+++ trunk/doc/en/html/commandline/teraterm.html 2016-03-19 13:55:49 UTC (rev 6349)
@@ -21,7 +21,7 @@
[/L=<log file>] [/LA=<language>] [/M=<macro file>] [/NOLOG]
[/P=<TCP port#>] [/R=<replay file>] [/T=<telnet flag>]
[/TEKICON=<icon name>] [/TIMEOUT=<connecting timeout value>]
- [/V] [/VTICON=<icon name>] [/W="<window title>"]
+ [/V] [/VTICON=<icon name>] [/W="<window title>"] [/WAITCOM]
[/X=<window pos (x)] [/Y=<window pos (y)]
[/NAMEDPIPE]
[/AUTOWINCLOSE=<flag>]
@@ -171,6 +171,9 @@
<dt id="w">/W=<window title></dt>
<dd>Window title</dd>
+ <dt id="waitcom">/WAITCOM</dt>
+ <dd>When serial port is specified with with /C= option and the port does not exist, Tera Term will wait for port connection.</dd>
+
<dt id="x">/X=<window position (x)></dt>
<dd>Windows position (horizontal)</dd>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2016-03-15 14:22:49 UTC (rev 6348)
+++ trunk/doc/ja/html/about/history.html 2016-03-19 13:55:49 UTC (rev 6349)
@@ -36,12 +36,7 @@
<ul class="history">
<li>\x95ύX
<ul>
- <li>/C=\x82ŃV\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82\xF0\x8Ew\x92肵\x82\xBD\x8Fꍇ\x81A\x83|\x81[\x83g\x82\xAA\x91\xB6\x8D݂\xB5\x82Ȃ\xEA\x82A\x83|\x81[\x83g\x82̐ڑ\xB1\x82\xF0\x91҂‚悤\x82ɂ\xB5\x82\xBD\x81B
- <ul>
- <li><a href="../setup/teraterm-com.html#AutoComPortReconnect">AutoComPortReconnect</a>=on\x82̎\x9E\x82ɗL\x8C\xF8\x82ƂȂ\xE9</li>
- <li>\x90ڑ\xB1\x82\xF0\x91҂ꍇ\x81A\x90ڑ\xB1\x83G\x83\x89\x81[\x83\x81\x83b\x83Z\x81[\x83W\x82͕\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x81B</li>
- </ul>
- </li>
+ <li>\x8BN\x93\xAE\x8E\x9E\x82ɃV\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̐ڑ\xB1\x82\xF0\x91҂\xC2<a href="../commandline/teraterm.html#waitcom">/WAITCOM</a> \x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/doc/ja/html/commandline/teraterm.html
===================================================================
--- trunk/doc/ja/html/commandline/teraterm.html 2016-03-15 14:22:49 UTC (rev 6348)
+++ trunk/doc/ja/html/commandline/teraterm.html 2016-03-19 13:55:49 UTC (rev 6349)
@@ -25,7 +25,7 @@
[/L=<log file>] [/LA=<language>] [/M=<macro file>] [/NOLOG]
[/P=<TCP port#>] [/R=<replay file>] [/T=<telnet flag>]
[/TEKICON=<icon name>] [/TIMEOUT=<connecting timeout value>]
- [/V] [/VTICON=<icon name>] [/W="<window title>"]
+ [/V] [/VTICON=<icon name>] [/W="<window title>"] [/WAITCOM]
[/X=<window pos (x)] [/Y=<window pos (y)]
[/NAMEDPIPE]
[/AUTOWINCLOSE=<flag>]
@@ -176,6 +176,9 @@
<dt id="w">/W=<window title></dt>
<dd>\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x83C\x83g\x83\x8B</dd>
+ <dt id="waitcom">/WAITCOM</dt>
+ <dd>\x8BN\x93\xAE\x8E\x9E\x82\xC9/C\x82Ŏw\x92肳\x82ꂽ\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82\xAA\x91\xB6\x8D݂\xB5\x82Ȃ\xA2\x8Fꍇ\x81A\x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x82̐ڑ\xB1\x82\xF0\x91҂\xBF\x82܂\xB7\x81B</dd>
+
<dt id="x">/X=<window position (x)></dt>
<dd>\x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu(\x90\x85\x95\xBD)</dd>
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2016-03-15 14:22:49 UTC (rev 6348)
+++ trunk/teraterm/common/tttypes.h 2016-03-19 13:55:49 UTC (rev 6349)
@@ -608,6 +608,7 @@
int ZmodemTimeOutTCPIP;
int ZmodemTimeOutInit;
int ZmodemTimeOutFin;
+ WORD WaitCom;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -1072,6 +1073,9 @@
* Increment the number of this macro value
* when you change TMap or member of TMap.
*
+ * - At version 4.91, ttset_memfilemap was replaced with ttset_memfilemap_28.
+ * added tttset.ComConnRetry
+ *
* - At version 4.90, ttset_memfilemap was replaced with ttset_memfilemap_27.
* added tttset.XmodemTimeOutInit
* added tttset.XmodemTimeOutInitCRC
@@ -1241,4 +1245,4 @@
* added tttset.VTCompatTab.
*/
-#define TT_FILEMAPNAME "ttset_memfilemap_27"
+#define TT_FILEMAPNAME "ttset_memfilemap_28"
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2016-03-15 14:22:49 UTC (rev 6348)
+++ trunk/teraterm/teraterm/vtwin.cpp 2016-03-19 13:55:49 UTC (rev 6349)
@@ -3129,7 +3129,7 @@
#endif
if ((pDevHdr->dbch_devicetype == DBT_DEVTYP_PORT || pDevHdr->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE) &&
ts.PortType == IdSerial &&
- ts.AutoComPortReconnect &&
+ (ts.AutoComPortReconnect || ts.WaitCom) &&
AutoDisconnectedPort == ts.ComPort) {
#ifdef DEBUG
if (pDevHdr->dbch_devicetype == DBT_DEVTYP_PORT) {
@@ -3725,7 +3725,7 @@
else {
Connecting = TRUE;
ChangeTitle();
- if (ts.AutoComPortReconnect && ts.PortType == IdSerial) {
+ if (ts.WaitCom && ts.PortType == IdSerial) {
if (CheckComPort(ts.ComPort) == 0) {
SetAutoConnectPort(ts.ComPort);
return 0;
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2016-03-15 14:22:49 UTC (rev 6348)
+++ trunk/teraterm/ttpset/ttset.c 2016-03-19 13:55:49 UTC (rev 6349)
@@ -1173,6 +1173,9 @@
ts->ClearComBuffOnOpen =
GetOnOff(Section, "ClearComBuffOnOpen", FName, TRUE);
+ /* When serial port is specified with with /C= option and the port does not exist, Tera Term will wait for port connection. */
+ ts->WaitCom = GetOnOff(Section, "WaitCom", FName, FALSE);
+
/* Confirm disconnection -- special option */
if (GetOnOff(Section, "ConfirmDisconnect", FName, TRUE))
ts->PortFlag |= PF_CONFIRMDISCONN;
@@ -2605,6 +2608,9 @@
/* Clear serial port buffer when port opening -- special option */
WriteOnOff(Section, "ClearComBuffOnOpen", FName, ts->ClearComBuffOnOpen);
+ /* When serial port is specified with with /C= option and the port does not exist, Tera Term will wait for port connection. */
+ WriteOnOff(Section, "WaitCom", FName, ts->WaitCom);
+
/* Confirm disconnection -- special option */
WriteOnOff(Section, "ConfirmDisconnect", FName,
(WORD) (ts->PortFlag & PF_CONFIRMDISCONN));
@@ -3747,6 +3753,9 @@
if ((ParamCom < 1) || (ParamCom > ts->MaxComPort))
ParamCom = 0;
}
+ else if (_stricmp(Temp, "/WAITCOM") == 0) { /* wait COM arrival */
+ ts->WaitCom = 1;
+ }
else if (_strnicmp(Temp, "/D=", 3) == 0) {
if (DDETopic != NULL)
strncpy_s(DDETopic, 21, &Temp[3], _TRUNCATE); // 21 = sizeof(TopicName)