Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-02-08 23:30:43 +00:00
Code Issues Projects Releases Wiki Activity

Debugger display: minor refactor

Browse Source
This commit is contained in:
tomcw 2019-10-20 21:17:40 +01:00
parent 52376fd664
commit 13588165ff
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/Debugger/Debugger_Display.cpp
View File

@ -2844,11 +2844,15 @@ void _DrawTriStateSoftSwitch( RECT & rect, int nAddress, const int iBankDisplay,
void _DrawSoftSwitchLanguageCardBank( RECT & rect, const int iBankDisplay, int bg_default = BG_INFO ) void _DrawSoftSwitchLanguageCardBank( RECT & rect, const int iBankDisplay, int bg_default = BG_INFO )
{ {
const int w = g_aFontConfig[ FONT_DISASM_DEFAULT ]._nFontWidthAvg; const int w = g_aFontConfig[ FONT_DISASM_DEFAULT ]._nFontWidthAvg;
const int dx80 = 7 * w; // "80:L#/MxR/W" const int dx80 = 7 * w; // "80:B2/MxR/W"
// ^------^ // ^------^
const int dx88 = 8 * w; // "88:L#/M " const int dx88 = 8 * w; // "88:B1/M "
// ^-------^ // ^-------^
#ifdef _DEBUG
const int finalRectRight = rect.left + 11 * w;
#endif
rect.right = rect.left + dx80; rect.right = rect.left + dx80;
// 0 = RAM // 0 = RAM
@ -2863,7 +2867,7 @@ void _DrawSoftSwitchLanguageCardBank( RECT & rect, const int iBankDisplay, int b
; ;
bool bBankOn = (iBankActive == iBankDisplay); bool bBankOn = (iBankActive == iBankDisplay);
// Bn/[M] // B#/[M]
char sOn [ 4 ] = "B#"; // LC# but one char too wide :-/ char sOn [ 4 ] = "B#"; // LC# but one char too wide :-/
char sOff[ 4 ] = "M"; char sOff[ 4 ] = "M";
// C080 LC2 // C080 LC2
@ -2882,39 +2886,30 @@ void _DrawSoftSwitchLanguageCardBank( RECT & rect, const int iBankDisplay, int b
if (iBankDisplay == 2) if (iBankDisplay == 2)
{ {
rect.left += dx80; rect.left += dx80;
rect.right += w; rect.right += 4*w;
if (GetMemMode() & MF_ALTZP) DebuggerSetColorFG( DebuggerGetColor( FG_DISASM_BP_S_X )); // Red
{ DebuggerSetColorBG( DebuggerGetColor( bg_default ));
DebuggerSetColorFG( DebuggerGetColor( FG_DISASM_BP_S_X )); // Red PrintTextCursorX( (GetMemMode() & MF_ALTZP) ? "x" : " ", rect );
DebuggerSetColorBG( DebuggerGetColor( bg_default ));
PrintText( "x", rect );
}
rect.left += w; // [B2]/M R/[W]
rect.right += 3*w; // [B2]/M [R]/W
// [B2]/M R/[W]
// [B2]/M [R]/W
const char *pOn = "R"; const char *pOn = "R";
const char *pOff = "W"; const char *pOff = "W";
_DrawSoftSwitchHighlight( rect, !bBankWritable, pOn, pOff, bg_default ); _DrawSoftSwitchHighlight( rect, !bBankWritable, pOn, pOff, bg_default );
} }
#if defined(RAMWORKS) || defined(SATURN)
else else
{ {
_ASSERT(iBankDisplay == 1); _ASSERT(iBankDisplay == 1);
rect.left += dx88; rect.left += dx88;
rect.right += 3*w; rect.right += 4*w;
int iActiveBank = -1; int iActiveBank = -1;
char sText[ 4 ] = "?"; // Default to RAMWORKS char sText[ 4 ] = "?"; // Default to RAMWORKS
#ifdef RAMWORKS if (GetCurrentExpansionMemType() == CT_RamWorksIII) { sText[0] = 'r'; iActiveBank = GetRamWorksActiveBank(); }
if (GetCurrentExpansionMemType() == CT_RamWorksIII) { sText[0] = 'r'; iActiveBank = GetRamWorksActiveBank(); } // RAMWORKS if (GetCurrentExpansionMemType() == CT_Saturn128K) { sText[0] = 's'; iActiveBank = GetLanguageCard()->GetActiveBank(); }
#endif
if (GetCurrentExpansionMemType() == CT_Saturn128K) { sText[0] = 's'; iActiveBank = GetLanguageCard()->GetActiveBank(); } // SATURN 64K 128K
if (iActiveBank >= 0) if (iActiveBank >= 0)
{ {
@ -2922,13 +2917,16 @@ void _DrawSoftSwitchLanguageCardBank( RECT & rect, const int iBankDisplay, int b
PrintTextCursorX( sText, rect ); PrintTextCursorX( sText, rect );
sprintf( sText, "%02X", (iActiveBank & 0x7F) ); sprintf( sText, "%02X", (iActiveBank & 0x7F) );
DebuggerSetColorFG( DebuggerGetColor( FG_INFO_ADDRESS )); DebuggerSetColorFG( DebuggerGetColor( FG_INFO_ADDRESS )); // orange
PrintTextCursorX( sText, rect ); PrintTextCursorX( sText, rect );
} }
else else
PrintTextCursorX( " ", rect ); {
PrintTextCursorX(" ", rect);
}
} }
#endif // SATURN
_ASSERT(rect.right == finalRectRight);
rect.top += g_nFontHeight; rect.top += g_nFontHeight;
rect.bottom += g_nFontHeight; rect.bottom += g_nFontHeight;