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

Cleaned up ContextMenu API wrt multiple setSelected methods; in some cases, 

it was confusing which one was being called.

Fixed output in debugger bankstate info; in some cases, hex numbers were shown
when decimal was required.

Fixed regression wrt the last TIA change (incorrect framerate counter); the
PAL autodetection was failing in certain cases.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2774 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-07-30 20:31:14 +00:00
parent 20b9253430
commit 4958e87c3e
35 changed files with 110 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ Cartridge0840Widget::Cartridge0840Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Cartridge0840Widget::loadConfig() void Cartridge0840Widget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -85,7 +85,7 @@ string Cartridge0840Widget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$800", "$840" }; static const char* spot[] = { "$800", "$840" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

10
src/debugger/gui/Cart3EWidget.cxx
View File

@ -92,13 +92,13 @@ void Cartridge3EWidget::loadConfig()
{ {
if(myCart.myCurrentBank < 256) if(myCart.myCurrentBank < 256)
{ {
myROMBank->setSelected(myCart.myCurrentBank % myNumRomBanks); myROMBank->setSelectedIndex(myCart.myCurrentBank % myNumRomBanks);
myRAMBank->setSelectedMax(); myRAMBank->setSelectedMax();
} }
else else
{ {
myROMBank->setSelectedMax(); myROMBank->setSelectedMax();
myRAMBank->setSelected(myCart.myCurrentBank - 256); myRAMBank->setSelectedIndex(myCart.myCurrentBank - 256);
} }
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
@ -120,7 +120,7 @@ void Cartridge3EWidget::handleCommand(CommandSender* sender,
else else
{ {
bank = 256; // default to first RAM bank bank = 256; // default to first RAM bank
myRAMBank->setSelected(0); myRAMBank->setSelectedIndex(0);
} }
} }
else if(cmd == kRAMBankChanged) else if(cmd == kRAMBankChanged)
@ -133,7 +133,7 @@ void Cartridge3EWidget::handleCommand(CommandSender* sender,
else else
{ {
bank = 0; // default to first ROM bank bank = 0; // default to first ROM bank
myROMBank->setSelected(0); myROMBank->setSelectedIndex(0);
} }
} }
@ -151,7 +151,7 @@ string Cartridge3EWidget::bankState()
uInt16& bank = myCart.myCurrentBank; uInt16& bank = myCart.myCurrentBank;
if(bank < 256) if(bank < 256)
buf << "ROM bank " << bank % myNumRomBanks << ", RAM inactive"; buf << "ROM bank " << dec << bank % myNumRomBanks << ", RAM inactive";
else else
buf << "ROM inactive, RAM bank " << bank % myNumRomBanks; buf << "ROM inactive, RAM bank " << bank % myNumRomBanks;

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

@ -62,7 +62,7 @@ Cartridge3FWidget::Cartridge3FWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void Cartridge3FWidget::loadConfig() void Cartridge3FWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -85,7 +85,7 @@ string Cartridge3FWidget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Bank = " << myCart.myCurrentBank << ", hotspot = $3F"; buf << "Bank = " << dec << myCart.myCurrentBank << ", hotspot = $3F";
return buf.str(); return buf.str();
} }

26
src/debugger/gui/Cart4A50Widget.cxx
View File

