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

Header fixes take 4; 'debugger/gui' classes. 

Note that this one adds a new file, and I haven't yet updated the
Windows and OSX builds (so they won't compile for now).
This commit is contained in:
Stephen Anthony 2017-11-17 09:03:03 -03:30
parent 39f839021e
commit c2946e58d6
61 changed files with 192 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/debugger/CartDebug.cxx
View File

@ -32,6 +32,7 @@
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"
#include "CartRamWidget.hxx" #include "CartRamWidget.hxx"
#include "RomWidget.hxx"
#include "System.hxx" #include "System.hxx"
#include "Base.hxx" #include "Base.hxx"
using Common::Base; using Common::Base;

3
src/debugger/gui/AmigaMouseWidget.hxx
View File

@ -18,7 +18,8 @@
#ifndef AMIGAMOUSE_WIDGET_HXX #ifndef AMIGAMOUSE_WIDGET_HXX
#define AMIGAMOUSE_WIDGET_HXX #define AMIGAMOUSE_WIDGET_HXX
#include "Control.hxx" class Controller;
#include "PointingDeviceWidget.hxx" #include "PointingDeviceWidget.hxx"
class AmigaMouseWidget : public PointingDeviceWidget class AmigaMouseWidget : public PointingDeviceWidget

3
src/debugger/gui/AtariMouseWidget.hxx
View File

@ -18,7 +18,8 @@
#ifndef ATARIMOUSE_WIDGET_HXX #ifndef ATARIMOUSE_WIDGET_HXX
#define ATARIMOUSE_WIDGET_HXX #define ATARIMOUSE_WIDGET_HXX
#include "Control.hxx" class Controller;
#include "PointingDeviceWidget.hxx" #include "PointingDeviceWidget.hxx"
class AtariMouseWidget : public PointingDeviceWidget class AtariMouseWidget : public PointingDeviceWidget

3
src/debugger/gui/AtariVoxWidget.hxx
View File

@ -18,7 +18,8 @@
#ifndef ATARIVOX_WIDGET_HXX #ifndef ATARIVOX_WIDGET_HXX
#define ATARIVOX_WIDGET_HXX #define ATARIVOX_WIDGET_HXX
#include "Control.hxx" class Controller;
#include "FlashWidget.hxx" #include "FlashWidget.hxx"
class AtariVoxWidget : public FlashWidget class AtariVoxWidget : public FlashWidget

1
src/debugger/gui/AudioWidget.cxx
View File

@ -19,6 +19,7 @@
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "GuiObject.hxx" #include "GuiObject.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Debugger.hxx"
#include "TIADebug.hxx" #include "TIADebug.hxx"
#include "Widget.hxx" #include "Widget.hxx"

2
src/debugger/gui/BoosterWidget.cxx
View File

@ -15,8 +15,6 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "EventHandler.hxx"
#include "BoosterWidget.hxx" #include "BoosterWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/debugger/gui/BoosterWidget.hxx
View File

@ -19,7 +19,6 @@
#define BOOSTER_WIDGET_HXX #define BOOSTER_WIDGET_HXX
#include "Control.hxx" #include "Control.hxx"
#include "Event.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"
class BoosterWidget : public ControllerWidget class BoosterWidget : public ControllerWidget

1
src/debugger/gui/Cart2KWidget.hxx
View File

@ -19,6 +19,7 @@
#define CARTRIDGE2K_WIDGET_HXX #define CARTRIDGE2K_WIDGET_HXX
class Cartridge2K; class Cartridge2K;
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"
class Cartridge2KWidget : public CartDebugWidget class Cartridge2KWidget : public CartDebugWidget

1
src/debugger/gui/Cart3EPlusWidget.cxx
View File

@ -16,6 +16,7 @@
//============================================================================ //============================================================================
#include "Cart3EPlus.hxx" #include "Cart3EPlus.hxx"
#include "EditTextWidget.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "Cart3EPlusWidget.hxx" #include "Cart3EPlusWidget.hxx"

1
src/debugger/gui/Cart3EPlusWidget.hxx
View File

@ -20,6 +20,7 @@
class Cartridge3EPlus; class Cartridge3EPlus;
class ButtonWidget; class ButtonWidget;
class EditTextWidget;
class PopUpWidget; class PopUpWidget;
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"

2
src/debugger/gui/Cart4KSCWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "Cart4KSC.hxx" #include "Cart4KSC.hxx"
#include "Cart4KSCWidget.hxx" #include "Cart4KSCWidget.hxx"

1
src/debugger/gui/Cart4KSCWidget.hxx
View File

@ -19,6 +19,7 @@
#define CARTRIDGE4KSC_WIDGET_HXX #define CARTRIDGE4KSC_WIDGET_HXX
class Cartridge4KSC; class Cartridge4KSC;
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"
class Cartridge4KSCWidget : public CartDebugWidget class Cartridge4KSCWidget : public CartDebugWidget

1
src/debugger/gui/Cart4KWidget.hxx
View File

@ -19,6 +19,7 @@
#define CARTRIDGE4K_WIDGET_HXX #define CARTRIDGE4K_WIDGET_HXX
class Cartridge4K; class Cartridge4K;
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"
class Cartridge4KWidget : public CartDebugWidget class Cartridge4KWidget : public CartDebugWidget

2
src/debugger/gui/CartBFSCWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartBFSC.hxx" #include "CartBFSC.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartBFSCWidget.hxx" #include "CartBFSCWidget.hxx"

2
src/debugger/gui/CartCMWidget.cxx
View File

@ -16,6 +16,8 @@
//============================================================================ //============================================================================
#include "CartCM.hxx" #include "CartCM.hxx"
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "RiotDebug.hxx" #include "RiotDebug.hxx"
#include "DataGridWidget.hxx" #include "DataGridWidget.hxx"
#include "EditTextWidget.hxx" #include "EditTextWidget.hxx"

2
src/debugger/gui/CartCTYWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartCTY.hxx" #include "CartCTY.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartCTYWidget.hxx" #include "CartCTYWidget.hxx"

2
src/debugger/gui/CartCVPlusWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartCVPlus.hxx" #include "CartCVPlus.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartCVPlusWidget.hxx" #include "CartCVPlusWidget.hxx"

2
src/debugger/gui/CartCVWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartCV.hxx" #include "CartCV.hxx"
#include "CartCVWidget.hxx" #include "CartCVWidget.hxx"

1
src/debugger/gui/CartCVWidget.hxx
View File

@ -19,6 +19,7 @@
#define CARTRIDGECV_WIDGET_HXX #define CARTRIDGECV_WIDGET_HXX
class CartridgeCV; class CartridgeCV;
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"
class CartridgeCVWidget : public CartDebugWidget class CartridgeCVWidget : public CartDebugWidget

1
src/debugger/gui/CartDASHWidget.cxx
View File

@ -16,6 +16,7 @@
//============================================================================ //============================================================================
#include "CartDASH.hxx" #include "CartDASH.hxx"
#include "EditTextWidget.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartDASHWidget.hxx" #include "CartDASHWidget.hxx"

1
src/debugger/gui/CartDASHWidget.hxx
View File

@ -20,6 +20,7 @@
class CartridgeDASH; class CartridgeDASH;
class ButtonWidget; class ButtonWidget;
class EditTextWidget;
class PopUpWidget; class PopUpWidget;
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"

2
src/debugger/gui/CartDFSCWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartDFSC.hxx" #include "CartDFSC.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartDFSCWidget.hxx" #include "CartDFSCWidget.hxx"

96
src/debugger/gui/CartDebugWidget.cxx Normal file
View File

@ -0,0 +1,96 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
// and the Stella Team
//
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include "Font.hxx"
#include "RomWidget.hxx"
#include "EditTextWidget.hxx"
#include "StringListWidget.hxx"
#include "StringParser.hxx"
#include "CartDebugWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartDebugWidget::CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont,
int x, int y, int w, int h)
: Widget(boss, lfont, x, y, w, h),
CommandSender(boss),
_nfont(nfont),
myFontWidth(lfont.getMaxCharWidth()),
myFontHeight(lfont.getFontHeight()),
myLineHeight(lfont.getLineHeight()),
myButtonHeight(myLineHeight + 4),
myDesc(nullptr) { }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int CartDebugWidget::addBaseInformation(int bytes, const string& manufacturer,
const string& desc, const uInt16 maxlines)
{
const int lwidth = _font.getStringWidth("Manufacturer "),
fwidth = _w - lwidth - 20;
EditTextWidget* w = nullptr;
ostringstream buf;
int x = 10, y = 10;
// Add ROM size, manufacturer and bankswitch info
new StaticTextWidget(_boss, _font, x, y, lwidth,
myFontHeight, "ROM Size ", kTextAlignLeft);
buf << bytes << " bytes";
if(bytes >= 1024)
buf << " / " << (bytes/1024) << "KB";
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
fwidth, myLineHeight, buf.str());
w->setEditable(false);
y += myLineHeight + 4;
new StaticTextWidget(_boss, _font, x, y, lwidth,
myFontHeight, "Manufacturer ", kTextAlignLeft);
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
fwidth, myLineHeight, manufacturer);
w->setEditable(false);
y += myLineHeight + 4;
StringParser bs(desc, (fwidth - kScrollBarWidth) / myFontWidth - 4);
const StringList& sl = bs.stringList();
uInt32 lines = uInt32(sl.size());
if(lines < 3) lines = 3;
if(lines > maxlines) lines = maxlines;
new StaticTextWidget(_boss, _font, x, y, lwidth,
myFontHeight, "Description ", kTextAlignLeft);
myDesc = new StringListWidget(_boss, _nfont, x+lwidth, y,
fwidth, lines * myLineHeight, false);
myDesc->setEditable(false);
myDesc->setList(sl);
addFocusWidget(myDesc);
y += myDesc->getHeight() + 4;
return y;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartDebugWidget::invalidate()
{
sendCommand(RomWidget::kInvalidateListing, -1, -1);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartDebugWidget::loadConfig()
{
myDesc->setSelected(0);
}

77
src/debugger/gui/CartDebugWidget.hxx
View File

@ -20,93 +20,36 @@
class GuiObject; class GuiObject;
class ButtonWidget; class ButtonWidget;
class StringListWidget;
#include "Base.hxx" namespace GUI {
#include "Font.hxx" class Font;
}
#include "Base.hxx" // not needed here, but all child classes need it
#include "Command.hxx" #include "Command.hxx"
#include "Debugger.hxx"
#include "RomWidget.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "EditTextWidget.hxx"
#include "StringListWidget.hxx"
#include "StringParser.hxx"
class CartDebugWidget : public Widget, public CommandSender class CartDebugWidget : public Widget, public CommandSender
{ {
public: public:
CartDebugWidget(GuiObject* boss, const GUI::Font& lfont, CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont, const GUI::Font& nfont,
int x, int y, int w, int h) int x, int y, int w, int h);
: Widget(boss, lfont, x, y, w, h),
CommandSender(boss),
_nfont(nfont),
myFontWidth(lfont.getMaxCharWidth()),
myFontHeight(lfont.getFontHeight()),
myLineHeight(lfont.getLineHeight()),
myButtonHeight(myLineHeight + 4),
myDesc(nullptr) { }
virtual ~CartDebugWidget() = default; virtual ~CartDebugWidget() = default;
public: public:
int addBaseInformation(int bytes, const string& manufacturer, int addBaseInformation(int bytes, const string& manufacturer,
const string& desc, const uInt16 maxlines = 10) const string& desc, const uInt16 maxlines = 10);
{
const int lwidth = _font.getStringWidth("Manufacturer "),
fwidth = _w - lwidth - 20;
EditTextWidget* w = nullptr;
ostringstream buf;
int x = 10, y = 10;
// Add ROM size, manufacturer and bankswitch info
new StaticTextWidget(_boss, _font, x, y, lwidth,
myFontHeight, "ROM Size ", kTextAlignLeft);
buf << bytes << " bytes";
if(bytes >= 1024)
buf << " / " << (bytes/1024) << "KB";
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
fwidth, myLineHeight, buf.str());
w->setEditable(false);
y += myLineHeight + 4;
new StaticTextWidget(_boss, _font, x, y, lwidth,
myFontHeight, "Manufacturer ", kTextAlignLeft);
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
fwidth, myLineHeight, manufacturer);
w->setEditable(false);
y += myLineHeight + 4;
StringParser bs(desc, (fwidth - kScrollBarWidth) / myFontWidth - 4);
const StringList& sl = bs.stringList();
uInt32 lines = uInt32(sl.size());
if(lines < 3) lines = 3;
if(lines > maxlines) lines = maxlines;
new StaticTextWidget(_boss, _font, x, y, lwidth,
myFontHeight, "Description ", kTextAlignLeft);
myDesc = new StringListWidget(_boss, _nfont, x+lwidth, y,
fwidth, lines * myLineHeight, false);
myDesc->setEditable(false);
myDesc->setList(sl);
addFocusWidget(myDesc);
y += myDesc->getHeight() + 4;
return y;
}
// Inform the ROM Widget that the underlying cart has somehow changed // Inform the ROM Widget that the underlying cart has somehow changed
void invalidate() void invalidate();
{
sendCommand(RomWidget::kInvalidateListing, -1, -1);
}
// Some carts need to save old state in the debugger, so that we can // Some carts need to save old state in the debugger, so that we can
// implement change tracking; most carts probably won't do anything here // implement change tracking; most carts probably won't do anything here
virtual void saveOldState() { } virtual void saveOldState() { }
virtual void loadConfig() override { myDesc->setSelected(0); } virtual void loadConfig() override;
virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) override { } virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) override { }
// Query internal state of the cart (usually just bankswitching info) // Query internal state of the cart (usually just bankswitching info)

