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

(mostly) implemented #326 

TODO: use empty buttons
This commit is contained in:
thrust26 2018-12-28 17:42:19 +01:00
parent 84300914cc
commit b5f5ddefad
5 changed files with 115 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/StateManager.hxx
View File

@ -141,6 +141,11 @@ class StateManager
*/
void reset();
/**
Returns the current slot number
*/
int currentSlot() const { return myCurrentSlot; }
/**
The rewind facility for the state manager
*/

11
src/emucore/Console.hxx
View File

@ -194,6 +194,11 @@ class Console : public Serializable
*/
void setFormat(uInt32 format);
/**
Get NTSC/PAL/SECAM (and variants) display format name
*/
string getFormatString() const { return myDisplayFormat; }
/**
Toggle between the available palettes.
*/
@ -358,12 +363,6 @@ class Console : public Serializable
*/
void generateColorLossPalette();
/**
Returns a pointer to the palette data for the palette currently defined
by the ROM properties.
*/
const uInt32* getPalette(int direction) const;
void toggleTIABit(TIABit bit, const string& bitname, bool show = true) const;
void toggleTIACollision(TIABit bit, const string& bitname, bool show = true) const;

4
src/emucore/EventHandler.cxx
View File

@ -450,7 +450,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 state)
if(state && !myIs7800)
{
myEvent.set(Event::ConsoleColor, 0);
myOSystem.frameBuffer().showMessage("BW Mode");
myOSystem.frameBuffer().showMessage("B/W Mode");
}
break;
case Event::ConsoleColorToggle:
@ -460,7 +460,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 state)
{
myEvent.set(Event::ConsoleBlackWhite, 1);
myEvent.set(Event::ConsoleColor, 0);
myOSystem.frameBuffer().showMessage("BW Mode");
myOSystem.frameBuffer().showMessage("B/W Mode");
}
else
{

145
src/gui/CommandDialog.cxx
View File

@ -21,6 +21,7 @@
#include "Dialog.hxx"
#include "Font.hxx"
#include "EventHandler.hxx"
#include "StateManager.hxx"
#include "OSystem.hxx"
#include "Widget.hxx"
#include "CommandDialog.hxx"
@ -29,65 +30,94 @@
CommandDialog::CommandDialog(OSystem& osystem, DialogContainer& parent)
: Dialog(osystem, parent, osystem.frameBuffer().font(), "Commands")
{
const int buttonWidth = _font.getStringWidth("Right Diff B") + 20,
const int HBORDER = 10;
const int buttonWidth = _font.getStringWidth("Stella Palette") + 20,
buttonHeight = _font.getLineHeight() + 6,
rowHeight = buttonHeight + 8;
// Set real dimensions
_w = 3 * (buttonWidth + 5) + 20;
_w = 3 * (buttonWidth + 5) + HBORDER * 2;
_h = 6 * rowHeight + 8 + _th;
ButtonWidget* bw;
WidgetArray wid;
ButtonWidget* b[16];
int xoffset = 10, yoffset = 8 + _th;
int xoffset = HBORDER, yoffset = 8 + _th;
auto ADD_CD_BUTTON = [&](const string& label, int cmd)
{
ButtonWidget* bw = new ButtonWidget(this, _font, xoffset, yoffset,
buttonWidth, buttonHeight, label, cmd);
xoffset += buttonWidth + 8;
yoffset += buttonHeight + 8;
return bw;
};
// Row 1
b[0] = ADD_CD_BUTTON("Select", kSelectCmd);
b[4] = ADD_CD_BUTTON("Left Diff A", kLeftDiffACmd);
b[8] = ADD_CD_BUTTON("Save State", kSaveStateCmd);
// Column 1
bw = ADD_CD_BUTTON("Select", kSelectCmd);
wid.push_back(bw);
bw = ADD_CD_BUTTON("Reset", kResetCmd);
wid.push_back(bw);
myColorButton = ADD_CD_BUTTON("Color TV", kColorCmd);
wid.push_back(myColorButton);
myLeftDiffButton = ADD_CD_BUTTON("Left Diff X", kLeftDiffCmd);
wid.push_back(myLeftDiffButton);
myRightDiffButton = ADD_CD_BUTTON("Left Diff X", kLeftDiffCmd);
wid.push_back(myRightDiffButton);
// Row 2
xoffset = 10; yoffset += buttonHeight + 8;
b[1] = ADD_CD_BUTTON("Reset", kResetCmd);
b[5] = ADD_CD_BUTTON("Left Diff B", kLeftDiffBCmd);
b[9] = ADD_CD_BUTTON("State Slot", kStateSlotCmd);
// Column 2
xoffset += buttonWidth + 8;
yoffset = 8 + _th;
// Row 3
xoffset = 10; yoffset += buttonHeight + 8;
b[2] = ADD_CD_BUTTON("Color TV", kColorCmd);
b[6] = ADD_CD_BUTTON("Right Diff A", kRightDiffACmd);
b[10] = ADD_CD_BUTTON("Load State", kLoadStateCmd);
mySaveStateButton = ADD_CD_BUTTON("Save State", kSaveStateCmd);
wid.push_back(mySaveStateButton);
myStateSlotButton = ADD_CD_BUTTON("State Slot", kStateSlotCmd);
wid.push_back(myStateSlotButton);
myLoadStateButton = ADD_CD_BUTTON("Load State", kLoadStateCmd);
wid.push_back(myLoadStateButton);
bw = ADD_CD_BUTTON("Snapshot", kSnapshotCmd);
wid.push_back(bw);
bw = ADD_CD_BUTTON("TODO", 0);
wid.push_back(bw);
bw = ADD_CD_BUTTON("Exit Game", kExitCmd);
wid.push_back(bw);
// Row 4
xoffset = 10; yoffset += buttonHeight + 8;
b[3] = ADD_CD_BUTTON("B/W TV", kBWCmd);
b[7] = ADD_CD_BUTTON("Right Diff B", kRightDiffBCmd);
b[11] = ADD_CD_BUTTON("Snapshot", kSnapshotCmd);
// Column 3
xoffset += buttonWidth + 8;
yoffset = 8 + _th;
// Row 5
xoffset = 10; yoffset += buttonHeight + 8;
b[12] = ADD_CD_BUTTON("TV Format", kFormatCmd);
b[13] = ADD_CD_BUTTON("Palette", kPaletteCmd);
b[14] = ADD_CD_BUTTON("Reload ROM", kReloadRomCmd);
// Row 6
xoffset = 10 + buttonWidth + 8; yoffset += buttonHeight + 8;
b[15] = ADD_CD_BUTTON("Exit Game", kExitCmd);
for(int i = 0; i < 16; ++i)
wid.push_back(b[i]);
myTVFormatButton = ADD_CD_BUTTON("SECAM-60", kFormatCmd);
wid.push_back(myTVFormatButton);
myPaletteButton = ADD_CD_BUTTON("Stella Palette", kPaletteCmd);
wid.push_back(myPaletteButton);
bw = ADD_CD_BUTTON("TODO", 0);
wid.push_back(bw);
bw = ADD_CD_BUTTON("TODO", 0);
wid.push_back(bw);
bw = ADD_CD_BUTTON("Reload ROM", kReloadRomCmd);
wid.push_back(bw);
addToFocusList(wid);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CommandDialog::loadConfig()
{
myColorButton->setLabel(instance().console().switches().tvColor() ? "Color Mode" : "B/W Mode");
myLeftDiffButton->setLabel(instance().console().switches().leftDifficultyA() ? "Left Diff A" : "Left Diff B");
myRightDiffButton->setLabel(instance().console().switches().rightDifficultyA() ? "Right Diff A" : "Right Diff B");
updateSlot(instance().state().currentSlot());
myTVFormatButton->setLabel(instance().console().getFormatString() + " Mode");
string palette, label;
palette = instance().settings().getString("palette");
if(palette == "standard")
label = "Stella Palette";
else if(palette == "z26")
label = "Z26 Palette";
else
label = "User Palette";
myPaletteButton->setLabel(label);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CommandDialog::handleCommand(CommandSender* sender, int cmd,
int data, int id)
@ -108,32 +138,17 @@ void CommandDialog::handleCommand(CommandSender* sender, int cmd,
break;
case kColorCmd:
event = Event::ConsoleColor;
event = Event::ConsoleColorToggle;
consoleCmd = true;
break;
case kBWCmd:
event = Event::ConsoleBlackWhite;
case kLeftDiffCmd:
event = Event::ConsoleLeftDiffToggle;
consoleCmd = true;
break;
case kLeftDiffACmd:
event = Event::ConsoleLeftDiffA;
consoleCmd = true;
break;
case kLeftDiffBCmd:
event = Event::ConsoleLeftDiffB;
consoleCmd = true;
break;
case kRightDiffACmd:
event = Event::ConsoleRightDiffA;
consoleCmd = true;
break;
case kRightDiffBCmd:
event = Event::ConsoleRightDiffB;
case kRightDiffCmd:
event = Event::ConsoleRightDiffToggle;
consoleCmd = true;
break;
@ -143,10 +158,13 @@ void CommandDialog::handleCommand(CommandSender* sender, int cmd,
break;
case kStateSlotCmd:
{
event = Event::ChangeState;
stateCmd = true;
int slot = (instance().state().currentSlot() + 1) % 10;
updateSlot(slot);
break;
}
case kLoadStateCmd:
event = Event::LoadState;
consoleCmd = true;
@ -190,3 +208,14 @@ void CommandDialog::handleCommand(CommandSender* sender, int cmd,
else if(stateCmd)
instance().eventHandler().handleEvent(event, 1);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CommandDialog::updateSlot(int slot)
{
ostringstream buf;
buf << " " << slot;
mySaveStateButton->setLabel("Save State" + buf.str());
myStateSlotButton->setLabel("State Slot" + buf.str());
myLoadStateButton->setLabel("Load State" + buf.str());
}

21
src/gui/CommandDialog.hxx
View File

@ -32,17 +32,28 @@ class CommandDialog : public Dialog
virtual ~CommandDialog() = default;
protected:
void loadConfig() override;
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
void updateSlot(int slot);
// column 0
ButtonWidget* myColorButton;
ButtonWidget* myLeftDiffButton;
ButtonWidget* myRightDiffButton;
// column 1
ButtonWidget* mySaveStateButton;
ButtonWidget* myStateSlotButton;
ButtonWidget* myLoadStateButton;
// column 2
ButtonWidget* myTVFormatButton;
ButtonWidget* myPaletteButton;
enum {
kSelectCmd = 'Csel',
kResetCmd = 'Cres',
kColorCmd = 'Ccol',
kBWCmd = 'Cbwt',
kLeftDiffACmd = 'Clda',
kLeftDiffBCmd = 'Cldb',
kRightDiffACmd = 'Crda',
kRightDiffBCmd = 'Crdb',
kLeftDiffCmd = 'Cldf',
kRightDiffCmd = 'Crdf',
kSaveStateCmd = 'Csst',
kStateSlotCmd = 'Ccst',
kLoadStateCmd = 'Clst',