@ -131,37 +131,37 @@ void Cartridge4A50Widget::loadConfig()
// Lower bank // Lower bank
if(myCart.myIsRomLow) // ROM active if(myCart.myIsRomLow) // ROM active
{ {
myROMLower->setSelected((myCart.mySliceLow >> 11) & 0x1F); myROMLower->setSelectedIndex((myCart.mySliceLow >> 11) & 0x1F);
myRAMLower->setSelectedMax(); myRAMLower->setSelectedMax();
} }
else // RAM active else // RAM active
{ {
myROMLower->setSelectedMax(); myROMLower->setSelectedMax();
myRAMLower->setSelected((myCart.mySliceLow >> 11) & 0x0F); myRAMLower->setSelectedIndex((myCart.mySliceLow >> 11) & 0x0F);
} }
// Middle bank // Middle bank
if(myCart.myIsRomMiddle) // ROM active if(myCart.myIsRomMiddle) // ROM active
{ {
myROMMiddle->setSelected((myCart.mySliceMiddle >> 11) & 0x1F); myROMMiddle->setSelectedIndex((myCart.mySliceMiddle >> 11) & 0x1F);
myRAMMiddle->setSelectedMax(); myRAMMiddle->setSelectedMax();
} }
else // RAM active else // RAM active
{ {
myROMMiddle->setSelectedMax(); myROMMiddle->setSelectedMax();
myRAMMiddle->setSelected((myCart.mySliceMiddle >> 11) & 0x0F); myRAMMiddle->setSelectedIndex((myCart.mySliceMiddle >> 11) & 0x0F);
} }
// High bank // High bank
if(myCart.myIsRomHigh) // ROM active if(myCart.myIsRomHigh) // ROM active
{ {
myROMHigh->setSelected((myCart.mySliceHigh >> 11) & 0xFF); myROMHigh->setSelectedIndex((myCart.mySliceHigh >> 11) & 0xFF);
myRAMHigh->setSelectedMax(); myRAMHigh->setSelectedMax();
} }
else // RAM active else // RAM active
{ {
myROMHigh->setSelectedMax(); myROMHigh->setSelectedMax();
myRAMHigh->setSelected((myCart.mySliceHigh >> 11) & 0x7F); myRAMHigh->setSelectedIndex((myCart.mySliceHigh >> 11) & 0x7F);
} }
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
@ -184,7 +184,7 @@ void Cartridge4A50Widget::handleCommand(CommandSender* sender,
else else
{ {
// default to first RAM bank // default to first RAM bank
myRAMLower->setSelected(0); myRAMLower->setSelectedIndex(0);
myCart.bankRAMLower(0); myCart.bankRAMLower(0);
} }
break; break;
@ -198,7 +198,7 @@ void Cartridge4A50Widget::handleCommand(CommandSender* sender,
else else
{ {
// default to first ROM bank // default to first ROM bank
myROMLower->setSelected(0); myROMLower->setSelectedIndex(0);
myCart.bankROMLower(0); myCart.bankROMLower(0);
} }
break; break;
@ -212,7 +212,7 @@ void Cartridge4A50Widget::handleCommand(CommandSender* sender,
else else
{ {
// default to first RAM bank // default to first RAM bank
myRAMMiddle->setSelected(0); myRAMMiddle->setSelectedIndex(0);
myCart.bankRAMMiddle(0); myCart.bankRAMMiddle(0);
} }
break; break;
@ -226,7 +226,7 @@ void Cartridge4A50Widget::handleCommand(CommandSender* sender,
else else
{ {
// default to first ROM bank // default to first ROM bank
myROMMiddle->setSelected(0); myROMMiddle->setSelectedIndex(0);
myCart.bankROMMiddle(0); myCart.bankROMMiddle(0);
} }
break; break;
@ -240,7 +240,7 @@ void Cartridge4A50Widget::handleCommand(CommandSender* sender,
else else
{ {
// default to first RAM bank // default to first RAM bank
myRAMHigh->setSelected(0); myRAMHigh->setSelectedIndex(0);
myCart.bankRAMHigh(0); myCart.bankRAMHigh(0);
} }
break; break;
@ -254,7 +254,7 @@ void Cartridge4A50Widget::handleCommand(CommandSender* sender,
else else
{ {
// default to first ROM bank // default to first ROM bank
myROMHigh->setSelected(0); myROMHigh->setSelectedIndex(0);
myCart.bankROMHigh(0); myCart.bankROMHigh(0);
} }
break; break;
@ -269,7 +269,7 @@ string Cartridge4A50Widget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "L/M/H = "; buf << "L/M/H = " << dec;
if(myCart.myIsRomLow) if(myCart.myIsRomLow)
buf << "ROM bank " << ((myCart.mySliceLow >> 11) & 0x1F) << " / "; buf << "ROM bank " << ((myCart.mySliceLow >> 11) & 0x1F) << " / ";
else else

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

@ -81,7 +81,7 @@ CartridgeARWidget::CartridgeARWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeARWidget::loadConfig() void CartridgeARWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -104,7 +104,7 @@ string CartridgeARWidget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Bank = " << myCart.myCurrentBank; buf << "Bank = " << dec << myCart.myCurrentBank;
return buf.str(); return buf.str();
} }

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

@ -156,7 +156,7 @@ void CartridgeCMWidget::saveOldState()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeCMWidget::loadConfig() void CartridgeCMWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
RiotDebug& riot = Debugger::debugger().riotDebug(); RiotDebug& riot = Debugger::debugger().riotDebug();
const RiotState& state = (RiotState&) riot.getState(); const RiotState& state = (RiotState&) riot.getState();
@ -217,7 +217,7 @@ string CartridgeCMWidget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", RAM is" << (myCart.mySWCHA & 0x10 ? " Inactive" : << ", RAM is" << (myCart.mySWCHA & 0x10 ? " Inactive" :
myCart.mySWCHA & 0x20 ? " Read-only" : " Write-only"); myCart.mySWCHA & 0x20 ? " Read-only" : " Write-only");

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

@ -58,7 +58,7 @@ CartridgeCTYWidget::CartridgeCTYWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeCTYWidget::loadConfig() void CartridgeCTYWidget::loadConfig()
{ {
myBank->setSelected(myCart.bank()-1); myBank->setSelectedIndex(myCart.bank()-1);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -85,7 +85,7 @@ string CartridgeCTYWidget::bankState()
"", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" "", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB"
}; };
uInt16 bank = myCart.bank(); uInt16 bank = myCart.bank();
buf << "Bank = " << bank << ", hotspot = " << spot[bank]; buf << "Bank = " << dec << bank << ", hotspot = " << spot[bank];
return buf.str(); return buf.str();
} }

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

@ -216,7 +216,7 @@ void CartridgeDPCPlusWidget::saveOldState()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeDPCPlusWidget::loadConfig() void CartridgeDPCPlusWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
// Get registers, using change tracking // Get registers, using change tracking
IntArray alist; IntArray alist;
@ -325,7 +325,7 @@ string CartridgeDPCPlusWidget::bankState()
static const char* spot[] = { static const char* spot[] = {
"$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB"
}; };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -157,7 +157,7 @@ void CartridgeDPCWidget::saveOldState()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeDPCWidget::loadConfig() void CartridgeDPCWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
// Get registers, using change tracking // Get registers, using change tracking
IntArray alist; IntArray alist;
@ -229,7 +229,7 @@ string CartridgeDPCWidget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$FF8", "$FF9" }; static const char* spot[] = { "$FF8", "$FF9" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -100,9 +100,9 @@ CartridgeE0Widget::CartridgeE0Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeE0Widget::loadConfig() void CartridgeE0Widget::loadConfig()
{ {
mySlice0->setSelected(myCart.myCurrentSlice[0]); mySlice0->setSelectedIndex(myCart.myCurrentSlice[0]);
mySlice1->setSelected(myCart.myCurrentSlice[1]); mySlice1->setSelectedIndex(myCart.myCurrentSlice[1]);
mySlice2->setSelected(myCart.myCurrentSlice[2]); mySlice2->setSelectedIndex(myCart.myCurrentSlice[2]);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -135,7 +135,7 @@ string CartridgeE0Widget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Slices: " buf << "Slices: " << dec
<< seg0[myCart.myCurrentSlice[0]] << " / " << seg0[myCart.myCurrentSlice[0]] << " / "
<< seg1[myCart.myCurrentSlice[1]] << " / " << seg1[myCart.myCurrentSlice[1]] << " / "
<< seg2[myCart.myCurrentSlice[2]]; << seg2[myCart.myCurrentSlice[2]];

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

@ -86,8 +86,8 @@ CartridgeE7Widget::CartridgeE7Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeE7Widget::loadConfig() void CartridgeE7Widget::loadConfig()
{ {
myLower2K->setSelected(myCart.myCurrentSlice[0]); myLower2K->setSelectedIndex(myCart.myCurrentSlice[0]);
myUpper256B->setSelected(myCart.myCurrentRAM); myUpper256B->setSelectedIndex(myCart.myCurrentRAM);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -117,7 +117,7 @@ string CartridgeE7Widget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Slices: " buf << "Slices: " << dec
<< spot_lower[myCart.myCurrentSlice[0]] << " / " << spot_lower[myCart.myCurrentSlice[0]] << " / "
<< spot_upper[myCart.myCurrentRAM]; << spot_upper[myCart.myCurrentRAM];

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

@ -77,7 +77,7 @@ CartridgeEFSCWidget::CartridgeEFSCWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeEFSCWidget::loadConfig() void CartridgeEFSCWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -104,7 +104,7 @@ string CartridgeEFSCWidget::bankState()
"$FE0", "$FE1", "$FE2", "$FE3", "$FE4", "$FE5", "$FE6", "$FE7", "$FE0", "$FE1", "$FE2", "$FE3", "$FE4", "$FE5", "$FE6", "$FE7",
"$FE8", "$FE9", "$FEA", "$FEB", "$FEC", "$FED", "$FEE", "$FEF" "$FE8", "$FE9", "$FEA", "$FEB", "$FEC", "$FED", "$FEE", "$FEF"
}; };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -75,7 +75,7 @@ CartridgeEFWidget::CartridgeEFWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeEFWidget::loadConfig() void CartridgeEFWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -102,7 +102,7 @@ string CartridgeEFWidget::bankState()
"$FE0", "$FE1", "$FE2", "$FE3", "$FE4", "$FE5", "$FE6", "$FE7", "$FE0", "$FE1", "$FE2", "$FE3", "$FE4", "$FE5", "$FE6", "$FE7",
"$FE8", "$FE9", "$FEA", "$FEB", "$FEC", "$FED", "$FEE", "$FEF" "$FE8", "$FE9", "$FEA", "$FEB", "$FEC", "$FED", "$FEE", "$FEF"
}; };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -76,7 +76,7 @@ CartridgeF0Widget::CartridgeF0Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF0Widget::loadConfig() void CartridgeF0Widget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -99,7 +99,7 @@ string CartridgeF0Widget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Bank = " << myCart.myCurrentBank << ", hotspot = $FF0"; buf << "Bank = " << dec << myCart.myCurrentBank << ", hotspot = $FF0";
return buf.str(); return buf.str();
} }

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

