Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2025-01-29 17:35:06 +00:00
Code Issues Projects Releases Wiki Activity

Console: blink cursor

Browse Source
This commit is contained in:
Wolfgang Thaller 2015-10-12 23:44:07 +02:00 committed by Wolfgang Thaller
parent 17cf4beff7
commit e7d2e37e22
2 changed files with 65 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Console/Console.cc
View File

@ -30,7 +30,8 @@ using namespace Retro;
Console *Console::currentInstance = NULL;
Console::Console(GrafPtr port, Rect r)
: consolePort(port), bounds(r), dirtyRect()
: consolePort(port), bounds(r), dirtyRect(),
blinkTicks(0), cursorDrawn(false), cursorVisible(true)
{
if(currentInstance == NULL)
currentInstance = (Console*) -1;
@ -66,6 +67,16 @@ Rect Console::CellRect(short x, short y)
void Console::DrawCell(short x, short y, bool erase)
{
Rect r = CellRect(x,y);
if(cursorDrawn)
{
if(y == cursorY && x == cursorX)
{
erase = true;
cursorDrawn = false;
}
}
if(erase)
EraseRect(&r);
MoveTo(r.left, r.bottom - 2);
@ -76,6 +87,16 @@ void Console::DrawCells(short x1, short x2, short y, bool erase)
{
Rect r = { (short) (bounds.top + y * cellSizeY), (short) (bounds.left + x1 * cellSizeX),
(short) (bounds.top + (y+1) * cellSizeY), (short) (bounds.left + x2 * cellSizeX) };
if(cursorDrawn)
{
if(y == cursorY && x1 <= cursorX && x2 > cursorX)
{
erase = true;
cursorDrawn = false;
}
}
if(erase)
EraseRect(&r);
MoveTo(r.left, r.bottom - 2);
@ -113,6 +134,7 @@ void Console::ScrollUp(short n)
void Console::PutCharNoUpdate(char c)
{
InvalidateCursor();
switch(c)
{
case '\r':
@ -179,6 +201,13 @@ void Console::Update()
#if TARGET_API_MAC_CARBON
QDFlushPortBuffer(consolePort,NULL);
#endif
if(cursorVisible != cursorDrawn)
{
Rect r = CellRect(cursorX, cursorY);
InvertRect(&r);
cursorDrawn = !cursorDrawn;
}
}
void Console::putch(char c)
@ -205,8 +234,9 @@ std::string Console::ReadLine()
{
do
{
Idle();
while(!GetNextEvent(everyEvent, &event))
;
Idle();
} while(event.what != keyDown && event.what != autoKey);
c = event.message & charCodeMask;
@ -218,9 +248,11 @@ std::string Console::ReadLine()
{
if(buffer.size())
{
InvalidateCursor();
cursorX--;
putch(' ');
PutCharNoUpdate(' ');
cursorX--;
Update();
buffer.resize(buffer.size()-1);
}
@ -233,3 +265,26 @@ std::string Console::ReadLine()
} while(c != '\n');
return buffer;
}
void Console::InvalidateCursor()
{
if(cursorDrawn)
{
PortSetter setport(consolePort);
Rect r = CellRect(cursorX, cursorY);
InvertRect(&r);
cursorDrawn = false;
}
}
void Console::Idle()
{
long ticks = TickCount();
if(ticks - blinkTicks > 60)
{
cursorVisible = !cursorVisible;
blinkTicks = ticks;
Update();
}
}

7
Console/Console.h
View File

@ -53,6 +53,10 @@ namespace Retro
short cursorX, cursorY;
Rect dirtyRect;
long blinkTicks;
bool cursorDrawn;
bool cursorVisible;
void PutCharNoUpdate(char c);
void Update();
@ -61,6 +65,9 @@ namespace Retro
void DrawCell(short x, short y, bool erase = true);
void DrawCells(short x1, short x2, short y, bool erase = true);
void ScrollUp(short n = 1);
void InvalidateCursor();
void Idle();
};