• R/O
  • SSH
  • HTTPS

ttssh2: 提交


Commit MetaInfo

修订版5438 (tree)
时间2013-11-26 14:51:09
作者doda

Log Message

更改概述

差异

--- trunk/teraterm/teraterm/buffer.c (revision 5437)
+++ trunk/teraterm/teraterm/buffer.c (revision 5438)
@@ -1599,9 +1599,9 @@
15991599 PrevCharPtr = PrevLinePtr(LinePtr) + NumOfColumns-1;
16001600 PrevCharCode = CodeBuff[PrevCharPtr];
16011601 PrevCharAttr = AttrBuff[PrevCharPtr];
1602- if ((PrevCharAttr & AttrURL) && !(ch & 0x80) && url_char[ch]) {
1603- if ((AttrLine[0] & AttrLineContinued) || (ts.JoinSplitedURL &&
1604- (PrevCharCode == ts.IgnoreCharContinuedLineURL || ts.IgnoreCharContinuedLineURL == '\0' ))) {
1602+ if ((PrevCharAttr & AttrURL) && !(AttrLine[0]&(AttrKanji|AttrSpecial)) && !(ch & 0x80) && url_char[ch]) {
1603+ if ((AttrLine[0] & AttrLineContinued) || (ts.JoinSplitURL &&
1604+ (PrevCharCode == ts.JoinSplitURLIgnoreEOLChar || ts.JoinSplitURLIgnoreEOLChar == '\0' ))) {
16051605 AttrLine[0] |= AttrURL;
16061606 }
16071607 }
@@ -1609,9 +1609,9 @@
16091609 }
16101610
16111611 if ((x-1>=0) && (AttrLine[x-1] & AttrURL) &&
1612- ((!(ch & 0x80 || url_char[ch]==0)) || (x == NumOfColumns - 1 && ch == ts.IgnoreCharContinuedLineURL))) {
1613-// !((CodeLine[x] <= ' ') && !(AttrLine[x] & AttrKanji))) {
1614- AttrLine[x] |= AttrURL;
1612+ !(AttrLine[x] & (AttrKanji|AttrSpecial)) &&
1613+ ((!(ch & 0x80) && url_char[ch]) || (x == NumOfColumns - 1 && ch == ts.JoinSplitURLIgnoreEOLChar))) {
1614+ AttrLine[x] |= AttrURL;
16151615 return;
16161616 }
16171617
@@ -2397,7 +2397,7 @@
23972397 for (i = 0; i < end - start + 1; i++) {
23982398 ch = CodeBuff[start + i];
23992399 if ((start + i) % NumOfColumns == NumOfColumns - 1
2400- && ch == ts.IgnoreCharContinuedLineURL) {
2400+ && ch == ts.JoinSplitURLIgnoreEOLChar) {
24012401 // 行末が行継続マーク用の文字の場合はスキップする
24022402 } else {
24032403 *uptr++ = ch;
--- trunk/teraterm/ttpset/ttset.c (revision 5437)
+++ trunk/teraterm/ttpset/ttset.c (revision 5438)
@@ -1530,10 +1530,10 @@
15301530 ts->MaxOSCBufferSize =
15311531 GetPrivateProfileInt(Section, "MaxOSCBufferSize", 4096, FName);
15321532
1533- ts->JoinSplitedURL = GetOnOff(Section, "JoinSplitedURL", FName, FALSE);
1533+ ts->JoinSplitURL = GetOnOff(Section, "JoinSplitURL", FName, FALSE);
15341534
1535- GetPrivateProfileString(Section, "IgnoreCharContinuedLineURL", "\\", Temp, sizeof(Temp), FName);
1536- ts->IgnoreCharContinuedLineURL = Temp[0];
1535+ GetPrivateProfileString(Section, "JoinSplitURLIgnoreEOLChar", "\\", Temp, sizeof(Temp), FName);
1536+ ts->JoinSplitURLIgnoreEOLChar = Temp[0];
15371537 }
15381538
15391539 void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2696,10 +2696,10 @@
26962696 // Max OSC string buffer size
26972697 WriteInt(Section, "MaxOSCBufferSize", FName, ts->MaxOSCBufferSize);
26982698
2699- WriteOnOff(Section, "JoinSplitedURL", FName, ts->JoinSplitedURL);
2699+ WriteOnOff(Section, "JoinSplitURL", FName, ts->JoinSplitURL);
27002700
2701- _snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%c", ts->IgnoreCharContinuedLineURL);
2702- WritePrivateProfileString(Section, "IgnoreCharContinuedLineURL", Temp, FName);
2701+ _snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%c", ts->JoinSplitURLIgnoreEOLChar);
2702+ WritePrivateProfileString(Section, "JoinSplitURLIgnoreEOLChar", Temp, FName);
27032703 }
27042704
27052705 #define VTEditor "VT editor keypad"
--- trunk/teraterm/common/tttypes.h (revision 5437)
+++ trunk/teraterm/common/tttypes.h (revision 5438)
@@ -571,8 +571,8 @@
571571 DWORD BeepSuppressTime;
572572 WORD LogAllBuffIncludedInFirst;
573573 unsigned int MaxOSCBufferSize;
574- WORD JoinSplitedURL;
575- char IgnoreCharContinuedLineURL;
574+ WORD JoinSplitURL;
575+ char JoinSplitURLIgnoreEOLChar;
576576 };
577577
578578 typedef struct tttset TTTSet, *PTTSet;
--- trunk/doc/en/html/about/history.html (revision 5437)
+++ trunk/doc/en/html/about/history.html (revision 5438)
@@ -44,7 +44,7 @@
4444 </ul></li>
4545 <li>When the URL string is divided at the end of the line, new setting can enable to concatenate the whole string.
4646 <ul>
47- <li>added the JoinSplitedURL and IgnoreCharContinuedLineURL entries in the teraterm.ini file.</li>
47+ <li>added the JoinSplitURL and JoinSplitURLIgnoreEOLChar entries in the teraterm.ini file.</li>
4848 </ul></li>
4949 <li>Macro
5050 <ul>
--- trunk/doc/ja/html/about/history.html (revision 5437)
+++ trunk/doc/ja/html/about/history.html (revision 5438)
@@ -44,7 +44,7 @@
4444 </ul></li>
4545 <li>URLの途中で改行されている時に、繋がっているものとして扱える設定を追加した。
4646 <ul>
47- <li>tearterm.iniにJoinSplitedURL, IgnoreCharContinuedLineURLエントリを追加した。</li>
47+ <li>tearterm.iniにJoinSplitURL, JoinSplitURLIgnoreEOLCharエントリを追加した。</li>
4848 </ul></li>
4949 <li>マクロ
5050 <ul>
Show on old repository browser