@ -68,7 +68,7 @@ CartridgeF4SCWidget::CartridgeF4SCWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF4SCWidget::loadConfig() void CartridgeF4SCWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -94,7 +94,7 @@ string CartridgeF4SCWidget::bankState()
static const char* spot[] = { static const char* spot[] = {
"$FF4", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" "$FF4", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB"
}; };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -66,7 +66,7 @@ CartridgeF4Widget::CartridgeF4Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF4Widget::loadConfig() void CartridgeF4Widget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -92,7 +92,7 @@ string CartridgeF4Widget::bankState()
static const char* spot[] = { static const char* spot[] = {
"$FF4", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" "$FF4", "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB"
}; };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -64,7 +64,7 @@ CartridgeF6SCWidget::CartridgeF6SCWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF6SCWidget::loadConfig() void CartridgeF6SCWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -88,7 +88,7 @@ string CartridgeF6SCWidget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$FF6", "$FF7", "$FF8", "$FF9" }; static const char* spot[] = { "$FF6", "$FF7", "$FF8", "$FF9" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -62,7 +62,7 @@ CartridgeF6Widget::CartridgeF6Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF6Widget::loadConfig() void CartridgeF6Widget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -86,7 +86,7 @@ string CartridgeF6Widget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$FF6", "$FF7", "$FF8", "$FF9" }; static const char* spot[] = { "$FF6", "$FF7", "$FF8", "$FF9" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -62,7 +62,7 @@ CartridgeF8SCWidget::CartridgeF8SCWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF8SCWidget::loadConfig() void CartridgeF8SCWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -86,7 +86,7 @@ string CartridgeF8SCWidget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$FF8", "$FF9" }; static const char* spot[] = { "$FF8", "$FF9" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -60,7 +60,7 @@ CartridgeF8Widget::CartridgeF8Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeF8Widget::loadConfig() void CartridgeF8Widget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -84,7 +84,7 @@ string CartridgeF8Widget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$FF8", "$FF9" }; static const char* spot[] = { "$FF8", "$FF9" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -100,7 +100,7 @@ CartridgeFA2Widget::CartridgeFA2Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeFA2Widget::loadConfig() void CartridgeFA2Widget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -140,7 +140,7 @@ string CartridgeFA2Widget::bankState()
static const char* spot[] = { static const char* spot[] = {
"$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB" "$FF5", "$FF6", "$FF7", "$FF8", "$FF9", "$FFA", "$FFB"
}; };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -63,7 +63,7 @@ CartridgeFAWidget::CartridgeFAWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeFAWidget::loadConfig() void CartridgeFAWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -87,7 +87,7 @@ string CartridgeFAWidget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$FF8", "$FF9", "$FFA" }; static const char* spot[] = { "$FF8", "$FF9", "$FFA" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

3
src/debugger/gui/CartFEWidget.cxx
View File

@ -46,7 +46,8 @@ string CartridgeFEWidget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* range[] = { "$F000", "$D000" }; static const char* range[] = { "$F000", "$D000" };
buf << "Bank = " << myCart.bank() << ", address range = " << range[myCart.bank()]; buf << "Bank = " << dec << myCart.bank()
<< ", address range = " << range[myCart.bank()];
return buf.str(); return buf.str();
} }

