diff --git a/src/apps/terminal/TermParse.cpp b/src/apps/terminal/TermParse.cpp index 63a26e0db2..be7b75804d 100644 --- a/src/apps/terminal/TermParse.cpp +++ b/src/apps/terminal/TermParse.cpp @@ -125,7 +125,7 @@ TermParse::GetReaderBuf(uchar &c) fView->UpdateLine(); // Reset cursor blinking time and turn on cursor blinking. - fView->SetCurDraw(CURON); + fView->SetCurDraw(true); // wait new input from pty. do { @@ -146,7 +146,7 @@ TermParse::GetReaderBuf(uchar &c) release_sem(fReaderLocker); } - fView->SetCurDraw(CUROFF); + fView->SetCurDraw(false); return B_OK; } diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp index f892cbc57a..3cae54468b 100644 --- a/src/apps/terminal/TermView.cpp +++ b/src/apps/terminal/TermView.cpp @@ -144,10 +144,10 @@ TermView::TermView(BRect frame, int32 argc, const char **argv, int32 historySize fScrollBarRange(0), fFrameResized(false), fLastCursorTime(0), - fCursorDrawFlag(CURON), - fCursorStatus(CURON), - fCursorBlinkingFlag(CURON), - fCursorRedrawFlag(CURON), + fCursorDrawFlag(true), + fCursorStatus(true), + fCursorBlinkingFlag(true), + fCursorRedrawFlag(true), fCursorHeight(0), fCurPos(0, 0), fCurStack(0, 0), @@ -193,10 +193,10 @@ TermView::TermView(int rows, int columns, int32 argc, const char **argv, int32 h fScrollBarRange(0), fFrameResized(false), fLastCursorTime(0), - fCursorDrawFlag(CURON), - fCursorStatus(CURON), - fCursorBlinkingFlag(CURON), - fCursorRedrawFlag(CURON), + fCursorDrawFlag(true), + fCursorStatus(true), + fCursorBlinkingFlag(true), + fCursorRedrawFlag(true), fCursorHeight(0), fCurPos(0, 0), fCurStack(0, 0), @@ -243,10 +243,10 @@ TermView::TermView(BMessage *archive) fScrollBarRange(0), fFrameResized(false), fLastCursorTime(0), - fCursorDrawFlag(CURON), - fCursorStatus(CURON), - fCursorBlinkingFlag(CURON), - fCursorRedrawFlag(CURON), + fCursorDrawFlag(true), + fCursorStatus(true), + fCursorBlinkingFlag(true), + fCursorRedrawFlag(true), fCursorHeight(0), fCurPos(0, 0), fCurStack(0, 0), @@ -1006,15 +1006,15 @@ TermView::DrawCursor() void TermView::BlinkCursor() { - if (fCursorDrawFlag == CURON - && fCursorBlinkingFlag == CURON + if (fCursorDrawFlag + && fCursorBlinkingFlag && Window()->IsActive()) { - if (fCursorStatus == CURON) + if (fCursorStatus) _TermDraw(fCurPos, fCurPos); else DrawCursor(); - fCursorStatus = fCursorStatus == CURON ? CUROFF : CURON; + fCursorStatus = !fCursorStatus; fLastCursorTime = system_time(); } } @@ -1024,16 +1024,16 @@ TermView::BlinkCursor() void TermView::SetCurDraw(bool flag) { - if (flag == CUROFF) { - if (fCursorStatus == CURON) + if (!flag) { + if (fCursorStatus) _TermDraw(fCurPos, fCurPos); - fCursorStatus = CUROFF; - fCursorDrawFlag = CUROFF; + fCursorStatus = false; + fCursorDrawFlag = false; } else { - if (fCursorDrawFlag == CUROFF) { - fCursorDrawFlag = CURON; - fCursorStatus = CURON; + if (!fCursorDrawFlag) { + fCursorDrawFlag = true; + fCursorStatus = true; if (LockLooper()) { DrawCursor(); @@ -1561,7 +1561,7 @@ TermView::Draw(BRect updateRect) } } - if (fCursorStatus == CURON) + if (fCursorStatus) DrawCursor(); Window()->EndViewTransaction(); diff --git a/src/apps/terminal/TermView.h b/src/apps/terminal/TermView.h index 0f93c91deb..f402581976 100644 --- a/src/apps/terminal/TermView.h +++ b/src/apps/terminal/TermView.h @@ -19,10 +19,6 @@ #include #include -/* Cursor Blinking flag */ -#define CUROFF 0 -#define CURON 1 - class BClipboard; class BMessageRunner;