2
src/debugger/gui/CartEFSCWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartEFSC.hxx" #include "CartEFSC.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartEFSCWidget.hxx" #include "CartEFSCWidget.hxx"

2
src/debugger/gui/CartF4SCWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartF4SC.hxx" #include "CartF4SC.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartF4SCWidget.hxx" #include "CartF4SCWidget.hxx"

2
src/debugger/gui/CartF6SCWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartF6SC.hxx" #include "CartF6SC.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartF6SCWidget.hxx" #include "CartF6SCWidget.hxx"

2
src/debugger/gui/CartF8SCWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartF8SC.hxx" #include "CartF8SC.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartF8SCWidget.hxx" #include "CartF8SCWidget.hxx"

2
src/debugger/gui/CartFA2Widget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartFA2.hxx" #include "CartFA2.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartFA2Widget.hxx" #include "CartFA2Widget.hxx"

2
src/debugger/gui/CartFAWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartFA.hxx" #include "CartFA.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartFAWidget.hxx" #include "CartFAWidget.hxx"

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

@ -19,8 +19,10 @@
#include "GuiObject.hxx" #include "GuiObject.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "StringParser.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "StringListWidget.hxx"
#include "CartDebugWidget.hxx"
#include "CartRamWidget.hxx" #include "CartRamWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/debugger/gui/CartRamWidget.hxx
View File

