ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some reorganization of the console font initialization, in preparation 

for different-sized debugger fonts.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2791 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-08-12 15:02:38 +00:00
parent 19d9d5bc99
commit 465cc76769
9 changed files with 72 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/debugger/Debugger.hxx
View File

@ -157,6 +157,7 @@ class Debugger : public DialogContainer
*/
TIADebug& tiaDebug() const { return *myTiaDebug; }
const GUI::Font& font() const { return myDialog->font(); }
DebuggerParser& parser() const { return *myParser; }
PackedBitArray& breakpoints() const { return *myBreakPoints; }
PackedBitArray& readtraps() const { return *myReadTraps; }

3
src/debugger/DebuggerParser.cxx
View File

@ -1329,8 +1329,7 @@ void DebuggerParser::executeRunTo()
// disassembly, since this may be a time-consuming operation
ostringstream buf;
buf << "RunTo searching through " << max_iterations << " disassembled instructions";
ProgressDialog progress(debugger.myBaseDialog,
debugger.myOSystem->consoleFont(), buf.str());
ProgressDialog progress(debugger.myBaseDialog, debugger.font(), buf.str());
progress.setRange(0, max_iterations, 5);
bool done = false;

74
src/debugger/gui/DebuggerDialog.cxx
View File

@ -38,6 +38,11 @@
#include "Debugger.hxx"
#include "DebuggerParser.hxx"
#include "ConsoleFont.hxx"
#include "ConsoleMediumFont.hxx"
#include "ConsoleLargeFont.hxx"
#include "StellaMediumFont.hxx"
#include "DebuggerDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -46,8 +51,11 @@ DebuggerDialog::DebuggerDialog(OSystem* osystem, DialogContainer* parent,
: Dialog(osystem, parent, x, y, w, h, true), // use base surface
myTab(NULL),
myRomTab(NULL),
myFont(NULL),
myFatalError(NULL)
{
createFont();
addTiaArea();
addTabArea();
addStatusArea();
@ -60,6 +68,7 @@ DebuggerDialog::DebuggerDialog(OSystem* osystem, DialogContainer* parent,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DebuggerDialog::~DebuggerDialog()
{
delete myFont;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -153,6 +162,19 @@ void DebuggerDialog::handleCommand(CommandSender* sender, int cmd,
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DebuggerDialog::createFont()
{
// For now, these sizes are hardcoded based on actual font size
if(_w >= kLargeFontMinW && _h >= kLargeFontMinH)
myFont = new GUI::Font(GUI::stellaMediumDesc);
else if(_w >= kMediumFontMinW && _h >= kMediumFontMinH)
myFont = new GUI::Font(GUI::consoleMediumDesc);
else
myFont = new GUI::Font(GUI::consoleDesc);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DebuggerDialog::showFatalMessage(const string& msg)
{
@ -160,7 +182,7 @@ void DebuggerDialog::showFatalMessage(const string& msg)
delete myFatalError;
myFatalError =
new GUI::MessageBox(this, instance().consoleFont(), msg,
new GUI::MessageBox(this, *myFont, msg,
r.width(), r.height(), kDDExitFatalCmd,
"Exit ROM", "Continue");
myFatalError->show();
@ -171,7 +193,7 @@ void DebuggerDialog::addTiaArea()
{
const GUI::Rect& r = instance().debugger().getTiaBounds();
myTiaOutput = new TiaOutputWidget(this, instance().consoleFont(),
myTiaOutput = new TiaOutputWidget(this, *myFont,
r.left, r.top, r.width(), r.height());
}
@ -184,7 +206,7 @@ void DebuggerDialog::addTabArea()
// The tab widget
// Since there are two tab widgets in this dialog, we specifically
// assign an ID of 0
myTab = new TabWidget(this, instance().consoleFont(), r.left, r.top + vBorder,
myTab = new TabWidget(this, *myFont, r.left, r.top + vBorder,
r.width(), r.height() - vBorder);
myTab->setID(0);
addTabWidget(myTab);
@ -195,28 +217,28 @@ void DebuggerDialog::addTabArea()
// The Prompt/console tab
tabID = myTab->addTab(" Prompt ");
myPrompt = new PromptWidget(myTab, instance().consoleFont(),
myPrompt = new PromptWidget(myTab, *myFont,
2, 2, widWidth, widHeight);
myTab->setParentWidget(tabID, myPrompt);
addToFocusList(myPrompt->getFocusList(), myTab, tabID);
// The TIA tab
tabID = myTab->addTab("TIA");
TiaWidget* tia = new TiaWidget(myTab, instance().consoleFont(),
TiaWidget* tia = new TiaWidget(myTab, *myFont,
2, 2, widWidth, widHeight);
myTab->setParentWidget(tabID, tia);
addToFocusList(tia->getFocusList(), myTab, tabID);
// The input/output tab (includes RIOT and INPTx from TIA)
tabID = myTab->addTab("I/O");
RiotWidget* riot = new RiotWidget(myTab, instance().consoleFont(),
RiotWidget* riot = new RiotWidget(myTab, *myFont,
2, 2, widWidth, widHeight);
myTab->setParentWidget(tabID, riot);
addToFocusList(riot->getFocusList(), myTab, tabID);
// The Audio tab
tabID = myTab->addTab("Audio");
AudioWidget* aud = new AudioWidget(myTab, instance().consoleFont(),
AudioWidget* aud = new AudioWidget(myTab, *myFont,
2, 2, widWidth, widHeight);
myTab->setParentWidget(tabID, aud);
addToFocusList(aud->getFocusList(), myTab, tabID);
@ -227,21 +249,21 @@ void DebuggerDialog::addTabArea()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DebuggerDialog::addStatusArea()
{
const GUI::Font& font = instance().consoleFont();
const GUI::Font& font = *myFont;
const int lineHeight = font.getLineHeight();
const GUI::Rect& r = instance().debugger().getStatusBounds();
int xpos, ypos;
xpos = r.left; ypos = r.top;
myTiaInfo = new TiaInfoWidget(this, instance().consoleFont(), xpos, ypos);
myTiaInfo = new TiaInfoWidget(this, *myFont, xpos, ypos);
ypos += myTiaInfo->getHeight() + 10;
myTiaZoom = new TiaZoomWidget(this, instance().consoleFont(), xpos+10, ypos,
myTiaZoom = new TiaZoomWidget(this, *myFont, xpos+10, ypos,
r.width()-10, r.height()-lineHeight-ypos-10);
addToFocusList(myTiaZoom->getFocusList());
xpos += 10; ypos += myTiaZoom->getHeight() + 10;
myMessageBox = new EditTextWidget(this, instance().consoleFont(),
myMessageBox = new EditTextWidget(this, *myFont,
xpos, ypos, myTiaZoom->getWidth(),
font.getLineHeight(), "");
myMessageBox->setEditable(false);
@ -258,41 +280,41 @@ void DebuggerDialog::addRomArea()
int xpos, ypos;
xpos = r.left + 10; ypos = 10;
myCpu = new CpuWidget(this, instance().consoleFont(), xpos, ypos);
myCpu = new CpuWidget(this, *myFont, xpos, ypos);
addToFocusList(myCpu->getFocusList());
xpos = r.left + 10; ypos += myCpu->getHeight() + 10;
myRam = new RamWidget(this, instance().consoleFont(), xpos, ypos);
myRam = new RamWidget(this, *myFont, xpos, ypos);
addToFocusList(myRam->getFocusList());
xpos = r.left + 10 + myCpu->getWidth() + 5;
DataGridOpsWidget* ops = new DataGridOpsWidget(this, instance().consoleFont(),
DataGridOpsWidget* ops = new DataGridOpsWidget(this, *myFont,
xpos, 20);
int bwidth = instance().consoleFont().getStringWidth("Frame +1 "),
bheight = instance().consoleFont().getLineHeight() + 2;
int bwidth = myFont->getStringWidth("Frame +1 "),
bheight = myFont->getLineHeight() + 2;
int buttonX = r.right - bwidth - 5, buttonY = r.top + 5;
new ButtonWidget(this, instance().consoleFont(), buttonX, buttonY,
new ButtonWidget(this, *myFont, buttonX, buttonY,
bwidth, bheight, "Step", kDDStepCmd);
buttonY += bheight + 4;
new ButtonWidget(this, instance().consoleFont(), buttonX, buttonY,
new ButtonWidget(this, *myFont, buttonX, buttonY,
bwidth, bheight, "Trace", kDDTraceCmd);
buttonY += bheight + 4;
new ButtonWidget(this, instance().consoleFont(), buttonX, buttonY,
new ButtonWidget(this, *myFont, buttonX, buttonY,
bwidth, bheight, "Scan +1", kDDSAdvCmd);
buttonY += bheight + 4;
new ButtonWidget(this, instance().consoleFont(), buttonX, buttonY,
new ButtonWidget(this, *myFont, buttonX, buttonY,
bwidth, bheight, "Frame +1", kDDAdvCmd);
buttonY += bheight + 4;
new ButtonWidget(this, instance().consoleFont(), buttonX, buttonY,
new ButtonWidget(this, *myFont, buttonX, buttonY,
bwidth, bheight, "Exit", kDDExitCmd);
bwidth = instance().consoleFont().getStringWidth("< ") + 4;
bwidth = myFont->getStringWidth("< ") + 4;
bheight = bheight * 5 + 4*4;
buttonX -= (bwidth + 5);
buttonY = r.top + 5;
myRewindButton =
new ButtonWidget(this, instance().consoleFont(), buttonX, buttonY,
new ButtonWidget(this, *myFont, buttonX, buttonY,
bwidth, bheight, "<", kDDRewindCmd);
myRewindButton->clearFlags(WIDGET_ENABLED);
@ -312,13 +334,13 @@ void DebuggerDialog::addRomArea()
// Since there are two tab widgets in this dialog, we specifically
// assign an ID of 1
myRomTab = new TabWidget(
this, instance().consoleFont(), xpos, ypos, tabWidth, tabHeight);
this, *myFont, xpos, ypos, tabWidth, tabHeight);
myRomTab->setID(1);
addTabWidget(myRomTab);
// The main disassembly tab
tabID = myRomTab->addTab(" Disassembly ");
myRom = new RomWidget(myRomTab, instance().consoleFont(),
myRom = new RomWidget(myRomTab, *myFont,
2, 2, tabWidth - 1,
tabHeight - myRomTab->getTabHeight() - 2);
myRomTab->setParentWidget(tabID, myRom);
@ -327,7 +349,7 @@ void DebuggerDialog::addRomArea()
// The 'cart-specific' information tab
tabID = myRomTab->addTab(instance().console().cartridge().name());
myCartDebug = instance().console().cartridge().debugWidget(
myRomTab, instance().consoleFont(), 2, 2, tabWidth - 1,
myRomTab, *myFont, 2, 2, tabWidth - 1,
tabHeight - myRomTab->getTabHeight() - 2);
if(myCartDebug) // TODO - make this always non-null
{

25
src/debugger/gui/DebuggerDialog.hxx
View File

@ -41,18 +41,25 @@ class CartDebugWidget;
class DebuggerDialog : public Dialog
{
public:
enum {
kSmallFontMinW = 1080, kSmallFontMinH = 720,
kMediumFontMinW = 1280, kMediumFontMinH = 860,
kLargeFontMinW = 1300, kLargeFontMinH = 940
};
DebuggerDialog(OSystem* osystem, DialogContainer* parent,
int x, int y, int w, int h);
~DebuggerDialog();
PromptWidget& prompt() { return *myPrompt; }
TiaInfoWidget& tiaInfo() { return *myTiaInfo; }
TiaOutputWidget& tiaOutput() { return *myTiaOutput; }
TiaZoomWidget& tiaZoom() { return *myTiaZoom; }
RomWidget& rom() { return *myRom; }
CartDebugWidget& cartDebug() { return *myCartDebug; }
EditTextWidget& message() { return *myMessageBox; }
ButtonWidget& rewindButton() { return *myRewindButton; }
const GUI::Font& font() const { return *myFont; }
PromptWidget& prompt() const { return *myPrompt; }
TiaInfoWidget& tiaInfo() const { return *myTiaInfo; }
TiaOutputWidget& tiaOutput() const { return *myTiaOutput; }
TiaZoomWidget& tiaZoom() const { return *myTiaZoom; }
RomWidget& rom() const { return *myRom; }
CartDebugWidget& cartDebug() const { return *myCartDebug; }
EditTextWidget& message() const { return *myMessageBox; }
ButtonWidget& rewindButton() const { return *myRewindButton; }
void loadConfig();
void handleKeyDown(StellaKey key, StellaMod mod, char ascii);
@ -73,6 +80,7 @@ class DebuggerDialog : public Dialog
TabWidget *myTab, *myRomTab;
GUI::Font* myFont;
PromptWidget* myPrompt;
TiaInfoWidget* myTiaInfo;
TiaOutputWidget* myTiaOutput;
@ -86,6 +94,7 @@ class DebuggerDialog : public Dialog
GUI::MessageBox* myFatalError;
private:
void createFont();
void addTiaArea();
void addTabArea();
void addStatusArea();

4
src/debugger/gui/PromptWidget.cxx
View File

@ -100,7 +100,7 @@ void PromptWidget::drawWidget(bool hilite)
} else {
fgcolor = c >> 8;
}
s.drawChar(instance().consoleFont(), c & 0x7f, x, y, fgcolor);
s.drawChar(_font, c & 0x7f, x, y, fgcolor);
x += _kConsoleCharWidth;
}
y += _kConsoleLineHeight;
@ -830,7 +830,7 @@ void PromptWidget::drawCaret()
char c = buffer(_currentPos);
s.fillRect(x, y, _kConsoleCharWidth, _kConsoleLineHeight, kTextColor);
s.drawChar(_boss->instance().consoleFont(), c, x, y + 2, kBGColor);
s.drawChar(_font, c, x, y + 2, kBGColor);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

9
src/emucore/OSystem.cxx
View File

@ -62,8 +62,6 @@
#include "StellaMediumFont.hxx"
#include "StellaLargeFont.hxx"
#include "ConsoleFont.hxx"
#include "ConsoleMediumFont.hxx"
#include "ConsoleLargeFont.hxx"
#include "Widget.hxx"
#include "Console.hxx"
#include "Random.hxx"
@ -94,8 +92,7 @@ OSystem::OSystem()
myRomMD5(""),
myFeatures(""),
myBuildInfo(""),
myFont(NULL),
myConsoleFont(NULL)
myFont(NULL)
{
// Calculate startup time
myMillisAtStart = (uInt32)(time(NULL) * 1000);
@ -136,7 +133,6 @@ OSystem::~OSystem()
delete myFont;
delete myInfoFont;
delete mySmallFont;
delete myConsoleFont;
delete myLauncherFont;
// Remove any game console that is currently attached
@ -201,9 +197,6 @@ bool OSystem::create()
////////////////////////////////////////////////////////////////////
bool smallScreen = myDesktopWidth < 640 || myDesktopHeight < 480;
// The console font is always the same size (for now at least)
myConsoleFont = new GUI::Font(GUI::consoleDesc);
// This font is used in a variety of situations when a really small
// font is needed; we let the specific widget/dialog decide when to
// use it

10
src/emucore/OSystem.hxx
View File

@ -258,13 +258,6 @@ class OSystem
*/
const GUI::Font& launcherFont() const { return *myLauncherFont; }
/**
Get the console font object of the system
@return The console font reference
*/
const GUI::Font& consoleFont() const { return *myConsoleFont; }
/**
Set the framerate for the video system. It's placed in this class since
the mainLoop() method is defined here.
@ -644,9 +637,6 @@ class OSystem
// The font object to use for the ROM launcher
GUI::Font* myLauncherFont;
// The font object to use for the console/debugger
GUI::Font* myConsoleFont;
// Indicates whether the main processing loop should proceed
TimingInfo myTimingInfo;

2
src/gui/LauncherDialog.cxx
View File

@ -116,7 +116,7 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
{
xpos += myList->getWidth() + 5;
myRomInfoWidget =
new RomInfoWidget(this, romWidth < 660 ? instance().smallFont() : instance().consoleFont(),
new RomInfoWidget(this, romWidth < 660 ? instance().smallFont() : instance().infoFont(),
xpos, ypos, romWidth, myList->getHeight());
}

2
src/gui/LoggerDialog.cxx
View File

@ -53,7 +53,7 @@ LoggerDialog::LoggerDialog(OSystem* osystem, DialogContainer* parent,
// Test listing of the log output
xpos = 10; ypos = 10;
myLogInfo = new StringListWidget(this, instance().consoleFont(), xpos, ypos,
myLogInfo = new StringListWidget(this, instance().infoFont(), xpos, ypos,
_w - 2 * xpos, _h - buttonHeight - ypos - 20 -
2 * lineHeight, false);
myLogInfo->setEditable(false);