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

display debugger cart type info disabled 

align further options to cart type info
This commit is contained in:
thrust26 2019-11-02 11:57:50 +01:00
parent 6f1b0b0783
commit bc191ecd46
39 changed files with 136 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,16 +42,16 @@ Cartridge0840Widget::Cartridge0840Widget(
<< "$" << (start + 0xFFF) << " (hotspot = $" << spot << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $" << spot << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Fred X. Quimby", info.str()) + myLineHeight; ypos = addBaseInformation(size, "Fred X. Quimby", info.str()) + myLineHeight;
VariantList items; VariantList items;
VarList::push_back(items, "0 ($800)"); VarList::push_back(items, "0 ($800)");
VarList::push_back(items, "1 ($840)"); VarList::push_back(items, "1 ($840)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($800) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($800)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -45,7 +45,7 @@ Cartridge3EPlusWidget::Cartridge3EPlusWidget(
start -= start % 0x1000; start -= start % 0x1000;
info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n"; info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "T. Jentzsch", info.str()) + ypos = addBaseInformation(size, "T. Jentzsch", info.str()) +
myLineHeight; myLineHeight;

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

@ -47,7 +47,7 @@ Cartridge3EWidget::Cartridge3EWidget(
start -= start % 0x1000; start -= start % 0x1000;
info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n"; info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "TigerVision", info.str()) + myLineHeight; ypos = addBaseInformation(size, "TigerVision", info.str()) + myLineHeight;
VariantList romitems; VariantList romitems;

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

@ -39,7 +39,7 @@ Cartridge3FWidget::Cartridge3FWidget(
start -= start % 0x1000; start -= start % 0x1000;
info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n"; info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "TigerVision", info.str()) + myLineHeight; ypos = addBaseInformation(size, "TigerVision", info.str()) + myLineHeight;
VariantList items; VariantList items;

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

@ -34,7 +34,7 @@ Cartridge4A50Widget::Cartridge4A50Widget(
"High bank region (256B) : $FE00 - $FEFF\n" "High bank region (256B) : $FE00 - $FEFF\n"
"Fixed (last 256B of ROM) : $FF00 - $FFFF\n"; "Fixed (last 256B of ROM) : $FF00 - $FFFF\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(cart.mySize, "John Payson / Supercat", info) + ypos = addBaseInformation(cart.mySize, "John Payson / Supercat", info) +
myLineHeight; myLineHeight;
@ -63,7 +63,7 @@ Cartridge4A50Widget::Cartridge4A50Widget(
flwidth = _font.getStringWidth("ROM "); flwidth = _font.getStringWidth("ROM ");
// Lower bank/region configuration // Lower bank/region configuration
xpos = 10; xpos = 2;
new StaticTextWidget(_boss, _font, xpos, ypos, lwidth, new StaticTextWidget(_boss, _font, xpos, ypos, lwidth,
myFontHeight, lowerlabel, TextAlign::Left); myFontHeight, lowerlabel, TextAlign::Left);
ypos += myLineHeight + 8; ypos += myLineHeight + 8;
@ -83,7 +83,7 @@ Cartridge4A50Widget::Cartridge4A50Widget(
addFocusWidget(myRAMLower); addFocusWidget(myRAMLower);
// Middle bank/region configuration // Middle bank/region configuration
xpos = 10; ypos += myLineHeight + 14; xpos = 2; ypos += myLineHeight + 14;
new StaticTextWidget(_boss, _font, xpos, ypos, lwidth, new StaticTextWidget(_boss, _font, xpos, ypos, lwidth,
myFontHeight, middlelabel, TextAlign::Left); myFontHeight, middlelabel, TextAlign::Left);
ypos += myLineHeight + 8; ypos += myLineHeight + 8;
@ -103,7 +103,7 @@ Cartridge4A50Widget::Cartridge4A50Widget(
addFocusWidget(myRAMMiddle); addFocusWidget(myRAMMiddle);
// High bank/region configuration // High bank/region configuration
xpos = 10; ypos += myLineHeight + 14; xpos = 2; ypos += myLineHeight + 14;
new StaticTextWidget(_boss, _font, xpos, ypos, lwidth, new StaticTextWidget(_boss, _font, xpos, ypos, lwidth,
myFontHeight, highlabel, TextAlign::Left); myFontHeight, highlabel, TextAlign::Left);
ypos += myLineHeight + 8; ypos += myLineHeight + 8;

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

@ -32,7 +32,7 @@ CartridgeARWidget::CartridgeARWidget(
"Supercharger cartridge, four 2K slices (3 RAM, 1 ROM)\n" "Supercharger cartridge, four 2K slices (3 RAM, 1 ROM)\n"
"\nTHIS SCHEME IS NOT FULLY IMPLEMENTED OR TESTED\n"; "\nTHIS SCHEME IS NOT FULLY IMPLEMENTED OR TESTED\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Starpath", info) + myLineHeight; ypos = addBaseInformation(size, "Starpath", info) + myLineHeight;
VariantList items; VariantList items;
@ -69,9 +69,9 @@ CartridgeARWidget::CartridgeARWidget(
VarList::push_back(items, " 30"); VarList::push_back(items, " 30");
VarList::push_back(items, " 31"); VarList::push_back(items, " 31");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" XX "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" XX"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -45,7 +45,7 @@ CartridgeBFSCWidget::CartridgeBFSCWidget(
<< " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -115,9 +115,9 @@ CartridgeBFSCWidget::CartridgeBFSCWidget(
VarList::push_back(items, "63 ($FFBF)"); VarList::push_back(items, "63 ($FFBF)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("63 ($FFBF) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("63 ($FFBF)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -41,7 +41,7 @@ CartridgeBFWidget::CartridgeBFWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -111,9 +111,9 @@ CartridgeBFWidget::CartridgeBFWidget(
VarList::push_back(items, "63 ($FFBF)"); VarList::push_back(items, "63 ($FFBF)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("64 ($FFBF) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("64 ($FFBF)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -48,7 +48,7 @@ CartridgeBUSWidget::CartridgeBUSWidget(
} }
#endif #endif
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "AtariAge", info.str(), 4) + ypos = addBaseInformation(size, "AtariAge", info.str(), 4) +
myLineHeight; myLineHeight;
@ -61,9 +61,9 @@ CartridgeBUSWidget::CartridgeBUSWidget(
VarList::push_back(items, "5 ($FFFA)"); VarList::push_back(items, "5 ($FFFA)");
VarList::push_back(items, "6 ($FFFB)"); VarList::push_back(items, "6 ($FFFB)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);

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

@ -41,9 +41,9 @@ CartridgeCDFWidget::CartridgeCDFWidget(
VarList::push_back(items, "4 ($FFF9)"); VarList::push_back(items, "4 ($FFF9)");
VarList::push_back(items, "5 ($FFFA)"); VarList::push_back(items, "5 ($FFFA)");
VarList::push_back(items, "6 ($FFFB)"); VarList::push_back(items, "6 ($FFFB)");
myBank = new PopUpWidget(boss, _font, xpos, ypos, _font.getStringWidth("0 ($FFFx) "), myBank = new PopUpWidget(boss, _font, xpos, ypos, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, myLineHeight, items,
"Set bank ", _font.getStringWidth("Set bank "), kBankChanged); "Set bank ", 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
//addFocusWidget(myBank); //addFocusWidget(myBank);

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

@ -42,7 +42,7 @@ CartridgeCMWidget::CartridgeCMWidget(
"used to control the cart functionality\n" "used to control the cart functionality\n"
"Startup bank = 3 (ROM), RAM disabled\n"; "Startup bank = 3 (ROM), RAM disabled\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "CompuMate", info) + myLineHeight; ypos = addBaseInformation(size, "CompuMate", info) + myLineHeight;
VariantList items; VariantList items;
@ -53,7 +53,7 @@ CartridgeCMWidget::CartridgeCMWidget(
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 0 "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 0 "),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);

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

@ -36,7 +36,7 @@ CartridgeCTYWidget::CartridgeCTYWidget(
" $F040 - $F07F (R), $F000 - $F03F (W)\n" " $F040 - $F07F (R), $F000 - $F03F (W)\n"
"\nTHIS SCHEME IS NOT FULLY IMPLEMENTED OR TESTED\n"; "\nTHIS SCHEME IS NOT FULLY IMPLEMENTED OR TESTED\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Chris D. Walton", info) + myLineHeight; ypos = addBaseInformation(size, "Chris D. Walton", info) + myLineHeight;
VariantList items; VariantList items;
@ -48,9 +48,9 @@ CartridgeCTYWidget::CartridgeCTYWidget(
VarList::push_back(items, "6 ($FFFA)"); VarList::push_back(items, "6 ($FFFA)");
VarList::push_back(items, "7 ($FFFB)"); VarList::push_back(items, "7 ($FFFB)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -37,7 +37,7 @@ CartridgeCVPlusWidget::CartridgeCVPlusWidget(
<< "2048 bytes ROM @ $F800 - $FFFF, by writing to $3D\n" << "2048 bytes ROM @ $F800 - $FFFF, by writing to $3D\n"
<< "Startup bank = " << cart.startBank() << "\n"; << "Startup bank = " << cart.startBank() << "\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "LS_Dracon / Stephen Anthony", ypos = addBaseInformation(size, "LS_Dracon / Stephen Anthony",
info.str()) + myLineHeight; info.str()) + myLineHeight;
@ -48,7 +48,7 @@ CartridgeCVPlusWidget::CartridgeCVPlusWidget(
ostringstream label; ostringstream label;
label << "Set bank ($F800 - $FFFF) "; label << "Set bank ($F800 - $FFFF) ";
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("xxx ($3D) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("xxx ($3D)"),
myLineHeight, items, label.str(), myLineHeight, items, label.str(),
_font.getStringWidth(label.str()), kBankChanged); _font.getStringWidth(label.str()), kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);

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

@ -43,7 +43,7 @@ CartridgeDASHWidget::CartridgeDASHWidget(
start -= start % 0x1000; start -= start % 0x1000;
info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n"; info << "Bank RORG" << " = $" << Common::Base::HEX4 << start << "\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "A. Davie & T. Jentzsch", info.str()) + ypos = addBaseInformation(size, "A. Davie & T. Jentzsch", info.str()) +
myLineHeight; myLineHeight;

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

@ -45,7 +45,7 @@ CartridgeDFSCWidget::CartridgeDFSCWidget(
<< " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -83,9 +83,9 @@ CartridgeDFSCWidget::CartridgeDFSCWidget(
VarList::push_back(items, "31 ($FFDF)"); VarList::push_back(items, "31 ($FFDF)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FFE0) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FFE0)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -41,7 +41,7 @@ CartridgeDFWidget::CartridgeDFWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight; ypos = addBaseInformation(size, "CPUWIZ", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -79,9 +79,9 @@ CartridgeDFWidget::CartridgeDFWidget(
VarList::push_back(items, "31 ($FFDF)"); VarList::push_back(items, "31 ($FFDF)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FFDF) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FFDF)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -48,7 +48,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
} }
#endif #endif
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Activision (Pitfall II)", info.str()) + ypos = addBaseInformation(size, "Activision (Pitfall II)", info.str()) +
myLineHeight; myLineHeight;
@ -60,15 +60,15 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
VarList::push_back(items, "4 ($FFFA)"); VarList::push_back(items, "4 ($FFFA)");
VarList::push_back(items, "5 ($FFFB)"); VarList::push_back(items, "5 ($FFFB)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
// Top registers // Top registers
int lwidth = _font.getStringWidth("Counter Registers "); int lwidth = _font.getStringWidth("Counter Registers ");
xpos = 10; ypos += myLineHeight + 8; xpos = 2; ypos += myLineHeight + 8;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Top Registers ", TextAlign::Left); myFontHeight, "Top Registers ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -78,7 +78,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myTops->setEditable(false); myTops->setEditable(false);
// Bottom registers // Bottom registers
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Bottom Registers ", TextAlign::Left); myFontHeight, "Bottom Registers ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -88,7 +88,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myBottoms->setEditable(false); myBottoms->setEditable(false);
// Counter registers // Counter registers
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Counter Registers ", TextAlign::Left); myFontHeight, "Counter Registers ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -98,7 +98,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myCounters->setEditable(false); myCounters->setEditable(false);
// Fractional counter registers // Fractional counter registers
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Frac Counters ", TextAlign::Left); myFontHeight, "Frac Counters ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -108,7 +108,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myFracCounters->setEditable(false); myFracCounters->setEditable(false);
// Fractional increment registers // Fractional increment registers
xpos = 10; ypos += myFracCounters->getHeight() + 8; xpos = 2; ypos += myFracCounters->getHeight() + 8;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Frac Increments ", TextAlign::Left); myFontHeight, "Frac Increments ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -118,7 +118,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myFracIncrements->setEditable(false); myFracIncrements->setEditable(false);
// Special function parameters // Special function parameters
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Function Params ", TextAlign::Left); myFontHeight, "Function Params ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -128,7 +128,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myParameter->setEditable(false); myParameter->setEditable(false);
// Music counters // Music counters
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Music Counters ", TextAlign::Left); myFontHeight, "Music Counters ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -138,7 +138,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myMusicCounters->setEditable(false); myMusicCounters->setEditable(false);
// Music frequencies // Music frequencies
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Music Frequencies ", TextAlign::Left); myFontHeight, "Music Frequencies ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -148,7 +148,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
myMusicFrequencies->setEditable(false); myMusicFrequencies->setEditable(false);
// Music waveforms // Music waveforms
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Music Waveforms ", TextAlign::Left); myFontHeight, "Music Waveforms ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -159,7 +159,7 @@ CartridgeDPCPlusWidget::CartridgeDPCPlusWidget(
// Current random number // Current random number
lwidth = _font.getStringWidth("Current random number "); lwidth = _font.getStringWidth("Current random number ");
xpos = 10; ypos += myLineHeight + 4; xpos = 2; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Current random number ", TextAlign::Left); myFontHeight, "Current random number ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;

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

@ -45,7 +45,7 @@ CartridgeDPCWidget::CartridgeDPCWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Activision (Pitfall II)", info.str()) + ypos = addBaseInformation(size, "Activision (Pitfall II)", info.str()) +
myLineHeight; myLineHeight;
@ -53,9 +53,9 @@ CartridgeDPCWidget::CartridgeDPCWidget(
VarList::push_back(items, "0 ($FFF8)"); VarList::push_back(items, "0 ($FFF8)");
VarList::push_back(items, "1 ($FFF9)"); VarList::push_back(items, "1 ($FFF9)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
ypos += myLineHeight + 8; ypos += myLineHeight + 8;
@ -77,7 +77,7 @@ CartridgeDPCWidget::CartridgeDPCWidget(
myTops->setEditable(false); myTops->setEditable(false);
// Bottom registers // Bottom registers
xpos = 18; ypos += myLineHeight + 4; xpos = 10; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Bottom Registers ", TextAlign::Left); myFontHeight, "Bottom Registers ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -87,7 +87,7 @@ CartridgeDPCWidget::CartridgeDPCWidget(
myBottoms->setEditable(false); myBottoms->setEditable(false);
// Counter registers // Counter registers
xpos = 18; ypos += myLineHeight + 4; xpos = 10; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Counter Registers ", TextAlign::Left); myFontHeight, "Counter Registers ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -97,7 +97,7 @@ CartridgeDPCWidget::CartridgeDPCWidget(
myCounters->setEditable(false); myCounters->setEditable(false);
// Flag registers // Flag registers
xpos = 18; ypos += myLineHeight + 4; xpos = 10; ypos += myLineHeight + 4;
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Flag Registers ", TextAlign::Left); myFontHeight, "Flag Registers ", TextAlign::Left);
xpos += lwidth; xpos += lwidth;
@ -107,7 +107,7 @@ CartridgeDPCWidget::CartridgeDPCWidget(
myFlags->setEditable(false); myFlags->setEditable(false);
// Music mode // Music mode
xpos = 10; ypos += myLineHeight + 12; xpos = 2; ypos += myLineHeight + 12;
lwidth = _font.getStringWidth("Music mode (DF5/DF6/DF7) "); lwidth = _font.getStringWidth("Music mode (DF5/DF6/DF7) ");
new StaticTextWidget(boss, _font, xpos, ypos, lwidth, new StaticTextWidget(boss, _font, xpos, ypos, lwidth,
myFontHeight, "Music mode (DF5/DF6/DF7) ", TextAlign::Left); myFontHeight, "Music mode (DF5/DF6/DF7) ", TextAlign::Left);

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

@ -74,6 +74,7 @@ int CartDebugWidget::addBaseInformation(size_t bytes, const string& manufacturer
myDesc = new StringListWidget(_boss, _nfont, x+lwidth, y - 1, myDesc = new StringListWidget(_boss, _nfont, x+lwidth, y - 1,
fwidth, lines * myLineHeight, false); fwidth, lines * myLineHeight, false);
myDesc->setEditable(false); myDesc->setEditable(false);
myDesc->setEnabled(false);
myDesc->setList(sl); myDesc->setList(sl);
y += myDesc->getHeight() + 4; y += myDesc->getHeight() + 4;

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

@ -59,7 +59,7 @@ CartridgeE0Widget::CartridgeE0Widget(
start -= start % 0x1000; start -= start % 0x1000;
info << "Bank RORG" << " = $" << HEX4 << start << "\n"; info << "Bank RORG" << " = $" << HEX4 << start << "\n";
#endif #endif
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Parker Brothers", info) + myLineHeight; ypos = addBaseInformation(size, "Parker Brothers", info) + myLineHeight;
VariantList items0, items1, items2; VariantList items0, items1, items2;

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

@ -45,7 +45,7 @@ CartridgeEFSCWidget::CartridgeEFSCWidget(
<< " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << " - " << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Paul Slocum / Homestar Runner", ypos = addBaseInformation(size, "Paul Slocum / Homestar Runner",
info.str()) + myLineHeight; info.str()) + myLineHeight;
@ -67,9 +67,9 @@ CartridgeEFSCWidget::CartridgeEFSCWidget(
VarList::push_back(items, "14 ($FFEE)"); VarList::push_back(items, "14 ($FFEE)");
VarList::push_back(items, "15 ($FFEF)"); VarList::push_back(items, "15 ($FFEF)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FFE0) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FFE0)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -41,7 +41,7 @@ CartridgeEFWidget::CartridgeEFWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Paul Slocum / Homestar Runner", ypos = addBaseInformation(size, "Paul Slocum / Homestar Runner",
info.str()) + myLineHeight; info.str()) + myLineHeight;
@ -63,9 +63,9 @@ CartridgeEFWidget::CartridgeEFWidget(
VarList::push_back(items, "14 ($FFEE)"); VarList::push_back(items, "14 ($FFEE)");
VarList::push_back(items, "15 ($FFEF)"); VarList::push_back(items, "15 ($FFEF)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FFE0) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("15 ($FFE0)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -42,7 +42,7 @@ CartridgeF0Widget::CartridgeF0Widget(
<< " - " << "$" << (start + 0xFFF) << "\n"; << " - " << "$" << (start + 0xFFF) << "\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Dynacom Megaboy", ypos = addBaseInformation(size, "Dynacom Megaboy",
info.str()) + myLineHeight; info.str()) + myLineHeight;
@ -66,7 +66,7 @@ CartridgeF0Widget::CartridgeF0Widget(
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15"), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15"),
myLineHeight, items, "Set bank #", myLineHeight, items, "Set bank #",
_font.getStringWidth("Set bank #"), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -45,7 +45,7 @@ CartridgeF4SCWidget::CartridgeF4SCWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight; ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight;
VariantList items; VariantList items;
@ -58,9 +58,9 @@ CartridgeF4SCWidget::CartridgeF4SCWidget(
VarList::push_back(items, "6 ($FFFA)"); VarList::push_back(items, "6 ($FFFA)");
VarList::push_back(items, "7 ($FFFB)"); VarList::push_back(items, "7 ($FFFB)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -41,7 +41,7 @@ CartridgeF4Widget::CartridgeF4Widget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight; ypos = addBaseInformation(size, "Atari", info.str(), 15) + myLineHeight;
VariantList items; VariantList items;
@ -54,9 +54,9 @@ CartridgeF4Widget::CartridgeF4Widget(
VarList::push_back(items, "6 ($FFFA)"); VarList::push_back(items, "6 ($FFFA)");
VarList::push_back(items, "7 ($FFFB)"); VarList::push_back(items, "7 ($FFFB)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -45,7 +45,7 @@ CartridgeF6SCWidget::CartridgeF6SCWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -54,9 +54,9 @@ CartridgeF6SCWidget::CartridgeF6SCWidget(
VarList::push_back(items, "2 ($FFF8)"); VarList::push_back(items, "2 ($FFF8)");
VarList::push_back(items, "3 ($FFF9)"); VarList::push_back(items, "3 ($FFF9)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -41,7 +41,7 @@ CartridgeF6Widget::CartridgeF6Widget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -52,7 +52,7 @@ CartridgeF6Widget::CartridgeF6Widget(
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -45,16 +45,16 @@ CartridgeF8SCWidget::CartridgeF8SCWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items; VariantList items;
VarList::push_back(items, "0 ($FFF8)"); VarList::push_back(items, "0 ($FFF8)");
VarList::push_back(items, "1 ($FFF9)"); VarList::push_back(items, "1 ($FFF9)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -41,16 +41,16 @@ CartridgeF8Widget::CartridgeF8Widget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight; ypos = addBaseInformation(size, "Atari", info.str()) + myLineHeight;
VariantList items; VariantList items;
VarList::push_back(items, "0 ($FFF8)"); VarList::push_back(items, "0 ($FFF8)");
VarList::push_back(items, "1 ($FFF9)"); VarList::push_back(items, "1 ($FFF9)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -47,7 +47,7 @@ CartridgeFA2Widget::CartridgeFA2Widget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Chris D. Walton (Star Castle 2600)", ypos = addBaseInformation(size, "Chris D. Walton (Star Castle 2600)",
info.str(), 15) + myLineHeight; info.str(), 15) + myLineHeight;
@ -62,9 +62,9 @@ CartridgeFA2Widget::CartridgeFA2Widget(
VarList::push_back(items, "6 ($FFFB)"); VarList::push_back(items, "6 ($FFFB)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
ypos += myLineHeight + 20; ypos += myLineHeight + 20;

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

@ -45,7 +45,7 @@ CartridgeFAWidget::CartridgeFAWidget(
<< "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n"; << "$" << (start + 0xFFF) << " (hotspot = $F" << (spot+i) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "CBS", info.str()) + myLineHeight; ypos = addBaseInformation(size, "CBS", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -53,9 +53,9 @@ CartridgeFAWidget::CartridgeFAWidget(
VarList::push_back(items, "1 ($FFF9)"); VarList::push_back(items, "1 ($FFF9)");
VarList::push_back(items, "2 ($FFFA)"); VarList::push_back(items, "2 ($FFFA)");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -33,7 +33,7 @@ CartridgeFEWidget::CartridgeFEWidget(
"Bank 0 @ $F000 - $FFFF (DATA = 111, D5 = 1)\n" "Bank 0 @ $F000 - $FFFF (DATA = 111, D5 = 1)\n"
"Bank 1 @ $D000 - $DFFF (DATA = 110, D5 = 0)\n"; "Bank 1 @ $D000 - $DFFF (DATA = 110, D5 = 0)\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(2 * 4096, "Activision", info) + myLineHeight; ypos = addBaseInformation(2 * 4096, "Activision", info) + myLineHeight;
VariantList items; VariantList items;
@ -43,7 +43,7 @@ CartridgeFEWidget::CartridgeFEWidget(
new PopUpWidget(boss, _font, xpos, ypos-2, new PopUpWidget(boss, _font, xpos, ypos-2,
_font.getStringWidth("0 ($01FE, D5=1)"), _font.getStringWidth("0 ($01FE, D5=1)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -35,7 +35,7 @@ CartridgeMDMWidget::CartridgeMDMWidget(
<< "\nBanks are selected by reading from $800 - $BFF, where the lower " << "\nBanks are selected by reading from $800 - $BFF, where the lower "
"byte determines the 4K bank to use."; "byte determines the 4K bank to use.";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Edwin Blink", info.str(), 15) + myLineHeight; ypos = addBaseInformation(size, "Edwin Blink", info.str(), 15) + myLineHeight;
VariantList items; VariantList items;
@ -47,9 +47,9 @@ CartridgeMDMWidget::CartridgeMDMWidget(
} }
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("xxx ($0FFF) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("xxx ($0FFF)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);

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

@ -37,7 +37,7 @@ void CartridgeMNetworkWidget::initialize(GuiObject* boss, CartridgeMNetwork& car
{ {
uInt32 size = cart.bankCount() * cart.BANK_SIZE; uInt32 size = cart.bankCount() * cart.BANK_SIZE;
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "M-Network", info.str(), 15) + ypos = addBaseInformation(size, "M-Network", info.str(), 15) +
myLineHeight; myLineHeight;

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

@ -51,13 +51,13 @@ CartridgeSBWidget::CartridgeSBWidget(
bank.str(""); bank.str("");
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "Fred X. Quimby", info.str()) + myLineHeight; ypos = addBaseInformation(size, "Fred X. Quimby", info.str()) + myLineHeight;
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("XX ($800) "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("XX ($800)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -43,7 +43,7 @@ CartridgeUAWidget::CartridgeUAWidget(
<< "$" << (start + 0xFFF) << " (hotspots = $" << spot << ", $" << (spot | 0x80) << ")\n"; << "$" << (start + 0xFFF) << " (hotspots = $" << spot << ", $" << (spot | 0x80) << ")\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "UA Limited", info.str()) + myLineHeight; ypos = addBaseInformation(size, "UA Limited", info.str()) + myLineHeight;
VariantList items; VariantList items;
@ -60,7 +60,7 @@ CartridgeUAWidget::CartridgeUAWidget(
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx, $FFx)"), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("0 ($FFx, $FFx)"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -36,7 +36,7 @@ CartridgeWDWidget::CartridgeWDWidget(
"64 bytes RAM @ $F000 - $F080\n" "64 bytes RAM @ $F000 - $F080\n"
" $F000 - $F03F (R), $F040 - $F07F (W)\n"; " $F000 - $F03F (R), $F040 - $F07F (W)\n";
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(myCart.mySize, "Wickstead Design", info, 12) + myLineHeight; ypos = addBaseInformation(myCart.mySize, "Wickstead Design", info, 12) + myLineHeight;
VariantList items; VariantList items;
@ -59,7 +59,7 @@ CartridgeWDWidget::CartridgeWDWidget(
myBank = new PopUpWidget(boss, _font, xpos, ypos-2, myBank = new PopUpWidget(boss, _font, xpos, ypos-2,
_font.getStringWidth("15 ($3F) [6,0,5,1]"), _font.getStringWidth("15 ($3F) [6,0,5,1]"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

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

@ -43,7 +43,7 @@ CartridgeX07Widget::CartridgeX07Widget(
<< " - " << "$" << (start + 0xFFF) << "\n"; << " - " << "$" << (start + 0xFFF) << "\n";
} }
int xpos = 10, int xpos = 2,
ypos = addBaseInformation(size, "AtariAge / John Payson / Fred Quimby", ypos = addBaseInformation(size, "AtariAge / John Payson / Fred Quimby",
info.str()) + myLineHeight; info.str()) + myLineHeight;
@ -65,9 +65,9 @@ CartridgeX07Widget::CartridgeX07Widget(
VarList::push_back(items, " 14"); VarList::push_back(items, " 14");
VarList::push_back(items, " 15"); VarList::push_back(items, " 15");
myBank = myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15 "), new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth(" 15"),
myLineHeight, items, "Set bank ", myLineHeight, items, "Set bank ",
_font.getStringWidth("Set bank "), kBankChanged); 0, kBankChanged);
myBank->setTarget(this); myBank->setTarget(this);
addFocusWidget(myBank); addFocusWidget(myBank);
} }

3
src/gui/StringListWidget.cxx
View File

@ -63,6 +63,9 @@ void StringListWidget::drawWidget(bool hilite)
// Draw a thin frame around the list. // Draw a thin frame around the list.
s.frameRect(_x, _y, _w + 1, _h, onTop && hilite && _hilite ? kWidColorHi : kColor); s.frameRect(_x, _y, _w + 1, _h, onTop && hilite && _hilite ? kWidColorHi : kColor);
if (!isEnabled())
s.fillRect(_x + 1, _y + 1, _w - 1, _h - 2, onTop ? kDlgColor : kBGColorLo);
// Draw the list items // Draw the list items
for (i = 0, pos = _currentPos; i < _rows && pos < len; i++, pos++) for (i = 0, pos = _currentPos; i < _rows && pos < len; i++, pos++)
{ {