@ -22,8 +22,8 @@ class GuiObject;
class DataGridOpsWidget; class DataGridOpsWidget;
class StringListWidget; class StringListWidget;
class InternalRamWidget; class InternalRamWidget;
class CartDebugWidget;
#include "CartDebugWidget.hxx"
#include "RamWidget.hxx" #include "RamWidget.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"

2
src/debugger/gui/CartWDWidget.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "CartWD.hxx" #include "CartWD.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "CartWDWidget.hxx" #include "CartWDWidget.hxx"

3
src/debugger/gui/DataGridWidget.hxx
View File

@ -20,10 +20,9 @@
class DataGridOpsWidget; class DataGridOpsWidget;
class ScrollBarWidget; class ScrollBarWidget;
class CommandSender;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx"
#include "Debugger.hxx"
#include "EditableWidget.hxx" #include "EditableWidget.hxx"
#include "Base.hxx" #include "Base.hxx"
#include "Rect.hxx" #include "Rect.hxx"

3
src/debugger/gui/DrivingWidget.hxx
View File

@ -18,12 +18,11 @@
#ifndef DRIVING_WIDGET_HXX #ifndef DRIVING_WIDGET_HXX
#define DRIVING_WIDGET_HXX #define DRIVING_WIDGET_HXX
class Controller;
class ButtonWidget; class ButtonWidget;
class CheckboxWidget; class CheckboxWidget;
class DataGridWidget; class DataGridWidget;
#include "Control.hxx"
#include "Event.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"
class DrivingWidget : public ControllerWidget class DrivingWidget : public ControllerWidget

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

