svnno****@sourc*****
svnno****@sourc*****
2013年 11月 26日 (火) 14:51:10 JST
Tera TermRevision: 5438
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5438
Author: doda
Date: 2013-11-26 14:51:09 +0900 (Tue, 26 Nov 2013)
Log Message:
-----------
設定名変更
https://sourceforge.jp/ticket/browse.php?group_id=1412&tid=32028
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/installer/release/TERATERM.INI
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/buffer.c
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2013-11-25 16:25:46 UTC (rev 5437)
+++ trunk/doc/en/html/about/history.html 2013-11-26 05:51:09 UTC (rev 5438)
@@ -44,7 +44,7 @@
</ul></li>
<li>When the URL string is divided at the end of the line, new setting can enable to concatenate the whole string.
<ul>
- <li>added the JoinSplitedURL and IgnoreCharContinuedLineURL entries in the teraterm.ini file.</li>
+ <li>added the JoinSplitURL and JoinSplitURLIgnoreEOLChar entries in the teraterm.ini file.</li>
</ul></li>
<li>Macro
<ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2013-11-25 16:25:46 UTC (rev 5437)
+++ trunk/doc/ja/html/about/history.html 2013-11-26 05:51:09 UTC (rev 5438)
@@ -44,7 +44,7 @@
</ul></li>
<li>URL\x82̓r\x92\x86\x82ʼn\xFC\x8Ds\x82\xB3\x82\xEA\x82Ă\xA2\x82鎞\x82ɁA\x8Cq\x82\xAA\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ƃ\xB5\x82Ĉ\xB5\x82\xA6\x82\xE9\x90ݒ\xE8\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B
<ul>
- <li>tearterm.ini\x82\xC9JoinSplitedURL, IgnoreCharContinuedLineURL\x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
+ <li>tearterm.ini\x82\xC9JoinSplitURL, JoinSplitURLIgnoreEOLChar\x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
</ul></li>
<li>\x83}\x83N\x83\x8D
<ul>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2013-11-25 16:25:46 UTC (rev 5437)
+++ trunk/installer/release/TERATERM.INI 2013-11-26 05:51:09 UTC (rev 5438)
@@ -498,9 +498,9 @@
; Windows 7 jump list support
JumpList=on
-;
-JoinSplitedURL=off
-IgnoreCharContinuedLineURL=\
+; Join Split URL
+JoinSplitURL=off
+JoinSplitURLIgnoreEOLChar=\
; Kermit log
KmtLog=off
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2013-11-25 16:25:46 UTC (rev 5437)
+++ trunk/teraterm/common/tttypes.h 2013-11-26 05:51:09 UTC (rev 5438)
@@ -571,8 +571,8 @@
DWORD BeepSuppressTime;
WORD LogAllBuffIncludedInFirst;
unsigned int MaxOSCBufferSize;
- WORD JoinSplitedURL;
- char IgnoreCharContinuedLineURL;
+ WORD JoinSplitURL;
+ char JoinSplitURLIgnoreEOLChar;
};
typedef struct tttset TTTSet, *PTTSet;
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c 2013-11-25 16:25:46 UTC (rev 5437)
+++ trunk/teraterm/teraterm/buffer.c 2013-11-26 05:51:09 UTC (rev 5438)
@@ -1599,9 +1599,9 @@
PrevCharPtr = PrevLinePtr(LinePtr) + NumOfColumns-1;
PrevCharCode = CodeBuff[PrevCharPtr];
PrevCharAttr = AttrBuff[PrevCharPtr];
- if ((PrevCharAttr & AttrURL) && !(ch & 0x80) && url_char[ch]) {
- if ((AttrLine[0] & AttrLineContinued) || (ts.JoinSplitedURL &&
- (PrevCharCode == ts.IgnoreCharContinuedLineURL || ts.IgnoreCharContinuedLineURL == '\0' ))) {
+ if ((PrevCharAttr & AttrURL) && !(AttrLine[0]&(AttrKanji|AttrSpecial)) && !(ch & 0x80) && url_char[ch]) {
+ if ((AttrLine[0] & AttrLineContinued) || (ts.JoinSplitURL &&
+ (PrevCharCode == ts.JoinSplitURLIgnoreEOLChar || ts.JoinSplitURLIgnoreEOLChar == '\0' ))) {
AttrLine[0] |= AttrURL;
}
}
@@ -1609,9 +1609,9 @@
}
if ((x-1>=0) && (AttrLine[x-1] & AttrURL) &&
- ((!(ch & 0x80 || url_char[ch]==0)) || (x == NumOfColumns - 1 && ch == ts.IgnoreCharContinuedLineURL))) {
-// !((CodeLine[x] <= ' ') && !(AttrLine[x] & AttrKanji))) {
- AttrLine[x] |= AttrURL;
+ !(AttrLine[x] & (AttrKanji|AttrSpecial)) &&
+ ((!(ch & 0x80) && url_char[ch]) || (x == NumOfColumns - 1 && ch == ts.JoinSplitURLIgnoreEOLChar))) {
+ AttrLine[x] |= AttrURL;
return;
}
@@ -2397,7 +2397,7 @@
for (i = 0; i < end - start + 1; i++) {
ch = CodeBuff[start + i];
if ((start + i) % NumOfColumns == NumOfColumns - 1
- && ch == ts.IgnoreCharContinuedLineURL) {
+ && ch == ts.JoinSplitURLIgnoreEOLChar) {
// \x8Ds\x96\x96\x82\xAA\x8Ds\x8Cp\x91\xB1\x83}\x81[\x83N\x97p\x82̕\xB6\x8E\x9A\x82̏ꍇ\x82̓X\x83L\x83b\x83v\x82\xB7\x82\xE9
} else {
*uptr++ = ch;
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2013-11-25 16:25:46 UTC (rev 5437)
+++ trunk/teraterm/ttpset/ttset.c 2013-11-26 05:51:09 UTC (rev 5438)
@@ -1530,10 +1530,10 @@
ts->MaxOSCBufferSize =
GetPrivateProfileInt(Section, "MaxOSCBufferSize", 4096, FName);
- ts->JoinSplitedURL = GetOnOff(Section, "JoinSplitedURL", FName, FALSE);
+ ts->JoinSplitURL = GetOnOff(Section, "JoinSplitURL", FName, FALSE);
- GetPrivateProfileString(Section, "IgnoreCharContinuedLineURL", "\\", Temp, sizeof(Temp), FName);
- ts->IgnoreCharContinuedLineURL = Temp[0];
+ GetPrivateProfileString(Section, "JoinSplitURLIgnoreEOLChar", "\\", Temp, sizeof(Temp), FName);
+ ts->JoinSplitURLIgnoreEOLChar = Temp[0];
}
void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2696,10 +2696,10 @@
// Max OSC string buffer size
WriteInt(Section, "MaxOSCBufferSize", FName, ts->MaxOSCBufferSize);
- WriteOnOff(Section, "JoinSplitedURL", FName, ts->JoinSplitedURL);
+ WriteOnOff(Section, "JoinSplitURL", FName, ts->JoinSplitURL);
- _snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%c", ts->IgnoreCharContinuedLineURL);
- WritePrivateProfileString(Section, "IgnoreCharContinuedLineURL", Temp, FName);
+ _snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%c", ts->JoinSplitURLIgnoreEOLChar);
+ WritePrivateProfileString(Section, "JoinSplitURLIgnoreEOLChar", Temp, FName);
}
#define VTEditor "VT editor keypad"