svnno****@sourc*****
svnno****@sourc*****
2014年 11月 3日 (月) 08:32:42 JST
Tera TermRevision: 5694
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5694
Author: maya
Date: 2014-11-03 08:32:38 +0900 (Mon, 03 Nov 2014)
Log Message:
-----------
シリアルポートで SendBreak を送る時間を設定できるようにした
https://sourceforge.jp/ticket/browse.php?group_id=1412&tid=34558
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/commlib.c
trunk/teraterm/teraterm/commlib.h
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2014-11-01 02:48:46 UTC (rev 5693)
+++ trunk/teraterm/common/tttypes.h 2014-11-02 23:32:38 UTC (rev 5694)
@@ -584,6 +584,7 @@
WORD DebugModes;
WORD AcceleratorNewConnection;
WORD AcceleratorCygwinConnection;
+ int SendBreakTime;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -1050,6 +1051,7 @@
* - At version 4.85, ttset_memfilemap was replaced with ttset_memfilemap_25.
* added tttset.AcceleratorNewConnection
* added tttset.AcceleratorCygwinConnection
+ * added tttset.SendBreakTime
*
* - At version 4.83, ttset_memfilemap was replaced with ttset_memfilemap_24.
* added tttset.DebugModes
Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c 2014-11-01 02:48:46 UTC (rev 5693)
+++ trunk/teraterm/teraterm/commlib.c 2014-11-02 23:32:38 UTC (rev 5694)
@@ -1218,7 +1218,7 @@
}
}
-void CommSendBreak(PComVar cv)
+void CommSendBreak(PComVar cv, int msec)
/* for only serial ports */
{
MSG DummyMsg;
@@ -1233,7 +1233,7 @@
SetCommBreak(cv->ComID);
/* pause for 1 sec */
- if (SetTimer(cv->HWin, IdBreakTimer, 1000, NULL) != 0) {
+ if (SetTimer(cv->HWin, IdBreakTimer, msec, NULL) != 0) {
GetMessage(&DummyMsg,cv->HWin,WM_TIMER,WM_TIMER);
}
Modified: trunk/teraterm/teraterm/commlib.h
===================================================================
--- trunk/teraterm/teraterm/commlib.h 2014-11-01 02:48:46 UTC (rev 5693)
+++ trunk/teraterm/teraterm/commlib.h 2014-11-02 23:32:38 UTC (rev 5694)
@@ -19,7 +19,7 @@
void CommProcRRQ(PComVar cv);
void CommReceive(PComVar cv);
void CommSend(PComVar cv);
-void CommSendBreak(PComVar cv);
+void CommSendBreak(PComVar cv, int msec);
void CommResetSerial(PTTSet ts, PComVar cv, BOOL ClearBuffer);
void CommLock(PTTSet ts, PComVar cv, BOOL Lock);
BOOL PrnOpen(PCHAR DevName);
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2014-11-01 02:48:46 UTC (rev 5693)
+++ trunk/teraterm/teraterm/vtwin.cpp 2014-11-02 23:32:38 UTC (rev 5694)
@@ -4576,7 +4576,7 @@
TelSendBreak();
break;
case IdSerial:
- CommSendBreak(&cv);
+ CommSendBreak(&cv, ts.SendBreakTime);
break;
}
}
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2014-11-01 02:48:46 UTC (rev 5693)
+++ trunk/teraterm/ttpset/ttset.c 2014-11-02 23:32:38 UTC (rev 5694)
@@ -1033,6 +1033,10 @@
/* Send 8bit control sequence -- special option */
ts->Send8BitCtrl = GetOnOff(Section, "Send8BitCtrl", FName, FALSE);
+ /* SendBreak time (in msec) -- special option */
+ ts->SendBreakTime =
+ GetPrivateProfileInt(Section, "SendBreakTime", 1000, FName);
+
/* Startup macro -- special option */
GetPrivateProfileString(Section, "StartupMacro", "",
ts->MacroFN, sizeof(ts->MacroFN), FName);
@@ -2364,6 +2368,9 @@
/* Send 8bit control sequence -- special option */
WriteOnOff(Section, "Send8BitCtrl", FName, ts->Send8BitCtrl);
+ /* SendBreak time (in msec) -- special option */
+ WriteInt(Section, "SendBreakTime", FName, ts->SendBreakTime);
+
/* Startup macro -- special option */
WritePrivateProfileString(Section, "StartupMacro", ts->MacroFN, FName);