@ -15,9 +15,9 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "FlashWidget.hxx"
#include "MT24LC256.hxx"
#include "Base.hxx" #include "Base.hxx"
#include "MT24LC256.hxx"
#include "FlashWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FlashWidget::FlashWidget(GuiObject* boss, const GUI::Font& font, FlashWidget::FlashWidget(GuiObject* boss, const GUI::Font& font,

2
src/debugger/gui/FlashWidget.hxx
View File

@ -18,9 +18,9 @@
#ifndef FLASH_WIDGET_HXX #ifndef FLASH_WIDGET_HXX
#define FLASH_WIDGET_HXX #define FLASH_WIDGET_HXX
class Controller;
class ButtonWidget; class ButtonWidget;
#include "Control.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"
class FlashWidget : public ControllerWidget class FlashWidget : public ControllerWidget

2
src/debugger/gui/GenesisWidget.cxx
View File

@ -15,8 +15,6 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "EventHandler.hxx"
#include "GenesisWidget.hxx" #include "GenesisWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/debugger/gui/GenesisWidget.hxx
View File

@ -19,7 +19,6 @@
#define GENESIS_WIDGET_HXX #define GENESIS_WIDGET_HXX
#include "Control.hxx" #include "Control.hxx"
#include "Event.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"
class GenesisWidget : public ControllerWidget class GenesisWidget : public ControllerWidget

