Macintosh-Tools
/
Retro68
mirror of https://github.com/autc04/Retro68.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add additional permissions in the license.

This commit is contained in:
DarwinNE 2020-01-12 22:13:01 +01:00
parent 66ced30304
commit 75b54d3cc7
6 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Console/retro/Console.cc
View File

@ -13,6 +13,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
*/
@ -71,7 +75,7 @@ void Attributes::setUnderline(const bool v)
}
inline bool operator==(const Attributes& lhs, const Attributes& rhs)
{
{
return lhs.isBold()==rhs.isBold() && lhs.isUnderline()==rhs.isUnderline() && lhs.isItalic()==rhs.isItalic();
}
@ -81,7 +85,7 @@ inline bool operator!=(const Attributes& lhs, const Attributes& rhs)
}
inline bool operator==(const AttributedChar& lhs, const AttributedChar& rhs)
{
{
return lhs.c==rhs.c && lhs.attrs==rhs.attrs;
}
@ -141,15 +145,15 @@ void Console::Init(GrafPtr port, Rect r)
{
consolePort = port;
bounds = r;
PortSetter setport(consolePort);
FontSetup fontSetup;
InsetRect(&bounds, 2,2);
cellSizeY = 12;
cellSizeX = CharWidth('M');
rows = (bounds.bottom - bounds.top) / cellSizeY;
cols = (bounds.right - bounds.left) / cellSizeX;
@ -202,7 +206,7 @@ void Console::DrawCells(short x1, short x2, short y, bool erase)
cursorDrawn = false;
}
}
if(erase)
EraseRect(&r);
MoveTo(r.left, r.bottom - 2);
@ -230,11 +234,11 @@ void Console::Draw(Rect r)
short minRow = std::max(0, (r.top - bounds.top) / cellSizeY);
short maxRow = std::min((int)rows, (r.bottom - bounds.top + cellSizeY - 1) / cellSizeY);
short minCol = 0;// std::max(0, (r.left - bounds.left) / cellSizeX);
short maxCol = cols; //;std::min((int)cols, (r.right - bounds.left + cellSizeX - 1) / cellSizeX);
EraseRect(&r);
for(short row = minRow; row < maxRow; ++row)
{
@ -385,7 +389,7 @@ void Console::Update()
DrawCells(start, dirtyRect.right, row, needclear);
}
dirtyRect = Rect();
if(cursorVisible != cursorDrawn)
{
Rect r = CellRect(cursorX, cursorY);
@ -395,7 +399,7 @@ void Console::Update()
InvertRect(&r);
cursorDrawn = !cursorDrawn;
}
#if TARGET_API_MAC_CARBON
QDFlushPortBuffer(consolePort,NULL);
#endif
@ -413,7 +417,7 @@ void Console::write(const char *p, int n)
{
if(!rows)
return;
for(int i = 0; i < n; i++)
Console::currentInstance->PutCharNoUpdate(*p++);
Update();
@ -427,9 +431,9 @@ std::string Console::ReadLine()
std::string buffer;
char c;
do
{
{
c = WaitNextChar();
if(!c)
{
@ -439,7 +443,7 @@ std::string Console::ReadLine()
if(c == '\r')
c = '\n';
if(c == '\b')
{
if(buffer.size())
@ -455,7 +459,7 @@ std::string Console::ReadLine()
continue;
}
putch(c);
buffer.append(1,c);
} while(c != '\n');
@ -498,7 +502,7 @@ void Console::Reshape(Rect newBounds)
if(cursorY >= newRows)
{
upshift = cursorY - (newRows - 1);
InvalidateCursor();
cursorY = newRows - 1;
}
@ -520,7 +524,7 @@ void Console::Reshape(Rect newBounds)
}
onscreen.swap(newChars);*/
onscreen = newChars;
rows = newRows;
cols = newCols;

22
Console/retro/Console.h
View File

@ -13,6 +13,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
*/
@ -32,21 +36,21 @@ namespace retro
bool isBold(void) const;
bool isUnderline(void) const;
bool isItalic(void) const;
void setBold(const bool v);
void setUnderline(const bool v);
void setItalic(const bool v);
Attributes(void);
void reset(void);
private:
bool cBold;
bool cUnderline;
bool cItalic;
};
class AttributedChar
{
public:
@ -78,7 +82,7 @@ namespace retro
short GetRows() const { return rows; }
short GetCols() const { return cols; }
void Idle();
bool IsEOF() const { return eof; }
@ -99,7 +103,7 @@ namespace retro
short cursorX, cursorY;
Rect dirtyRect = {};
long blinkTicks = 0;
bool cursorDrawn = false;
bool cursorVisible = true;
@ -115,14 +119,14 @@ namespace retro
void ScrollUp(short n = 1);
void ProcessEscSequence(char c);
void SetAttributes(Attributes aa);
void InvalidateCursor();
virtual char WaitNextChar();
protected:
void Init(GrafPtr port, Rect r);
};

10
Console/retro/ConsoleWindow.cc
View File

@ -13,6 +13,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
*/
@ -69,7 +73,7 @@ char ConsoleWindow::WaitNextChar()
#else
Rect *boundsPtr = &qd.screenBits.bounds;
#endif
do
{
#if TARGET_API_MAC_CARBON
@ -82,7 +86,7 @@ char ConsoleWindow::WaitNextChar()
SystemTask();
Idle();
}
switch(event.what)
{
case updateEvt:
@ -126,6 +130,6 @@ char ConsoleWindow::WaitNextChar()
break;
}
} while(event.what != keyDown && event.what != autoKey);
return event.message & charCodeMask;
}

4
Console/retro/ConsoleWindow.h
View File

@ -13,6 +13,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
*/

28
Console/retro/InitConsole.cc
View File

@ -1,20 +1,24 @@
/*
Copyright 2014 Wolfgang Thaller.
Copyright 2014 Wolfgang Thaller.
This file is part of Retro68.
This file is part of Retro68.
Retro68 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Retro68 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Retro68 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Retro68 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string>

4
Console/retro/MacUtils.h
View File

@ -13,6 +13,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License
along with Retro68. If not, see <http://www.gnu.org/licenses/>.
*/