Tera TermRevision: 8174
https://osdn.net/projects/ttssh2/scm/svn/commits/8174
Author: yutakapon
Date: 2019-09-16 22:39:31 +0900 (Mon, 16 Sep 2019)
Log Message:
-----------
TCP/IP接続中においても [Setup]-[Serial port] ダイアログを呼び出せるようにした。
branches/serial_port_improvedからリビジョン8119, 8140をマージ:
TCP/IP接続中やコネクション確立中(Connecting)においても、設定 - シリアルポートのメニューを
選択できるようにした。この場合、新規プロセスとしてTera Termが起動され、シリアル接続される。
現状、有効な設定がCOMポートとスピードしかないが、他パラメータについてはすべてコマンドラインオプションを
作る予定。
........
r8119 の改版履歴を記載した。
........
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8119
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/vtwin.cpp
Property Changed:
----------------
trunk/
trunk/teraterm/
-------------- next part --------------
Index: trunk
===================================================================
--- trunk 2019-09-16 11:14:02 UTC (rev 8173)
+++ trunk 2019-09-16 13:39:31 UTC (rev 8174)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,6 +2,7 ##
/branches/flowctrl_dsrdtr:7825-7827
/branches/openssl_1_1_1_v2:7888
/branches/portfwd_memleak:7732,7736-7737,7764
+/branches/serial_port_improved:8119,8140
/branches/ssh_ed25519:5495-5544
/branches/ttproxy_improved:8041,8055-8056
/branches/ttssh_improved:8027,8036,8040,8044,8053-8054,8058,8060,8063,8081,8085
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2019-09-16 11:14:02 UTC (rev 8173)
+++ trunk/doc/en/html/about/history.html 2019-09-16 13:39:31 UTC (rev 8174)
@@ -47,6 +47,7 @@
<li>Added slider for specify the opacity values on the Visual tab of the <a href="../menu/setup-additional.html">Additional settings dialog</a>.</li>
<li>Eterm look-feel: Added the <a href="../menu/setup-additional.html#MixedThemeFile">Mixed ThemeFile to Background</a> configuration. Also, added the the <a href="../setup/teraterm-ini.html#BGIgnoreThemeFile">BGIgnoreThemeFile</a> entry in the teraterm.ini file. The default value is off.</li>
<li>When the inputted over than 256 of opacity values of the <a href="../menu/setup-additional.html">Additional settings dialog</a>, change to 255.</li>
+ <li>The <a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> dialog can be called even while TCP/IP connection.</li>
</ul>
</li>
<li>Bug fixes
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2019-09-16 11:14:02 UTC (rev 8173)
+++ trunk/doc/ja/html/about/history.html 2019-09-16 13:39:31 UTC (rev 8174)
@@ -47,6 +47,7 @@
<li>\x83\x8A\x83T\x83C\x83Y\x92\x86\x82̏c\x89\xA1\x83T\x83C\x83Y\x83c\x81[\x83\x8B\x83`\x83b\x83v\x82̕\\x8E\xA6\x88ʒu\x82\xF0\x83\x8A\x83T\x83C\x83Y\x8C\xE3\x82̍\xC0\x95W\x82ɒǏ]\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li>Eterm look-feel: <a href="../menu/setup-additional.html#MixedThemeFile">\x95ǎ\x86\x82Ɖ摜\x82\xF0\x8D\xAC\x8D\x87\x82\xB7\x82\xE9</a>\x82\xF0\x90ݒ\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81Bteraterm.ini \x82\xC9 <a href="../setup/teraterm-ini.html#BGIgnoreThemeFile">BGIgnoreThemeFile</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81B</li>
<li><a href="../menu/setup-additional.html">Additional settings\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCVisual\x83^\x83u\x82ŕs\x93\xA7\x96\xBE\x93x\x82̒l\x82\xC9256\x88ȏ\xE3\x82\xF0\x93\xFC\x97͂\xB5\x82\xBD\x82Ƃ\xAB\x81A255\x82ɕύX\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+ <li>TCP/IP\x90ڑ\xB1\x92\x86\x82ɂ\xA8\x82\xA2\x82Ă\xE0<a href="../menu/setup-serialport.html">[Setup]-[Serial port]</a> \x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8CĂяo\x82\xB9\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
</ul>
</li>
<li>\x83o\x83O\x8FC\x90\xB3
Index: trunk/teraterm
===================================================================
--- trunk/teraterm 2019-09-16 11:14:02 UTC (rev 8173)
+++ trunk/teraterm 2019-09-16 13:39:31 UTC (rev 8174)
Property changes on: trunk/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
/branches/flowctrl_dsrdtr/teraterm:7825-7827
+/branches/serial_port_improved/teraterm:8119,8140
/branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2019-09-16 11:14:02 UTC (rev 8173)
+++ trunk/teraterm/teraterm/vtwin.cpp 2019-09-16 13:39:31 UTC (rev 8174)
@@ -1416,10 +1416,14 @@
if (cv.Ready &&
((cv.PortType==IdTCPIP) || (cv.PortType==IdFile)) ||
(SendVar!=NULL) || (FileVar!=NULL) || Connecting) {
- EnableMenuItem(SetupMenu,ID_SETUP_SERIALPORT,MF_BYCOMMAND | MF_GRAYED);
+ /*
+ * \x83l\x83b\x83g\x83\x8F\x81[\x83N\x90ڑ\xB1\x92\x86\x82̓V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g(ID_SETUP_SERIALPORT)\x82̃\x81\x83j\x83\x85\x81[\x82\xAA
+ * \x91I\x91\xF0\x82ł\xAB\x82Ȃ\xA2\x82悤\x82ɂȂ\xC1\x82Ă\xA2\x82\xBD\x82\xAA\x81A\x82\xB1\x82̃K\x81[\x83h\x82\xF0\x8AO\x82\xB7\x81B
+ */
+ // do nothing
}
else {
- EnableMenuItem(SetupMenu,ID_SETUP_SERIALPORT,MF_BYCOMMAND | MF_ENABLED);
+ // do nothing
}
else if (SubMenu == ControlMenu)
@@ -4668,6 +4672,8 @@
void CVTWindow::OnSetupSerialPort()
{
BOOL Ok;
+ char Command[MAXPATHLEN + HostNameMaxLength];
+
HelpId = HlpSetupSerialPort;
if (! LoadTTDLG()) {
return;
@@ -4678,6 +4684,20 @@
FreeTTDLG();
if (Ok && ts.ComPort > 0) {
+ /*
+ * TCP/IP\x82ɂ\xE6\x82\xE9\x90ڑ\xB1\x92\x86\x82̏ꍇ\x82͐V\x8BK\x83v\x83\x8D\x83Z\x83X\x82Ƃ\xB5\x82ċN\x93\xAE\x82\xB7\x82\xE9\x81B
+ * New connection\x82\xA9\x82\xE7\x83V\x83\x8A\x83A\x83\x8B\x90ڑ\xB1\x82\xB7\x82铮\x8D\xEC\x82Ɗ\xEE\x96{\x93I\x82ɓ\xAF\x82\xB6\x93\xAE\x8D\xEC\x82ƂȂ\xE9\x81B
+ */
+ if ( (cv.Ready && (cv.PortType != IdSerial)) ||
+ Connecting) {
+
+ _snprintf_s(Command, sizeof(Command), "ttermpro /C=%u /SPEED=%lu",
+ ts.ComPort, ts.Baud);
+
+ WinExec(Command,SW_SHOW);
+ return;
+ }
+
if (cv.Open) {
if (ts.ComPort != cv.ComPort) {
CommClose(&cv);