2
src/debugger/gui/JoystickWidget.cxx
View File

@ -15,8 +15,6 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "EventHandler.hxx"
#include "JoystickWidget.hxx" #include "JoystickWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/debugger/gui/JoystickWidget.hxx
View File

@ -19,7 +19,6 @@
#define JOYSTICK_WIDGET_HXX #define JOYSTICK_WIDGET_HXX
#include "Control.hxx" #include "Control.hxx"
#include "Event.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"
class JoystickWidget : public ControllerWidget class JoystickWidget : public ControllerWidget

1
src/debugger/gui/KeyboardWidget.cxx
View File

@ -15,7 +15,6 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"
#include "KeyboardWidget.hxx" #include "KeyboardWidget.hxx"

1
src/debugger/gui/KeyboardWidget.hxx
View File

@ -18,7 +18,6 @@
#ifndef KEYBOARD_WIDGET_HXX #ifndef KEYBOARD_WIDGET_HXX
#define KEYBOARD_WIDGET_HXX #define KEYBOARD_WIDGET_HXX
#include "Control.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"

2
src/debugger/gui/PaddleWidget.cxx
View File

@ -15,9 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "Paddles.hxx" #include "Paddles.hxx"
#include "EventHandler.hxx"
#include "PaddleWidget.hxx" #include "PaddleWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
src/debugger/gui/PaddleWidget.hxx
View File

@ -18,8 +18,8 @@
#ifndef PADDLE_WIDGET_HXX #ifndef PADDLE_WIDGET_HXX
#define PADDLE_WIDGET_HXX #define PADDLE_WIDGET_HXX
#include "Control.hxx" class Controller;
#include "Event.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"
class PaddleWidget : public ControllerWidget class PaddleWidget : public ControllerWidget

2
src/debugger/gui/PointingDeviceWidget.hxx
View File