10
src/debugger/gui/CartMCWidget.cxx
View File

@ -98,10 +98,10 @@ CartridgeMCWidget::CartridgeMCWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeMCWidget::loadConfig() void CartridgeMCWidget::loadConfig()
{ {
mySlice0->setSelected(myCart.myCurrentBlock[0]); mySlice0->setSelectedIndex(myCart.myCurrentBlock[0]);
mySlice1->setSelected(myCart.myCurrentBlock[1]); mySlice1->setSelectedIndex(myCart.myCurrentBlock[1]);
mySlice2->setSelected(myCart.myCurrentBlock[2]); mySlice2->setSelectedIndex(myCart.myCurrentBlock[2]);
mySlice3->setSelected(myCart.myCurrentBlock[3]); mySlice3->setSelectedIndex(myCart.myCurrentBlock[3]);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -137,7 +137,7 @@ string CartridgeMCWidget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Slices: " buf << "Slices: " << dec
<< myCart.myCurrentBlock[0] << " / " << myCart.myCurrentBlock[0] << " / "
<< myCart.myCurrentBlock[1] << " / " << myCart.myCurrentBlock[1] << " / "
<< myCart.myCurrentBlock[2] << " / " << myCart.myCurrentBlock[2] << " / "

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

@ -67,7 +67,7 @@ CartridgeSBWidget::CartridgeSBWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeSBWidget::loadConfig() void CartridgeSBWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -90,7 +90,7 @@ string CartridgeSBWidget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = $" << Common::Base::HEX2 << (myCart.myCurrentBank + 0x800); << ", hotspot = $" << Common::Base::HEX2 << (myCart.myCurrentBank + 0x800);
return buf.str(); return buf.str();

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

@ -61,7 +61,7 @@ CartridgeUAWidget::CartridgeUAWidget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeUAWidget::loadConfig() void CartridgeUAWidget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -85,7 +85,7 @@ string CartridgeUAWidget::bankState()
ostringstream& buf = buffer(); ostringstream& buf = buffer();
static const char* spot[] = { "$200", "$240" }; static const char* spot[] = { "$200", "$240" };
buf << "Bank = " << myCart.myCurrentBank buf << "Bank = " << dec << myCart.myCurrentBank
<< ", hotspot = " << spot[myCart.myCurrentBank]; << ", hotspot = " << spot[myCart.myCurrentBank];
return buf.str(); return buf.str();

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

@ -77,7 +77,7 @@ CartridgeX07Widget::CartridgeX07Widget(
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeX07Widget::loadConfig() void CartridgeX07Widget::loadConfig()
{ {
myBank->setSelected(myCart.myCurrentBank); myBank->setSelectedIndex(myCart.myCurrentBank);
CartDebugWidget::loadConfig(); CartDebugWidget::loadConfig();
} }
@ -100,7 +100,7 @@ string CartridgeX07Widget::bankState()
{ {
ostringstream& buf = buffer(); ostringstream& buf = buffer();
buf << "Bank = " << myCart.myCurrentBank; buf << "Bank = " << dec << myCart.myCurrentBank;
return buf.str(); return buf.str();
} }

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

@ -325,9 +325,9 @@ void RiotWidget::loadConfig()
// Console switches (inverted, since 'selected' in the UI // Console switches (inverted, since 'selected' in the UI
// means 'grounded' in the system) // means 'grounded' in the system)
myP0Diff->setSelected((int)riot.diffP0()); myP0Diff->setSelectedIndex((int)riot.diffP0());
myP1Diff->setSelected((int)riot.diffP1()); myP1Diff->setSelectedIndex((int)riot.diffP1());
myTVType->setSelected((int)riot.tvType()); myTVType->setSelectedIndex((int)riot.tvType());
mySelect->setState(!riot.select()); mySelect->setState(!riot.select());
myReset->setState(!riot.reset()); myReset->setState(!riot.reset());

8
src/emucore/TIA.cxx
View File

@ -596,7 +596,11 @@ inline void TIA::startFrame()
} }
} }
myStartScanline = 0; myStartScanline = 0;
// Stats counters
myFrameCounter++; myFrameCounter++;
if(myScanlineCountForLastFrame >= 287)
myPALFrameCounter++;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -666,10 +670,6 @@ inline void TIA::endFrame()
if(offset > myStopDisplayOffset && offset < 228 * 320) if(offset > myStopDisplayOffset && offset < 228 * 320)
myStopDisplayOffset = offset; myStopDisplayOffset = offset;
} }
// Is this a PAL ROM?
if(myScanlineCountForLastFrame >= 287)
myPALFrameCounter++;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

