diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index eacc8f73..28ba9f6e 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -6814,26 +6814,20 @@ Update_t CmdVideoScannerInfo(int nArgs) { if (nArgs != 1) { - ConsoleBufferPush("Video-scanner display config: "); + Help_Arg_1(CMD_VIDEO_SCANNER_INFO); } else { if (strcmp(g_aArgs[1].sArg, "dec") == 0) - { g_videoScannerDisplayInfo.isDecimal = true; - } else if (strcmp(g_aArgs[1].sArg, "hex") == 0) - { g_videoScannerDisplayInfo.isDecimal = false; - } else if (strcmp(g_aArgs[1].sArg, "real") == 0) - { g_videoScannerDisplayInfo.isHorzReal = true; - } else if (strcmp(g_aArgs[1].sArg, "apple") == 0) - { g_videoScannerDisplayInfo.isHorzReal = false; - } + else + Help_Arg_1(CMD_VIDEO_SCANNER_INFO); } ConsoleBufferToDisplay(); diff --git a/source/Debugger/Debugger_Commands.cpp b/source/Debugger/Debugger_Commands.cpp index 5d525fc3..f28cb050 100644 --- a/source/Debugger/Debugger_Commands.cpp +++ b/source/Debugger/Debugger_Commands.cpp @@ -240,7 +240,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // {TEXT("VARSSAVE") , CmdVarsSave , CMD_VARIABLES_SAVE }, // {TEXT("SET") , CmdVarsSet , CMD_VARIABLES_SET }, // Video-scanner info - {TEXT("VIDEOINFO") , CmdVideoScannerInfo , CMD_VIDEO_SCANNER_INFO, "Video-scanner info" }, + {TEXT("VIDEOINFO") , CmdVideoScannerInfo , CMD_VIDEO_SCANNER_INFO, "Video-scanner display configuration" }, // View {TEXT("TEXT") , CmdViewOutput_Text4X , CMD_VIEW_TEXT4X, "View Text screen (current page)" }, {TEXT("TEXT1") , CmdViewOutput_Text41 , CMD_VIEW_TEXT41, "View Text screen Page 1" }, diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp index 682e37d6..839dbb11 100644 --- a/source/Debugger/Debugger_Display.cpp +++ b/source/Debugger/Debugger_Display.cpp @@ -3702,7 +3702,7 @@ void DrawVideoScannerInfo (int line) if (h < 0) { - h = h + 65; + h = h + NTSC_GetCyclesPerLine(); v = v - 1; if (v < 0) v = v + NTSC_GetVideoLines(); diff --git a/source/Debugger/Debugger_Help.cpp b/source/Debugger/Debugger_Help.cpp index fd25aa9d..d6f1f4cf 100644 --- a/source/Debugger/Debugger_Help.cpp +++ b/source/Debugger/Debugger_Help.cpp @@ -1400,7 +1400,21 @@ Update_t CmdHelpSpecific (int nArgs) ConsoleColorizePrint( sText, " Usage: symbol" ); ConsoleBufferPush( " Looks up symbol in all 3 symbol tables: main, user, source" ); break; - // View +// Video-Scanner + case CMD_VIDEO_SCANNER_INFO: + ConsoleColorizePrint(sText, " Usage: "); + ConsoleBufferPush(" Where:"); + ConsoleBufferPush(" changes output to dec/hex"); + ConsoleBufferPush(" alters horz value to hbl-l,visible,hbl-r or hbl-r+l,visible"); + { + char sText[CONSOLE_WIDTH]; + ConsolePrintFormat(sText, " %sRed%s=invisible (hbl or vbl active) / %sGreen%s=visible" + ,CHC_KEY , CHC_DEFAULT // red + ,CHC_COMMAND, CHC_DEFAULT // green + ); + } + break; +// View case CMD_VIEW_TEXT4X: case CMD_VIEW_TEXT41: case CMD_VIEW_TEXT42: diff --git a/source/NTSC.cpp b/source/NTSC.cpp index 2ca3b29d..87e8853f 100644 --- a/source/NTSC.cpp +++ b/source/NTSC.cpp @@ -2318,6 +2318,11 @@ UINT NTSC_GetCyclesPerFrame(void) return g_videoScanner6502Cycles; } +UINT NTSC_GetCyclesPerLine(void) +{ + return VIDEO_SCANNER_MAX_HORZ; +} + UINT NTSC_GetVideoLines(void) { return (GetVideoRefreshRate() == VR_50HZ) ? VIDEO_SCANNER_MAX_VERT_PAL : VIDEO_SCANNER_MAX_VERT; diff --git a/source/NTSC.h b/source/NTSC.h index 74eeccee..e3822541 100644 --- a/source/NTSC.h +++ b/source/NTSC.h @@ -21,5 +21,6 @@ enum VideoRefreshRate_e; void NTSC_SetRefreshRate(VideoRefreshRate_e rate); UINT NTSC_GetCyclesPerFrame(void); + UINT NTSC_GetCyclesPerLine(void); UINT NTSC_GetVideoLines(void); bool NTSC_IsVisible(void);