svnno****@sourc*****
svnno****@sourc*****
2017年 6月 13日 (火) 19:42:58 JST
Tera TermRevision: 6803
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6803
Author: doda
Date: 2017-06-13 19:42:58 +0900 (Tue, 13 Jun 2017)
Log Message:
-----------
NO_COPYLINE_FIX マクロを廃止。常に有効。
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/buffer.c
trunk/teraterm/teraterm/buffer.h
trunk/teraterm/teraterm/vtterm.c
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/common/tttypes.h 2017-06-13 10:42:58 UTC (rev 6803)
@@ -44,9 +44,7 @@
#define AttrFontMask 0x07
#define AttrBlink 0x08
#define AttrReverse 0x10
-#ifndef NO_COPYLINE_FIX
#define AttrLineContinued 0x20 /* valid only at the beggining or end of a line */
-#endif /* NO_COPYLINE_FIX */
/* begin - ishizaki */
#define AttrURL 0x40
/* end - ishizaki */
@@ -482,9 +480,7 @@
WORD DelayPerLine;
WORD MaxComPort;
WORD ComAutoConnect;
-#ifndef NO_COPYLINE_FIX
WORD EnableContinuedLineCopy;
-#endif /* NO_COPYLINE_FIX */
COLORREF ANSIColor[16];
/* protocol used in connect() */
int ProtocolFamily;
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c 2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/teraterm/buffer.c 2017-06-13 10:42:58 UTC (rev 6803)
@@ -757,13 +757,11 @@
// XStart: start position of erasing
// Count: number of characters to be erased
{
-#ifndef NO_COPYLINE_FIX
BOOL LineContinued=FALSE;
if (ts.EnableContinuedLineCopy && XStart == 0 && (AttrLine[0] & AttrLineContinued)) {
LineContinued = TRUE;
}
-#endif /* NO_COPYLINE_FIX */
if (ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) {
EraseKanji(1); /* if cursor is on right half of a kanji, erase the kanji */
@@ -776,7 +774,6 @@
memset(&(AttrLineFG[XStart]),CurCharAttr.Fore,Count);
memset(&(AttrLineBG[XStart]),CurCharAttr.Back,Count);
-#ifndef NO_COPYLINE_FIX
if (ts.EnableContinuedLineCopy) {
if (LineContinued) {
BuffLineContinued(TRUE);
@@ -786,7 +783,6 @@
AttrBuff[NextLinePtr(LinePtr)] &= ~AttrLineContinued;
}
}
-#endif /* NO_COPYLINE_FIX */
DispEraseCharsInLine(XStart, Count);
}
@@ -1288,10 +1284,9 @@
int i, j, k, IStart, IEnd;
BOOL Sp, FirstChar;
BYTE b;
-#ifndef NO_COPYLINE_FIX
BOOL LineContinued, PrevLineContinued;
+
LineContinued = FALSE;
-#endif /* NO_COPYLINE_FIX */
if (TalkStatus==IdTalkCB) {
return;
@@ -1348,7 +1343,6 @@
// exclude right-side space characters
IEnd = LeftHalfOfDBCS(TmpPtr,IEnd);
-#ifndef NO_COPYLINE_FIX
PrevLineContinued = LineContinued;
LineContinued = FALSE;
if (ts.EnableContinuedLineCopy && j!=SelectEnd.y && !BoxSelect) {
@@ -1362,7 +1356,6 @@
}
}
if (!LineContinued)
-#endif /* NO_COPYLINE_FIX */
while ((IEnd>0) && (CodeBuff[TmpPtr+IEnd]==0x20)) {
MoveCharPtr(TmpPtr,&IEnd,-1);
}
@@ -1384,11 +1377,7 @@
Sp = TRUE;
b = 0x09;
}
-#ifndef NO_COPYLINE_FIX
if ((b!=0x09) || (! FirstChar) || PrevLineContinued) {
-#else
- if ((b!=0x09) || (! FirstChar)) {
-#endif
FirstChar = FALSE;
CBPtr[k] = b;
k++;
@@ -1404,9 +1393,7 @@
}
}
-#ifndef NO_COPYLINE_FIX
if (!LineContinued)
-#endif /* NO_COPYLINE_FIX */
if (j < SelectEnd.y) {
CBPtr[k] = 0x0d;
k++;
@@ -1417,7 +1404,6 @@
TmpPtr = NextLinePtr(TmpPtr);
}
CBPtr[k] = 0;
-#ifndef NO_COPYLINE_FIX
LineContinued = FALSE;
if (ts.EnableContinuedLineCopy && j!=SelectEnd.y && !BoxSelect && j<BuffEnd-1) {
LONG NextTmpPtr = NextLinePtr(TmpPtr);
@@ -1430,7 +1416,6 @@
}
}
if (!LineContinued)
-#endif /* NO_COPYLINE_FIX */
UnlockBuffer();
// --- send CB memory to clipboard
@@ -1672,11 +1657,9 @@
int XStart, LineEnd, MoveLen;
int extr = 0;
-#ifndef NO_COPYLINE_FIX
if (ts.EnableContinuedLineCopy && CursorX == 0 && (AttrLine[0] & AttrLineContinued)) {
Attr.Attr |= AttrLineContinued;
}
-#endif /* NO_COPYLINE_FIX */
if (ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) {
EraseKanji(1); /* if cursor is on right half of a kanji, erase the kanji */
@@ -1761,11 +1744,9 @@
int XStart, LineEnd, MoveLen;
int extr = 0;
-#ifndef NO_COPYLINE_FIX
if (ts.EnableContinuedLineCopy && CursorX == 0 && (AttrLine[0] & AttrLineContinued)) {
Attr.Attr |= AttrLineContinued;
}
-#endif /* NO_COPYLINE_FIX */
EraseKanji(1); /* if cursor is on right half of a kanji, erase the kanji */
@@ -3529,7 +3510,6 @@
MoveCursor(CursorX,CursorY);
}
-#ifndef NO_COPYLINE_FIX
void BuffLineContinued(BOOL mode)
{
if (ts.EnableContinuedLineCopy) {
@@ -3540,7 +3520,6 @@
}
}
}
-#endif /* NO_COPYLINE_FIX */
void BuffSetCurCharAttr(TCharAttr Attr) {
CurCharAttr = Attr;
@@ -3765,13 +3744,11 @@
// Count: number of characters to be erased
{
int i;
-#ifndef NO_COPYLINE_FIX
BOOL LineContinued=FALSE;
if (ts.EnableContinuedLineCopy && XStart == 0 && (AttrLine[0] & AttrLineContinued)) {
LineContinued = TRUE;
}
-#endif /* NO_COPYLINE_FIX */
if (ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) {
if (!(AttrLine2[CursorX] & Attr2Protect)) {
@@ -3787,7 +3764,6 @@
}
}
-#ifndef NO_COPYLINE_FIX
if (ts.EnableContinuedLineCopy) {
if (LineContinued) {
BuffLineContinued(TRUE);
@@ -3797,7 +3773,6 @@
AttrBuff[NextLinePtr(LinePtr)] &= ~AttrLineContinued;
}
}
-#endif /* NO_COPYLINE_FIX */
BuffUpdateRect(XStart, CursorY, XStart+Count, CursorY);
}
Modified: trunk/teraterm/teraterm/buffer.h
===================================================================
--- trunk/teraterm/teraterm/buffer.h 2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/teraterm/buffer.h 2017-06-13 10:42:58 UTC (rev 6803)
@@ -63,11 +63,9 @@
void CursorBackwardTab(int count);
void ClearTabStop(int Ps);
void ShowStatusLine(int Show);
-#ifndef NO_COPYLINE_FIX
void BuffLineContinued(BOOL mode);
#define SetLineContinued() BuffLineContinued(TRUE)
#define ClearLineContinued() BuffLineContinued(FALSE)
-#endif /* NO_COPYLINE_FIX */
void BuffRegionScrollUpNLines(int n);
void BuffRegionScrollDownNLines(int n);
void BuffSetCurCharAttr(TCharAttr Attr);
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/teraterm/vtterm.c 2017-06-13 10:42:58 UTC (rev 6803)
@@ -503,10 +503,8 @@
void CarriageReturn(BOOL logFlag)
{
-#ifndef NO_COPYLINE_FIX
if (!ts.EnableContinuedLineCopy || logFlag)
-#endif /* NO_COPYLINE_FIX */
- if (cv.HLogBuf!=0) Log1Byte(CR);
+ if (cv.HLogBuf!=0) Log1Byte(CR);
if (RelativeOrgMode || CursorX > CursorLeftM)
MoveCursor(CursorLeftM, CursorY);
@@ -523,10 +521,8 @@
(b>=LF) && (b<=FF))
BuffDumpCurrentLine(b);
-#ifndef NO_COPYLINE_FIX
if (!ts.EnableContinuedLineCopy || logFlag)
-#endif /* NO_COPYLINE_FIX */
- if (cv.HLogBuf!=0) Log1Byte(LF);
+ if (cv.HLogBuf!=0) Log1Byte(LF);
if (CursorY < CursorBottom)
MoveCursor(CursorX,CursorY+1);
@@ -534,9 +530,7 @@
else if (CursorY < NumOfLines-StatusLine-1)
MoveCursor(CursorX,CursorY+1);
-#ifndef NO_COPYLINE_FIX
ClearLineContinued();
-#endif /* NO_COPYLINE_FIX */
if (LFMode) CarriageReturn(logFlag);
@@ -548,11 +542,9 @@
if (Wrap && !ts.VTCompatTab) {
CarriageReturn(FALSE);
LineFeed(LF,FALSE);
-#ifndef NO_COPYLINE_FIX
if (ts.EnableContinuedLineCopy) {
SetLineContinued();
}
-#endif /* NO_COPYLINE_FIX */
Wrap = FALSE;
}
CursorForwardTab(1, AutoWrapMode);
@@ -574,9 +566,7 @@
if (Wrap) {
CarriageReturn(FALSE);
LineFeed(LF,FALSE);
-#ifndef NO_COPYLINE_FIX
CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
-#endif /* NO_COPYLINE_FIX */
}
// if (cv.HLogBuf!=0) Log1Byte(b);
@@ -644,9 +634,7 @@
if (Wrap) {
CarriageReturn(FALSE);
LineFeed(LF, FALSE);
-#ifndef NO_COPYLINE_FIX
CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
-#endif /* NO_COPYLINE_FIX */
}
if (cv.HLogBuf!=0) Log1Byte(b);
@@ -680,11 +668,9 @@
void PutKanji(BYTE b)
{
int LineEnd;
-#ifndef NO_COPYLINE_FIX
TCharAttr CharAttrTmp;
+ CharAttrTmp = CharAttr;
- CharAttrTmp = CharAttr;
-#endif /* NO_COPYLINE_FIX */
Kanji = Kanji + b;
if (PrinterMode && DirectPrn) {
@@ -710,20 +696,16 @@
if (Wrap) {
CarriageReturn(FALSE);
LineFeed(LF,FALSE);
-#ifndef NO_COPYLINE_FIX
if (ts.EnableContinuedLineCopy)
CharAttrTmp.Attr |= AttrLineContinued;
-#endif /* NO_COPYLINE_FIX */
}
else if (CursorX > LineEnd - 1) {
if (AutoWrapMode) {
-#ifndef NO_COPYLINE_FIX
if (ts.EnableContinuedLineCopy) {
CharAttrTmp.Attr |= AttrLineContinued;
if (CursorX == LineEnd)
BuffPutChar(0x20, CharAttr, FALSE);
}
-#endif /* NO_COPYLINE_FIX */
CarriageReturn(FALSE);
LineFeed(LF,FALSE);
}
@@ -744,11 +726,7 @@
Special = FALSE;
}
-#ifndef NO_COPYLINE_FIX
BuffPutKanji(Kanji, CharAttrTmp, InsertMode);
-#else
- BuffPutKanji(Kanji, CharAttr, InsertMode);
-#endif /* NO_COPYLINE_FIX */
if (CursorX < LineEnd - 1) {
MoveRight();
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/ttpset/ttset.c 2017-06-13 10:42:58 UTC (rev 6803)
@@ -1471,11 +1471,9 @@
GetPrivateProfileString(Section, "ZModemRcvCommand", "rz",
ts->ZModemRcvCommand, sizeof(ts->ZModemRcvCommand), FName);
-#ifndef NO_COPYLINE_FIX
/* Enable continued-line copy -- special option */
ts->EnableContinuedLineCopy =
GetOnOff(Section, "EnableContinuedLineCopy", FName, FALSE);
-#endif /* NO_COPYLINE_FIX */
if (GetOnOff(Section, "DisablePasteMouseRButton", FName, FALSE))
ts->PasteFlag |= CPF_DISABLE_RBUTTON;