14
src/gui/ContextMenu.cxx
View File

@ -84,7 +84,7 @@ void ContextMenu::show(uInt32 x, uInt32 y, int item)
recalc(instance().frameBuffer().imageRect()); recalc(instance().frameBuffer().imageRect());
open(); open();
setSelected(item); setSelectedIndex(item);
moveToSelected(); moveToSelected();
} }
@ -128,10 +128,10 @@ void ContextMenu::recalc(const GUI::Rect& image)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ContextMenu::setSelected(int item) void ContextMenu::setSelectedIndex(int idx)
{ {
if(item >= 0 && item < (int)_entries.size()) if(idx >= 0 && idx < (int)_entries.size())
_selectedItem = item; _selectedItem = idx;
else else
_selectedItem = -1; _selectedItem = -1;
} }
@ -145,7 +145,7 @@ void ContextMenu::setSelected(const Variant& tag, const Variant& defaultTag)
{ {
if(BSPF_equalsIgnoreCase(_entries[item].second.toString(), tag.toString())) if(BSPF_equalsIgnoreCase(_entries[item].second.toString(), tag.toString()))
{ {
setSelected(item); setSelectedIndex(item);
return; return;
} }
} }
@ -156,7 +156,7 @@ void ContextMenu::setSelected(const Variant& tag, const Variant& defaultTag)
{ {
if(BSPF_equalsIgnoreCase(_entries[item].second.toString(), defaultTag.toString())) if(BSPF_equalsIgnoreCase(_entries[item].second.toString(), defaultTag.toString()))
{ {
setSelected(item); setSelectedIndex(item);
return; return;
} }
} }
@ -165,7 +165,7 @@ void ContextMenu::setSelected(const Variant& tag, const Variant& defaultTag)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ContextMenu::setSelectedMax() void ContextMenu::setSelectedMax()
{ {
setSelected(_entries.size() - 1); setSelectedIndex(_entries.size() - 1);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
src/gui/ContextMenu.hxx
View File

@ -53,12 +53,12 @@ class ContextMenu : public Dialog, public CommandSender
/** Show context menu onscreen at the specified coordinates */ /** Show context menu onscreen at the specified coordinates */
void show(uInt32 x, uInt32 y, int item = -1); void show(uInt32 x, uInt32 y, int item = -1);
/** Select the entry at the given index. */
void setSelected(int item);
/** Select the first entry matching the given tag. */ /** Select the first entry matching the given tag. */
void setSelected(const Variant& tag, const Variant& defaultTag); void setSelected(const Variant& tag, const Variant& defaultTag);
/** Select the entry at the given index. */
void setSelectedIndex(int idx);
/** Select the highest/last entry in the internal list. */ /** Select the highest/last entry in the internal list. */
void setSelectedMax(); void setSelectedMax();

14
src/gui/Font.cxx
View File

@ -51,12 +51,18 @@ int Font::getCharWidth(uInt8 chr) const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int Font::getStringWidth(const string& str) const int Font::getStringWidth(const string& str) const
{ {
int space = 0; // If no width table is specified, use the maximum width
if(!myFontDesc.width)
return myFontDesc.maxwidth * str.size();
else
{
int space = 0;
for(unsigned int i = 0; i < str.size(); ++i) for(unsigned int i = 0; i < str.size(); ++i)
space += getCharWidth(str[i]); space += getCharWidth(str[i]);
return space; return space;
}
} }
} // namespace GUI } // namespace GUI

12
src/gui/GameInfoDialog.cxx
View File

@ -470,13 +470,13 @@ void GameInfoDialog::loadView()
bool autoAxis = BSPF_equalsIgnoreCase(mcontrol, "auto"); bool autoAxis = BSPF_equalsIgnoreCase(mcontrol, "auto");
if(autoAxis) if(autoAxis)
{ {
myMouseControl->setSelected(0); myMouseControl->setSelectedIndex(0);
myMouseX->setSelected(0); myMouseX->setSelectedIndex(0);
myMouseY->setSelected(0); myMouseY->setSelectedIndex(0);
} }
else else
{ {
myMouseControl->setSelected(1); myMouseControl->setSelectedIndex(1);
myMouseX->setSelected(Variant(mcontrol[0] - '0')); myMouseX->setSelected(Variant(mcontrol[0] - '0'));
myMouseY->setSelected(Variant(mcontrol[1] - '0')); myMouseY->setSelected(Variant(mcontrol[1] - '0'));
} }
@ -579,12 +579,12 @@ void GameInfoDialog::handleCommand(CommandSender* sender, int cmd,
break; break;
case kLeftCChanged: case kLeftCChanged:
myRightPort->setSelected( myRightPort->setSelectedIndex(
myLeftPort->getSelected() == 1 ? 0 : 1); myLeftPort->getSelected() == 1 ? 0 : 1);
break; break;
case kRightCChanged: case kRightCChanged:
myLeftPort->setSelected( myLeftPort->setSelectedIndex(
myRightPort->getSelected() == 1 ? 0 : 1); myRightPort->getSelected() == 1 ? 0 : 1);
break; break;

4
src/gui/InputDialog.cxx
View File

@ -203,7 +203,7 @@ void InputDialog::loadConfig()
{ {
// Left & right ports // Left & right ports
const string& saport = instance().settings().getString("saport"); const string& saport = instance().settings().getString("saport");
mySAPort->setSelected(BSPF_equalsIgnoreCase(saport, "rl") ? 1 : 0); mySAPort->setSelectedIndex(BSPF_equalsIgnoreCase(saport, "rl") ? 1 : 0);
// Joystick deadzone // Joystick deadzone
myDeadzone->setValue(instance().settings().getInt("joydeadzone")); myDeadzone->setValue(instance().settings().getInt("joydeadzone"));
@ -283,7 +283,7 @@ void InputDialog::setDefaults()
case 2: // Virtual devices case 2: // Virtual devices
{ {
// Left & right ports // Left & right ports
mySAPort->setSelected("lr", "lr"); mySAPort->setSelected("lr");
// Joystick deadzone // Joystick deadzone
myDeadzone->setValue(0); myDeadzone->setValue(0);

2
src/gui/PopUpWidget.hxx
View File

@ -51,10 +51,10 @@ class PopUpWidget : public Widget, public CommandSender
/** Various selection methods passed directly to the underlying menu /** Various selection methods passed directly to the underlying menu
See ContextMenu.hxx for more information. */ See ContextMenu.hxx for more information. */
void addItems(const VariantList& items) { myMenu->addItems(items); } void addItems(const VariantList& items) { myMenu->addItems(items); }
void setSelected(int item) { myMenu->setSelected(item); }
void setSelected(const Variant& tag, void setSelected(const Variant& tag,
const Variant& def = EmptyVariant) const Variant& def = EmptyVariant)
{ myMenu->setSelected(tag, def); } { myMenu->setSelected(tag, def); }
void setSelectedIndex(int idx) { myMenu->setSelectedIndex(idx); }
void setSelectedMax() { myMenu->setSelectedMax(); } void setSelectedMax() { myMenu->setSelectedMax(); }
void clearSelection() { myMenu->clearSelection(); } void clearSelection() { myMenu->clearSelection(); }