svnno****@sourc*****
svnno****@sourc*****
2015年 11月 5日 (木) 21:31:08 JST
Tera TermRevision: 6079
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6079
Author: maya
Date: 2015-11-05 21:31:08 +0900 (Thu, 05 Nov 2015)
Log Message:
-----------
r6071 のファイル送信の高速化を使うか使わないか設定できるようにした
Revision Links:
--------------
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6071
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2015-11-05 12:27:59 UTC (rev 6078)
+++ trunk/teraterm/common/tttypes.h 2015-11-05 12:31:08 UTC (rev 6079)
@@ -585,6 +585,7 @@
WORD AcceleratorNewConnection;
WORD AcceleratorCygwinConnection;
int SendBreakTime;
+ WORD FileSendBulkPacket;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -1048,6 +1049,9 @@
* Increment the number of this macro value
* when you change TMap or member of TMap.
*
+ * - At version 4.89, ttset_memfilemap was replaced with ttset_memfilemap_26.
+ * added tttset.FileSendBulkPacket
+ *
* - At version 4.85, ttset_memfilemap was replaced with ttset_memfilemap_25.
* added tttset.AcceleratorNewConnection
* added tttset.AcceleratorCygwinConnection
@@ -1195,4 +1199,4 @@
* added tttset.VTCompatTab.
*/
-#define TT_FILEMAPNAME "ttset_memfilemap_25"
+#define TT_FILEMAPNAME "ttset_memfilemap_26"
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2015-11-05 12:27:59 UTC (rev 6078)
+++ trunk/teraterm/teraterm/filesys.cpp 2015-11-05 12:31:08 UTC (rev 6079)
@@ -1286,8 +1286,9 @@
LONG BCOld;
DWORD read_bytes;
- if (BinaryMode && !FileRetryEcho && !FileBracketMode && !cv.TelFlag &&
- (ts.LocalEcho == 0) && (ts.Baud >= 115200)) {
+ if (ts.FileSendBulkPacket &&
+ BinaryMode && !FileRetryEcho && !FileBracketMode && !cv.TelFlag &&
+ (ts.LocalEcho == 0) && (ts.Baud >= 115200)) {
return FileSendBinayBoost();
}
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2015-11-05 12:27:59 UTC (rev 6078)
+++ trunk/teraterm/ttpset/ttset.c 2015-11-05 12:31:08 UTC (rev 6079)
@@ -920,6 +920,9 @@
if (GetOnOff(Section, "EnableStatusLine", FName, TRUE))
ts->TermFlag |= TF_ENABLESLINE;
+ // Enable multiple bytes send -- special option
+ ts->FileSendBulkPacket = GetOnOff(Section, "FileSendBulkPacket", FName, TRUE);
+
// fixed JIS --- special
if (GetOnOff(Section, "FixedJIS", FName, FALSE))
ts->TermFlag |= TF_FIXEDJIS;
@@ -2292,6 +2295,9 @@
WriteOnOff(Section, "EnableStatusLine", FName,
(WORD) (ts->TermFlag & TF_ENABLESLINE));
+ /* Enable multiple bytes send -- special option */
+ WriteOnOff(Section, "FileSendBulkPacket", FName, ts->FileSendBulkPacket);
+
/* IME Flag -- special option */
WriteOnOff(Section, "IME", FName, ts->UseIME);