@ -18,9 +18,9 @@
#ifndef POINTINGDEVICE_WIDGET_HXX #ifndef POINTINGDEVICE_WIDGET_HXX
#define POINTINGDEVICE_WIDGET_HXX #define POINTINGDEVICE_WIDGET_HXX
class Controller;
class DataGridWidget; class DataGridWidget;
#include "Control.hxx"
#include "ControllerWidget.hxx" #include "ControllerWidget.hxx"
class PointingDeviceWidget : public ControllerWidget class PointingDeviceWidget : public ControllerWidget

2
src/debugger/gui/PromptWidget.hxx
View File

@ -18,7 +18,7 @@
#ifndef PROMPT_WIDGET_HXX #ifndef PROMPT_WIDGET_HXX
#define PROMPT_WIDGET_HXX #define PROMPT_WIDGET_HXX
#include <stdarg.h> #include <cstdarg>
class ScrollBarWidget; class ScrollBarWidget;
class FilesystemNode; class FilesystemNode;

6
src/debugger/gui/RamWidget.cxx
View File

@ -20,6 +20,7 @@
#include "GuiObject.hxx" #include "GuiObject.hxx"
#include "InputTextDialog.hxx" #include "InputTextDialog.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "Widget.hxx" #include "Widget.hxx"
@ -157,6 +158,11 @@ RamWidget::RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n
if(_h == 0) _h = ypos + myLineHeight - y; if(_h == 0) _h = ypos + myLineHeight - y;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RamWidget::~RamWidget()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id) void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
{ {

4
src/debugger/gui/RamWidget.hxx
View File

@ -24,10 +24,10 @@ class DataGridWidget;
class DataGridOpsWidget; class DataGridOpsWidget;
class EditTextWidget; class EditTextWidget;
class StaticTextWidget; class StaticTextWidget;
class InputTextDialog;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "InputTextDialog.hxx"
class RamWidget : public Widget, public CommandSender class RamWidget : public Widget, public CommandSender
{ {
@ -35,7 +35,7 @@ class RamWidget : public Widget, public CommandSender
RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont, RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, int x, int y, int w, int h,
uInt32 ramsize, uInt32 numrows, uInt32 pagesize); uInt32 ramsize, uInt32 numrows, uInt32 pagesize);
virtual ~RamWidget() = default; virtual ~RamWidget();
void loadConfig() override; void loadConfig() override;
void setOpsWidget(DataGridOpsWidget* w); void setOpsWidget(DataGridOpsWidget* w);

2
src/debugger/gui/RiotRamWidget.hxx
View File

@ -25,8 +25,8 @@ class DataGridWidget;
class DataGridOpsWidget; class DataGridOpsWidget;
class EditTextWidget; class EditTextWidget;
class StaticTextWidget; class StaticTextWidget;
class CartDebug;
#include "CartDebug.hxx"
#include "RamWidget.hxx" #include "RamWidget.hxx"
class RiotRamWidget : public RamWidget class RiotRamWidget : public RamWidget

1
src/debugger/gui/RiotWidget.cxx
View File

@ -21,6 +21,7 @@
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "GuiObject.hxx" #include "GuiObject.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Debugger.hxx"
#include "RiotDebug.hxx" #include "RiotDebug.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "ToggleBitWidget.hxx" #include "ToggleBitWidget.hxx"

3
src/debugger/gui/RiotWidget.hxx
View File

@ -24,8 +24,9 @@ class DataGridWidget;
class PopUpWidget; class PopUpWidget;
class ToggleBitWidget; class ToggleBitWidget;
class ControllerWidget; class ControllerWidget;
class Controller;
#include "Control.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
class RiotWidget : public Widget, public CommandSender class RiotWidget : public Widget, public CommandSender

2
src/debugger/gui/RomListWidget.hxx
View File

@ -21,11 +21,11 @@
class ScrollBarWidget; class ScrollBarWidget;
class PackedBitArray; class PackedBitArray;
class CheckListWidget; class CheckListWidget;
class RomListSettings;
#include "Base.hxx" #include "Base.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "EditableWidget.hxx" #include "EditableWidget.hxx"
#include "RomListSettings.hxx"
/** RomListWidget */ /** RomListWidget */
class RomListWidget : public EditableWidget class RomListWidget : public EditableWidget

8
src/debugger/gui/RomWidget.cxx
View File

@ -15,8 +15,6 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include <sstream>
#include "Settings.hxx" #include "Settings.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
@ -228,3 +226,9 @@ void RomWidget::patchROM(int disasm_line, const string& bytes,
Common::Base::setFormat(oldbase); Common::Base::setFormat(oldbase);
} }
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RomWidget::scrollTo(int line)
{
myRomList->setSelected(line);
}

5
src/debugger/gui/RomWidget.hxx
View File

@ -20,10 +20,11 @@
class GuiObject; class GuiObject;
class EditTextWidget; class EditTextWidget;
class RomListWidget;
#include "Base.hxx" #include "Base.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "RomListWidget.hxx" #include "Widget.hxx"
class RomWidget : public Widget, public CommandSender class RomWidget : public Widget, public CommandSender
{ {
@ -41,7 +42,7 @@ class RomWidget : public Widget, public CommandSender
void invalidate(bool forcereload = true) void invalidate(bool forcereload = true)
{ myListIsDirty = true; if(forcereload) loadConfig(); } { myListIsDirty = true; if(forcereload) loadConfig(); }
void scrollTo(int line) { myRomList->setSelected(line); } void scrollTo(int line);
private: private:
void handleCommand(CommandSender* sender, int cmd, int data, int id) override; void handleCommand(CommandSender* sender, int cmd, int data, int id) override;

3
src/debugger/gui/SaveKeyWidget.hxx
View File

@ -18,7 +18,8 @@
#ifndef SAVEKEY_WIDGET_HXX #ifndef SAVEKEY_WIDGET_HXX
#define SAVEKEY_WIDGET_HXX #define SAVEKEY_WIDGET_HXX
#include "Control.hxx" class Controller;
#include "FlashWidget.hxx" #include "FlashWidget.hxx"
class SaveKeyWidget : public FlashWidget class SaveKeyWidget : public FlashWidget

1
src/debugger/gui/TiaInfoWidget.hxx
View File

@ -20,6 +20,7 @@
class GuiObject; class GuiObject;
class EditTextWidget; class EditTextWidget;
class CheckboxWidget;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"

1
src/debugger/gui/TiaWidget.cxx
View File

@ -21,6 +21,7 @@
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "GuiObject.hxx" #include "GuiObject.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "TIA.hxx" #include "TIA.hxx"
#include "TIADebug.hxx" #include "TIADebug.hxx"

3
src/debugger/gui/TrakBallWidget.hxx
View File

@ -18,7 +18,8 @@
#ifndef TRAKBALL_WIDGET_HXX #ifndef TRAKBALL_WIDGET_HXX
#define TRAKBALL_WIDGET_HXX #define TRAKBALL_WIDGET_HXX
#include "Control.hxx" class Controller;
#include "PointingDeviceWidget.hxx" #include "PointingDeviceWidget.hxx"
class TrakBallWidget : public PointingDeviceWidget class TrakBallWidget : public PointingDeviceWidget

1
src/debugger/gui/module.mk
View File

@ -48,6 +48,7 @@ MODULE_OBJS := \
src/debugger/gui/CartUAWidget.o \ src/debugger/gui/CartUAWidget.o \
src/debugger/gui/CartWDWidget.o \ src/debugger/gui/CartWDWidget.o \
src/debugger/gui/CartX07Widget.o \ src/debugger/gui/CartX07Widget.o \
src/debugger/gui/CartDebugWidget.o \
src/debugger/gui/CpuWidget.o \ src/debugger/gui/CpuWidget.o \
src/debugger/gui/DataGridOpsWidget.o \ src/debugger/gui/DataGridOpsWidget.o \
src/debugger/gui/DataGridWidget.o \ src/debugger/gui/DataGridWidget.o \

3
src/emucore/FrameBuffer.cxx
View File

@ -15,9 +15,6 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include <algorithm>
#include <sstream>
#include "bspf.hxx" #include "bspf.hxx"
#include "CommandMenu.hxx" #include "CommandMenu.hxx"