// JLH 12/23/2009 Created this file\r
// JLH 12/20/2010 Added settings, menus & toolbars\r
// JLH 07/05/2011 Added CD BIOS functionality to GUI\r
-// JPM 06/06/2016 Visual Studio support\r
-// JPM 06/19/2016 Soft debugger integration\r
+// JPM June/2016 Visual Studio support & Soft debugger integration\r
// JPM 01/11/2017 Added stack browser\r
-// JPM 01/02/2017 Added GPU disassembly\r
-// JPM 02/02/2017 Added DSP disassembly\r
-// JPM 07/12/2017 Added all Watch browser window\r
-// JPM 08/01/2017 Added heap allocator browser window\r
-// JPM 08/07/2017 Added memories window browser\r
-// JPM 08/10/2017 Added a restart feature\r
-// JPM 08/31/2017 Added breakpoints winndow\r
-// JPM 09/01/2017 Save position & visibility windows status in the settings\r
-// JPM 09/02/2017 Save size windows in the settings\r
-// JPM 09/05/2017 Added Exception Vector Table window\r
-// JPM 09/06/2017 Added the 'Rx' word to the emulator window name\r
-// JPM 09/12/2017 Added the keybindings in the settings\r
-// JPM 11/04/2017 Added the local browser window\r
+// JPM Feb./2017 Added GPU/DSP disassembly\r
+// JPM 07/12/2017 Added all Watch window\r
+// JPM Aug./2017 Added heap allocator and memories window, a restart feature, and a [Not Supported] breakpoints window\r
+// JPM Sept./2017 Save position, size & visibility windows status in the settings; added Exception Vector Table window, the 'Rx' word to the emulator window name, and the keybindings in the settings\r
+// JPM 11/04/2017 Added the local window\r
+// JPM 08/31/2018 Added the call stack window\r
+// JPM Sept./2018 Added the new Models and BIOS handler, a screenshot feature and source code files browsing\r
+// JPM 10/10/2018 Added search paths in the settings\r
//\r
\r
// FIXED:\r
#include "debug/opbrowser.h"\r
#include "debug/riscdasmbrowser.h"\r
\r
-#include "debugger/allwatchbrowser.h"\r
-#include "debugger/localbrowser.h"\r
-#include "debugger/heapallocatorbrowser.h"\r
-\r
#include "dac.h"\r
#include "jaguar.h"\r
#include "log.h"\r
#include "file.h"\r
+#ifndef NEWMODELSBIOSHANDLER\r
#include "jagbios.h"\r
#include "jagbios2.h"\r
-#include "jagcdbios.h"\r
#include "jagstub2bios.h"\r
+#else\r
+#include "modelsBIOS.h"\r
+#endif\r
+#include "jagcdbios.h"\r
#include "joystick.h"\r
#include "m68000/m68kinterface.h"\r
\r
+#include "debugger/DBGManager.h"\r
//#include "debugger/VideoWin.h"\r
-#include "debugger/DasmWin.h"\r
+//#include "debugger/DasmWin.h"\r
#include "debugger/m68KDasmWin.h"\r
#include "debugger/GPUDasmWin.h"\r
#include "debugger/DSPDasmWin.h"\r
#include "debugger/memory1browser.h"\r
-#include "debugger/brkWin.h"\r
+//#include "debugger/brkWin.h"\r
+#include "debugger/FilesrcListWin.h"\r
#include "debugger/exceptionvectortablebrowser.h"\r
+#include "debugger/allwatchbrowser.h"\r
+#include "debugger/localbrowser.h"\r
+#include "debugger/heapallocatorbrowser.h"\r
+#include "debugger/callstackbrowser.h"\r
+\r
\r
// According to SebRmv, this header isn't seen on Arch Linux either... :-/\r
//#ifdef __GCCWIN32__\r
// setCentralWidget(mainWindowCentrale);\r
//}\r
\r
+ WriteLog("Window creation start\n");\r
+\r
// video output\r
videoWidget = new GLWidget(this);\r
videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);\r
//VideoOutputWin = new VideoOutputWindow(this);\r
//VideoOutputWin->setCentralWidget()\r
//DasmWin = new DasmWindow();\r
- DasmWin = new DasmWindow(this);\r
+ //DasmWin = new DasmWindow(this);\r
allWatchBrowseWin = new AllWatchBrowserWindow(this);\r
LocalBrowseWin = new LocalBrowserWindow(this);\r
heapallocatorBrowseWin = new HeapAllocatorBrowserWindow(this);\r
- brkWin = new BrkWindow(this);\r
+ //brkWin = new BrkWindow(this);\r
exceptionvectortableBrowseWin = new ExceptionVectorTableBrowserWindow(this);\r
+ CallStackBrowseWin = new CallStackBrowserWindow(this);\r
\r
mem1BrowseWin = (Memory1BrowserWindow **)calloc(vjs.nbrmemory1browserwindow, sizeof(Memory1BrowserWindow));\r
#ifdef _MSC_VER\r
mem1BrowseWin[i] = new Memory1BrowserWindow(this);\r
}\r
\r
+ // Setup dock to display source code filenames tree\r
+ QDockWidget *dockFiles = new QDockWidget(tr("Files"), this);\r
+ dockFiles->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);\r
+ dockFiles->hide();\r
+ addDockWidget(Qt::LeftDockWidgetArea, dockFiles);\r
+ mainWindowCentrale->addAction(dockFiles->toggleViewAction());\r
+ dockFiles->setWidget(FilesrcListWin = new FilesrcListWindow(this));\r
+#if 0\r
+ // Setup dock to display disassembly\r
+ QDockWidget *dockDisasm = new QDockWidget(tr("Disassembly"), this);\r
+ dockDisasm->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);\r
+ addDockWidget(Qt::RightDockWidgetArea, dockDisasm);\r
+ mainWindowCentrale->addAction(dockDisasm->toggleViewAction());\r
+ dockDisasm->setWidget(dasmtabWidget = new QTabWidget(this));\r
+#else\r
dasmtabWidget = new QTabWidget(this);\r
+#endif\r
+ // Setup disasm tabs\r
dasmtabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);\r
dasmtabWidget->addTab(m68kDasmWin = new m68KDasmWindow(this), tr("M68000"));\r
dasmtabWidget->addTab(GPUDasmWin = new GPUDasmWindow(this), tr("GPU"));\r
dasmtabWidget->addTab(DSPDasmWin = new DSPDasmWindow(this), tr("DSP"));\r
- ////dasmtabWidget->addTab(m68kDasmBrowseWin, tr("M68000"));\r
+#if 1\r
setCentralWidget(dasmtabWidget);\r
-\r
-#if 0\r
- QDockWidget *shapesDockWidget = new QDockWidget(tr("Shapes"));\r
- shapesDockWidget->setObjectName("shapesDockWidget");\r
- shapesDockWidget->setWidget(m68kDasmWin);\r
- //shapesDockWidget->setWidget(treeWidget);\r
- shapesDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);\r
- addDockWidget(Qt::LeftDockWidgetArea, shapesDockWidget);\r
#endif\r
}\r
\r
\r
setUnifiedTitleAndToolBarOnMac(true);\r
\r
- // Create actions\r
-\r
+ // Quit actions\r
quitAppAct = new QAction(QIcon(":/res/exit.png"), tr("E&xit"), this);\r
-// quitAppAct->setShortcuts(QKeySequence::Quit);\r
-// quitAppAct->setShortcut(QKeySequence(tr("Alt+x")));\r
- //quitAppAct->setShortcut(QKeySequence(tr("Ctrl+q")));\r
quitAppAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBQUIT].KBSettingValue)));\r
quitAppAct->setShortcutContext(Qt::ApplicationShortcut);\r
quitAppAct->setStatusTip(tr("Quit Virtual Jaguar"));\r
connect(quitAppAct, SIGNAL(triggered()), this, SLOT(close()));\r
\r
+ // Power action\r
powerGreen.addFile(":/res/power-off.png", QSize(), QIcon::Normal, QIcon::Off);\r
powerGreen.addFile(":/res/power-on-green.png", QSize(), QIcon::Normal, QIcon::On);\r
powerRed.addFile(":/res/power-off.png", QSize(), QIcon::Normal, QIcon::Off);\r
powerRed.addFile(":/res/power-on-red.png", QSize(), QIcon::Normal, QIcon::On);\r
-\r
powerAct = new QAction(powerGreen, tr("&Power"), this);\r
powerAct->setStatusTip(tr("Powers Jaguar on/off"));\r
powerAct->setCheckable(true);\r
powerAct->setChecked(false);\r
connect(powerAct, SIGNAL(triggered()), this, SLOT(TogglePowerState()));\r
\r
+ // Pause action\r
QIcon pauseIcon;\r
- pauseIcon.addFile(":/res/pause-off", QSize(), QIcon::Normal, QIcon::Off);\r
- pauseIcon.addFile(":/res/pause-on", QSize(), QIcon::Normal, QIcon::On);\r
+ pauseIcon.addFile(":/res/pause-off.png", QSize(), QIcon::Normal, QIcon::Off);\r
+ pauseIcon.addFile(":/res/pause-on.png", QSize(), QIcon::Normal, QIcon::On);\r
pauseAct = new QAction(pauseIcon, tr("Pause"), this);\r
pauseAct->setStatusTip(tr("Toggles the running state"));\r
pauseAct->setCheckable(true);\r
pauseAct->setDisabled(true);\r
- //pauseAct->setShortcut(QKeySequence(tr("Esc")));\r
pauseAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBPAUSE].KBSettingValue)));\r
pauseAct->setShortcutContext(Qt::ApplicationShortcut);\r
connect(pauseAct, SIGNAL(triggered()), this, SLOT(ToggleRunState()));\r
\r
- zoomActs = new QActionGroup(this);\r
+ // Screenshot action\r
+ screenshotAct = new QAction(QIcon(":/res/screenshot.png"), tr("&Screenshot"), this);\r
+ screenshotAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBSCREENSHOT].KBSettingValue)));\r
+ screenshotAct->setShortcutContext(Qt::ApplicationShortcut);\r
+ screenshotAct->setCheckable(false);\r
+ screenshotAct->setDisabled(false);\r
+ connect(screenshotAct, SIGNAL(triggered()), this, SLOT(MakeScreenshot()));\r
\r
+ // Zoom actions\r
+ zoomActs = new QActionGroup(this);\r
x1Act = new QAction(QIcon(":/res/zoom100.png"), tr("Zoom 100%"), zoomActs);\r
x1Act->setStatusTip(tr("Set window zoom to 100%"));\r
x1Act->setCheckable(true);\r
connect(x1Act, SIGNAL(triggered()), this, SLOT(SetZoom100()));\r
-\r
x2Act = new QAction(QIcon(":/res/zoom200.png"), tr("Zoom 200%"), zoomActs);\r
x2Act->setStatusTip(tr("Set window zoom to 200%"));\r
x2Act->setCheckable(true);\r
connect(x2Act, SIGNAL(triggered()), this, SLOT(SetZoom200()));\r
-\r
x3Act = new QAction(QIcon(":/res/zoom300.png"), tr("Zoom 300%"), zoomActs);\r
x3Act->setStatusTip(tr("Set window zoom to 300%"));\r
x3Act->setCheckable(true);\r
connect(x3Act, SIGNAL(triggered()), this, SLOT(SetZoom300()));\r
\r
+ // TV type actions\r
tvTypeActs = new QActionGroup(this);\r
-\r
ntscAct = new QAction(QIcon(":/res/ntsc.png"), tr("NTSC"), tvTypeActs);\r
ntscAct->setStatusTip(tr("Sets Jaguar to NTSC mode"));\r
ntscAct->setCheckable(true);\r
connect(ntscAct, SIGNAL(triggered()), this, SLOT(SetNTSC()));\r
-\r
palAct = new QAction(QIcon(":/res/pal.png"), tr("PAL"), tvTypeActs);\r
palAct->setStatusTip(tr("Sets Jaguar to PAL mode"));\r
palAct->setCheckable(true);\r
connect(palAct, SIGNAL(triggered()), this, SLOT(SetPAL()));\r
\r
+ // Blur action\r
blur.addFile(":/res/blur-off.png", QSize(), QIcon::Normal, QIcon::Off);\r
blur.addFile(":/res/blur-on.png", QSize(), QIcon::Normal, QIcon::On);\r
-\r
blurAct = new QAction(blur, tr("Blur"), this);\r
blurAct->setStatusTip(tr("Sets OpenGL rendering to GL_NEAREST"));\r
blurAct->setCheckable(true);\r
connect(blurAct, SIGNAL(triggered()), this, SLOT(ToggleBlur()));\r
\r
+ // About action\r
aboutAct = new QAction(QIcon(":/res/vj-icon.png"), tr("&About..."), this);\r
aboutAct->setStatusTip(tr("Blatant self-promotion"));\r
connect(aboutAct, SIGNAL(triggered()), this, SLOT(ShowAboutWin()));\r
\r
+ // Help action\r
helpAct = new QAction(QIcon(":/res/vj-icon.png"), tr("&Contents..."), this);\r
helpAct->setStatusTip(tr("Help is available, if you should need it"));\r
connect(helpAct, SIGNAL(triggered()), this, SLOT(ShowHelpWin()));\r
\r
+ // File pickup action\r
if (!vjs.softTypeDebugger)\r
{\r
filePickAct = new QAction(QIcon(":/res/software.png"), tr("&Insert Cartridge..."), this);\r
filePickAct = new QAction(QIcon(":/res/software.png"), tr("&Insert executable file..."), this);\r
filePickAct->setStatusTip(tr("Insert an executable into Virtual Jaguar"));\r
}\r
- //filePickAct->setShortcut(QKeySequence(tr("Ctrl+i")));\r
filePickAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBPICKFILE].KBSettingValue)));\r
filePickAct->setShortcutContext(Qt::ApplicationShortcut);\r
connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart()));\r
\r
+ // Configuration action\r
configAct = new QAction(QIcon(":/res/wrench.png"), tr("&Configure"), this);\r
configAct->setStatusTip(tr("Configure options for Virtual Jaguar"));\r
- //configAct->setShortcut(QKeySequence(tr("Ctrl+c")));\r
configAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBCONFIGURE].KBSettingValue)));\r
configAct->setShortcutContext(Qt::ApplicationShortcut);\r
connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));\r
\r
+ // Emulation status action\r
emustatusAct = new QAction(QIcon(":/res/status.png"), tr("&Status"), this);\r
emustatusAct->setStatusTip(tr("Emulator status"));\r
- //emustatusAct->setShortcut(QKeySequence(tr("Ctrl+s")));\r
emustatusAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBEMUSTATUS].KBSettingValue)));\r
emustatusAct->setShortcutContext(Qt::ApplicationShortcut);\r
connect(emustatusAct, SIGNAL(triggered()), this, SLOT(ShowEmuStatusWin()));\r
\r
+ // Use CD action\r
useCDAct = new QAction(QIcon(":/res/compact-disc.png"), tr("&Use CD Unit"), this);\r
useCDAct->setStatusTip(tr("Use Jaguar Virtual CD unit"));\r
-// useCDAct->setShortcut(QKeySequence(tr("Ctrl+c")));\r
useCDAct->setCheckable(true);\r
connect(useCDAct, SIGNAL(triggered()), this, SLOT(ToggleCDUsage()));\r
\r
+ // Frame advance action\r
frameAdvanceAct = new QAction(QIcon(":/res/frame-advance.png"), tr("&Frame Advance"), this);\r
- //frameAdvanceAct->setShortcut(QKeySequence(tr("F7")));\r
frameAdvanceAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBFRAMEADVANCE].KBSettingValue)));\r
frameAdvanceAct->setShortcutContext(Qt::ApplicationShortcut);\r
frameAdvanceAct->setDisabled(true);\r
connect(frameAdvanceAct, SIGNAL(triggered()), this, SLOT(FrameAdvance()));\r
\r
+ // Fullscreen action\r
+ fullScreenAct = new QAction(QIcon(":/res/fullscreen.png"), tr("F&ull Screen"), this);\r
+ fullScreenAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBFULLSCREEN].KBSettingValue)));\r
+ fullScreenAct->setShortcutContext(Qt::ApplicationShortcut);\r
+ fullScreenAct->setCheckable(true);\r
+ connect(fullScreenAct, SIGNAL(triggered()), this, SLOT(ToggleFullScreen()));\r
+\r
+ // Actions dedicated to debugger mode\r
if (vjs.softTypeDebugger)\r
{\r
- restartAct = new QAction(QIcon(":/res/Restart.png"), tr("&Restart"), this);\r
- //restartAct->setShortcut(QKeySequence(tr("Ctrl+Shift+F5")));\r
+ // Restart\r
+ restartAct = new QAction(QIcon(":/res/debug-restart.png"), tr("&Restart"), this);\r
restartAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBRESTART].KBSettingValue)));\r
restartAct->setShortcutContext(Qt::ApplicationShortcut);\r
restartAct->setCheckable(false);\r
restartAct->setDisabled(true);\r
- connect(restartAct, SIGNAL(triggered()), this, SLOT(Restart()));\r
+ connect(restartAct, SIGNAL(triggered()), this, SLOT(DebuggerRestart()));\r
\r
- traceStepOverAct = new QAction(QIcon(":/res/StepOver.png"), tr("&Step Over"), this);\r
- //traceStepOverAct->setShortcut(QKeySequence(tr("F10")));\r
+ // Step over trace\r
+ traceStepOverAct = new QAction(QIcon(":/res/debug-stepover.png"), tr("&Step Over"), this);\r
traceStepOverAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBSTEPOVER].KBSettingValue)));\r
traceStepOverAct->setShortcutContext(Qt::ApplicationShortcut);\r
traceStepOverAct->setCheckable(false);\r
traceStepOverAct->setDisabled(true);\r
- connect(traceStepOverAct, SIGNAL(triggered()), this, SLOT(TraceStepOver()));\r
+ connect(traceStepOverAct, SIGNAL(triggered()), this, SLOT(DebuggerTraceStepOver()));\r
\r
- traceStepIntoAct = new QAction(QIcon(":/res/StepInto.png"), tr("&Step Into"), this);\r
- //traceStepIntoAct->setShortcut(QKeySequence(tr("F11")));\r
+ // Trace into trace\r
+ traceStepIntoAct = new QAction(QIcon(":/res/debug-stepinto.png"), tr("&Step Into"), this);\r
traceStepIntoAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBSTEPINTO].KBSettingValue)));\r
traceStepIntoAct->setShortcutContext(Qt::ApplicationShortcut);\r
traceStepIntoAct->setCheckable(false);\r
traceStepIntoAct->setDisabled(true);\r
- connect(traceStepIntoAct, SIGNAL(triggered()), this, SLOT(TraceStepInto()));\r
+ connect(traceStepIntoAct, SIGNAL(triggered()), this, SLOT(DebuggerTraceStepInto()));\r
\r
- newBreakpointFunctionAct = new QAction(QIcon(""), tr("&Function Breakpoint"), this);\r
- newBreakpointFunctionAct->setShortcut(QKeySequence(tr("Ctrl+B")));\r
- connect(newBreakpointFunctionAct, SIGNAL(triggered()), this, SLOT(NewBreakpointFunction()));\r
- }\r
+ //newBreakpointFunctionAct = new QAction(QIcon(""), tr("&Function Breakpoint"), this);\r
+ //newBreakpointFunctionAct->setShortcut(QKeySequence(tr("Ctrl+B")));\r
+ //connect(newBreakpointFunctionAct, SIGNAL(triggered()), this, SLOT(NewBreakpointFunction()));\r
\r
- fullScreenAct = new QAction(QIcon(":/res/fullscreen.png"), tr("F&ull Screen"), this);\r
- //fullScreenAct->setShortcut(QKeySequence(tr("F9")));\r
- fullScreenAct->setShortcut(QKeySequence(tr(vjs.KBContent[KBFULLSCREEN].KBSettingValue)));\r
- fullScreenAct->setShortcutContext(Qt::ApplicationShortcut);\r
- fullScreenAct->setCheckable(true);\r
- connect(fullScreenAct, SIGNAL(triggered()), this, SLOT(ToggleFullScreen()));\r
+ //VideoOutputAct = new QAction(tr("Output Video"), this);\r
+ //VideoOutputAct->setStatusTip(tr("Shows the output video window"));\r
+ //connect(VideoOutputAct, SIGNAL(triggered()), this, SLOT(ShowVideoOutputWin()));\r
\r
- // Debugger Actions\r
- if (vjs.softTypeDebugger)\r
- {\r
+ //DasmAct = new QAction(tr("Disassembly"), this);\r
+ //DasmAct->setStatusTip(tr("Shows the disassembly window"));\r
+ //connect(DasmAct, SIGNAL(triggered()), this, SLOT(ShowDasmWin()));\r
+\r
+ // Exception vector table window\r
exceptionVectorTableBrowseAct = new QAction(QIcon(""), tr("Exception Vector Table"), this);\r
exceptionVectorTableBrowseAct->setStatusTip(tr("Shows all Exception Vector Table browser window"));\r
connect(exceptionVectorTableBrowseAct, SIGNAL(triggered()), this, SLOT(ShowExceptionVectorTableBrowserWin()));\r
\r
- allWatchBrowseAct = new QAction(QIcon(":/res/Watch.png"), tr("All Watch"), this);\r
+ // All watch variables window\r
+ allWatchBrowseAct = new QAction(QIcon(":/res/debug-watch.png"), tr("All Watch"), this);\r
allWatchBrowseAct->setStatusTip(tr("Shows all Watch browser window"));\r
connect(allWatchBrowseAct, SIGNAL(triggered()), this, SLOT(ShowAllWatchBrowserWin()));\r
\r
- LocalBrowseAct = new QAction(QIcon(":/res/Local.png"), tr("Local"), this);\r
- LocalBrowseAct->setStatusTip(tr("Shows Local browser window"));\r
+ // Local variables window\r
+ LocalBrowseAct = new QAction(QIcon(":/res/debug-local.png"), tr("Locals"), this);\r
+ LocalBrowseAct->setStatusTip(tr("Shows Locals browser window"));\r
connect(LocalBrowseAct, SIGNAL(triggered()), this, SLOT(ShowLocalBrowserWin()));\r
\r
+ // Heap (memory) allocation window\r
heapallocatorBrowseAct = new QAction(QIcon(""), tr("Heap allocator"), this);\r
heapallocatorBrowseAct->setStatusTip(tr("Shows the heap allocator browser window"));\r
connect(heapallocatorBrowseAct, SIGNAL(triggered()), this, SLOT(ShowHeapAllocatorBrowserWin()));\r
\r
+ // Call stack window\r
+ CallStackBrowseAct = new QAction(QIcon(":/res/debug-callstack.png"), tr("Call Stack"), this);\r
+ CallStackBrowseAct->setStatusTip(tr("Shows Call Stack browser window"));\r
+ connect(CallStackBrowseAct, SIGNAL(triggered()), this, SLOT(ShowCallStackBrowserWin()));\r
+\r
+ // Memory windows\r
mem1BrowseAct = (QAction **)calloc(vjs.nbrmemory1browserwindow, sizeof(QAction));\r
QSignalMapper *signalMapper = new QSignalMapper(this);\r
#ifdef _MSC_VER\r
{\r
char MB[100];\r
sprintf(MB, "Memory %i", (unsigned int)(i+1));\r
- mem1BrowseAct[i] = new QAction(QIcon(":/res/tool-memory.png"), tr(MB), this);\r
+ mem1BrowseAct[i] = new QAction(QIcon(":/res/debug-memory.png"), tr(MB), this);\r
mem1BrowseAct[i]->setStatusTip(tr("Shows a Jaguar memory browser window"));\r
- //mem1BrowseAct[i]->\r
- //connect(mem1BrowseAct[0], SIGNAL(triggered()), this, SLOT(ShowMemory1BrowserWin(size_t(0))));\r
connect(mem1BrowseAct[i], SIGNAL(triggered()), signalMapper, SLOT(map()));\r
signalMapper->setMapping(mem1BrowseAct[i], (int)i);\r
connect(signalMapper, SIGNAL(mapped(int)), this, SLOT(ShowMemory1BrowserWin(int)));\r
}\r
}\r
\r
- // Debugger Browser Actions\r
+ // Memory browser window action\r
memBrowseAct = new QAction(QIcon(":/res/tool-memory.png"), tr("Memory Browser"), this);\r
memBrowseAct->setStatusTip(tr("Shows the Jaguar memory browser window"));\r
-// memBrowseAct->setCheckable(true);\r
connect(memBrowseAct, SIGNAL(triggered()), this, SLOT(ShowMemoryBrowserWin()));\r
\r
+ // Stack browser window action\r
stackBrowseAct = new QAction(QIcon(":/res/tool-stack.png"), tr("Stack Browser"), this);\r
stackBrowseAct->setStatusTip(tr("Shows the Jaguar stack browser window"));\r
- // memBrowseAct->setCheckable(true);\r
connect(stackBrowseAct, SIGNAL(triggered()), this, SLOT(ShowStackBrowserWin()));\r
\r
+ // CPUs (M68000, GPU & DSP browser window action\r
cpuBrowseAct = new QAction(QIcon(":/res/tool-cpu.png"), tr("CPU Browser"), this);\r
cpuBrowseAct->setStatusTip(tr("Shows the Jaguar CPU browser window"));\r
-// memBrowseAct->setCheckable(true);\r
connect(cpuBrowseAct, SIGNAL(triggered()), this, SLOT(ShowCPUBrowserWin()));\r
\r
+ // OP browser window action\r
opBrowseAct = new QAction(QIcon(":/res/tool-op.png"), tr("OP Browser"), this);\r
opBrowseAct->setStatusTip(tr("Shows the Jaguar OP browser window"));\r
-// memBrowseAct->setCheckable(true);\r
connect(opBrowseAct, SIGNAL(triggered()), this, SLOT(ShowOPBrowserWin()));\r
\r
+ // M68000 disassembly browser window\r
m68kDasmBrowseAct = new QAction(QIcon(":/res/tool-68k-dis.png"), tr("68K Listing Browser"), this);\r
m68kDasmBrowseAct->setStatusTip(tr("Shows the 68K disassembly browser window"));\r
-// memBrowseAct->setCheckable(true);\r
connect(m68kDasmBrowseAct, SIGNAL(triggered()), this, SLOT(ShowM68KDasmBrowserWin()));\r
\r
+ // Risc (DSP / GPU) disassembly browser window\r
riscDasmBrowseAct = new QAction(QIcon(":/res/tool-risc-dis.png"), tr("RISC Listing Browser"), this);\r
riscDasmBrowseAct->setStatusTip(tr("Shows the RISC disassembly browser window"));\r
-// memBrowseAct->setCheckable(true);\r
connect(riscDasmBrowseAct, SIGNAL(triggered()), this, SLOT(ShowRISCDasmBrowserWin()));\r
\r
- if (vjs.softTypeDebugger)\r
- {\r
- VideoOutputAct = new QAction(tr("Output Video"), this);\r
- VideoOutputAct->setStatusTip(tr("Shows the output video window"));\r
- connect(VideoOutputAct, SIGNAL(triggered()), this, SLOT(ShowVideoOutputWin()));\r
-\r
- DasmAct = new QAction(tr("Disassembly"), this);\r
- DasmAct->setStatusTip(tr("Shows the disassembly window"));\r
- connect(DasmAct, SIGNAL(triggered()), this, SLOT(ShowDasmWin()));\r
- }\r
-\r
// Misc. connections...\r
connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));\r
connect(filePickWin, SIGNAL(FilePickerHiding()), this, SLOT(Unpause()));\r
debugWindowsWatchMenu->addAction(allWatchBrowseAct);\r
debugWindowsMenu->addAction(LocalBrowseAct);\r
debugWindowsMenu->addSeparator();\r
+ debugWindowsMenu->addAction(CallStackBrowseAct);\r
+ debugWindowsMenu->addSeparator();\r
debugWindowsMemoryMenu = debugWindowsMenu->addMenu(tr("&Memory"));\r
debugWindowsMemoryMenu->addAction(heapallocatorBrowseAct);\r
debugWindowsMemoryMenu->addSeparator();\r
}\r
}\r
\r
+ // Help menus\r
helpMenu = menuBar()->addMenu(tr("&Help"));\r
helpMenu->addAction(helpAct);\r
helpMenu->addAction(aboutAct);\r
\r
// Create toolbars\r
\r
- toolbar = addToolBar(tr("Stuff"));\r
+ toolbar = addToolBar(tr("System"));\r
toolbar->addAction(powerAct);\r
if (!vjs.softTypeDebugger)\r
{\r
toolbar->addSeparator();\r
if (!vjs.softTypeDebugger)\r
{\r
+ toolbar->addAction(screenshotAct);\r
+ toolbar->addSeparator();\r
toolbar->addAction(x1Act);\r
toolbar->addAction(x2Act);\r
toolbar->addAction(x3Act);\r
// Do this in case original size isn't correct (mostly for the first-run case)\r
ResizeMainWindow();\r
\r
- // Create our test pattern bitmaps\r
+ WriteLog("Window creation done\n");\r
+\r
+ // Create our test pattern NTSC bitmap\r
+ WriteLog("Test pattern 1 bitmap\n");\r
+\r
QImage tempImg(":/res/test-pattern.jpg");\r
QImage tempImgScaled = tempImg.scaled(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_PAL, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);\r
\r
}\r
}\r
\r
- QImage tempImg2(":/res/test-pattern-pal");\r
+ // Create our test pattern PAL bitmap\r
+ WriteLog("Test pattern 2 bitmap\n");\r
+\r
+ QImage tempImg2(":/res/test-pattern-pal.jpg");\r
QImage tempImgScaled2 = tempImg2.scaled(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_PAL, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);\r
\r
for(uint32_t y=0; y<VIRTUAL_SCREEN_HEIGHT_PAL; y++)\r
WriteLog("Virtual Jaguar %s Rx (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__);\r
WriteLog("VJ: Initializing jaguar subsystem...\n");\r
JaguarInit();\r
-// memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Use the stock BIOS\r
+\r
+#ifndef NEWMODELSBIOSHANDLER\r
+ // memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Use the stock BIOS\r
memcpy(jagMemSpace + 0xE00000, (vjs.biosType == BT_K_SERIES ? jaguarBootROM : jaguarBootROM2), 0x20000); // Use the stock BIOS\r
+#else\r
+ SelectBIOS(vjs.biosType);\r
+#endif\r
\r
// Prevent the file scanner from running if filename passed\r
// in on the command line...\r
\r
// Attempt to load/run the ABS file...\r
LoadSoftware(vjs.absROMPath);\r
+#ifndef NEWMODELSBIOSHANDLER\r
memcpy(jagMemSpace + 0xE00000, jaguarDevBootROM2, 0x20000); // Use the stub BIOS\r
+#else\r
+ SelectBIOS(vjs.biosType);\r
+#endif\r
// Prevent the scanner from running...\r
return;\r
}\r
\r
// Attempt to load/run the ABS file...\r
LoadSoftware(vjs.absROMPath);\r
+#ifndef NEWMODELSBIOSHANDLER\r
memcpy(jagMemSpace + 0xE00000, jaguarDevBootROM2, 0x20000); // Use the stub BIOS\r
// Prevent the scanner from running...\r
+#else\r
+ SelectBIOS(vjs.biosType);\r
+#endif\r
return;\r
}\r
\r
// Just in case we crash before a clean exit...\r
WriteSettings();\r
\r
- RefreshDebuggerWindows();\r
+ DebuggerRefreshWindows();\r
}\r
\r
\r
// Otherwise, run the Jaguar simulation\r
HandleGamepads();\r
JaguarExecuteNew();\r
- if (!vjs.softTypeDebugger)\r
+ //if (!vjs.softTypeDebugger)\r
videoWidget->HandleMouseHiding();\r
\r
static uint32_t refresh = 0;\r
{\r
if (refresh == vjs.refresh)\r
{\r
- RefreshAlpineWindows();\r
+ AlpineRefreshWindows();\r
//memBrowseWin->RefreshContents();\r
//cpuBrowseWin->RefreshContents();\r
refresh = 0;\r
}\r
\r
\r
+// Toggle the power state, it can be either on or off\r
void MainWin::TogglePowerState(void)\r
{\r
powerButtonOn = !powerButtonOn;\r
if (!powerButtonOn)\r
{\r
// Restore the mouse pointer, if hidden:\r
- if (!vjs.softTypeDebugger)\r
+ //if (!vjs.softTypeDebugger)\r
+ {\r
videoWidget->CheckAndRestoreMouseCursor();\r
+ }\r
+\r
useCDAct->setDisabled(false);\r
palAct->setDisabled(false);\r
ntscAct->setDisabled(false);\r
pauseAct->setChecked(false);\r
pauseAct->setDisabled(true);\r
showUntunedTankCircuit = true;\r
+\r
DACPauseAudioThread();\r
- // This is just in case the ROM we were playing was in a narrow or wide\r
- // field mode, so the untuned tank sim doesn't look wrong. :-)\r
+ // This is just in case the ROM we were playing was in a narrow or wide field mode, so the untuned tank sim doesn't look wrong. :-)\r
TOMReset();\r
\r
if (plzDontKillMyComputer)\r
{\r
- //if (!vjs.softTypeDebugger)\r
+ // We have to do it line by line, because the texture pitch is not the same as the picture buffer's pitch.\r
+ for (uint32_t y = 0; y < videoWidget->rasterHeight; y++)\r
{\r
- // We have to do it line by line, because the texture pitch is not\r
- // the same as the picture buffer's pitch.\r
- for (uint32_t y = 0; y < videoWidget->rasterHeight; y++)\r
+ if (vjs.hardwareTypeNTSC)\r
{\r
- if (vjs.hardwareTypeNTSC)\r
- memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));\r
- else\r
- memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern2 + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));\r
+ memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));\r
+ }\r
+ else\r
+ {\r
+ memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern2 + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));\r
}\r
}\r
}\r
// does the expected thing. Otherwise, if we use the file picker to insert a\r
// cart, we expect to run the cart! Maybe have a RemoveCart function that only\r
// works if the CD unit is active?\r
- setWindowTitle(QString("Virtual Jaguar " VJ_RELEASE_VERSION\r
- " Rx - Now playing: Jaguar CD"));\r
+ setWindowTitle(QString("Virtual Jaguar " VJ_RELEASE_VERSION " Rx - Now playing: Jaguar CD"));\r
}\r
\r
WriteLog("GUI: Resetting Jaguar...\n");\r
JaguarReset();\r
+ DebuggerResetWindows();\r
DACPauseAudioThread(false);\r
}\r
}\r
\r
\r
+// Toggle the emulator state, it can be either on or off\r
void MainWin::ToggleRunState(void)\r
{\r
startM68KTracing = running;\r
running = !running;\r
\r
+ // Pause mode\r
if (!running)\r
{\r
+ // Set action buttons for the pause mode\r
frameAdvanceAct->setDisabled(false);\r
pauseAct->setChecked(true);\r
pauseAct->setDisabled(false);\r
{\r
// Restore the mouse pointer, if hidden:\r
videoWidget->CheckAndRestoreMouseCursor();\r
- // frameAdvanceAct->setDisabled(false);\r
\r
for (uint32_t i = 0; i < (uint32_t)(videoWidget->textureWidth * 256); i++)\r
{\r
\r
cpuBrowseWin->HoldBPM();\r
cpuBrowseWin->HandleBPMContinue();\r
- RefreshDebuggerWindows();\r
+ DebuggerRefreshWindows();\r
}\r
}\r
else\r
}\r
\r
\r
+// Jaguar initialisation and load software file\r
void MainWin::LoadSoftware(QString file)\r
{\r
running = false; // Prevent bad things(TM) from happening...\r
pauseForFileSelector = false; // Reset the file selector pause flag\r
\r
+ // Setup BIOS in his own dedicated Jaguar memory\r
+#ifndef NEWMODELSBIOSHANDLER\r
uint8_t * biosPointer = jaguarBootROM;\r
\r
- if (vjs.hardwareTypeAlpine)\r
- {\r
- biosPointer = jaguarDevBootROM2;\r
- }\r
-\r
- if (vjs.softTypeDebugger)\r
+ if (vjs.hardwareTypeAlpine || vjs.softTypeDebugger)\r
{\r
biosPointer = jaguarDevBootROM2;\r
}\r
\r
memcpy(jagMemSpace + 0xE00000, biosPointer, 0x20000);\r
+#else\r
+ SelectBIOS(vjs.biosType);\r
+#endif\r
\r
+ // Turn 'on' the power to initialize the Jaguar\r
powerAct->setDisabled(false);\r
powerAct->setChecked(true);\r
powerButtonOn = false;\r
\r
// We have to load our software *after* the Jaguar RESET\r
cartridgeLoaded = JaguarLoadFile(file.toUtf8().data());\r
- SET32(jaguarMainRAM, 0, vjs.DRAM_size); // Set top of stack...\r
+ SET32(jaguarMainRAM, 0, vjs.DRAM_size); // Set stack in the M68000's Reset SP\r
\r
// This is icky because we've already done it\r
// it gets worse :-P\r
// set the M68K in halt mode in case of a debug mode is used, so control is at user side\r
if (vjs.softTypeDebugger)\r
{\r
+ m68k_set_reg(M68K_REG_A6, 0);\r
m68kDasmWin->SetAddress(jaguarRunAddress);\r
//pauseAct->setDisabled(false);\r
//pauseAct->setChecked(true);\r
}\r
else\r
{\r
- if (vjs.hardwareTypeAlpine && !jaguarRunAddress)\r
+ // Prevent the launch in case of software without a start address and without BIOS presence\r
+ if (!vjs.useJaguarBIOS && !jaguarRunAddress)\r
{\r
ToggleRunState();\r
}\r
//\r
void MainWin::NewBreakpointFunction(void)\r
{\r
- brkWin->show();\r
- brkWin->RefreshContents();\r
+ //brkWin->show();\r
+ //brkWin->RefreshContents();\r
}\r
\r
\r
// Step Into trace\r
-void MainWin::TraceStepInto(void)\r
+void MainWin::DebuggerTraceStepInto(void)\r
{\r
JaguarStepInto();\r
videoWidget->updateGL();\r
- RefreshDebuggerWindows();\r
+ DebuggerRefreshWindows();\r
#ifdef _MSC_VER\r
#pragma message("Warning: !!! Need to verify the Step Into function !!!")\r
#else\r
\r
\r
// Restart\r
-void MainWin::Restart(void)\r
+void MainWin::DebuggerRestart(void)\r
{\r
+#if 1\r
+ m68k_pulse_reset();\r
+#else\r
m68k_set_reg(M68K_REG_PC, jaguarRunAddress);\r
m68k_set_reg(M68K_REG_SP, vjs.DRAM_size);\r
- //m68kDasmWin->SetAddress(jaguarRunAddress);\r
- ResetDebuggerWindows();\r
- RefreshDebuggerWindows();\r
+#endif\r
+ m68k_set_reg(M68K_REG_A6, 0);\r
+\r
+ DebuggerResetWindows();\r
+ DebuggerRefreshWindows();\r
#ifdef _MSC_VER\r
#pragma message("Warning: !!! Need to verify the Restart function !!!")\r
#else\r
\r
\r
// Step Over trace\r
-void MainWin::TraceStepOver(void)\r
+void MainWin::DebuggerTraceStepOver(void)\r
{\r
JaguarStepOver(0);\r
videoWidget->updateGL();\r
- RefreshDebuggerWindows();\r
+ DebuggerRefreshWindows();\r
#ifdef _MSC_VER\r
#pragma message("Warning: !!! Need to verify the Step Over function !!!")\r
#else\r
}\r
\r
\r
+// \r
void MainWin::ShowExceptionVectorTableBrowserWin(void)\r
{\r
exceptionvectortableBrowseWin->show();\r
}\r
\r
\r
+// \r
void MainWin::ShowLocalBrowserWin(void)\r
{\r
LocalBrowseWin->show();\r
}\r
\r
\r
+// \r
+void MainWin::ShowCallStackBrowserWin(void)\r
+{\r
+ CallStackBrowseWin->show();\r
+ CallStackBrowseWin->RefreshContents();\r
+}\r
+\r
+\r
void MainWin::ShowAllWatchBrowserWin(void)\r
{\r
allWatchBrowseWin->show();\r
}\r
\r
\r
+//\r
+#if 0\r
void MainWin::ShowDasmWin(void)\r
{\r
- DasmWin->show();\r
+// DasmWin->show();\r
// DasmWin->RefreshContents();\r
}\r
+#endif\r
\r
\r
+// \r
+#if 0\r
void MainWin::ShowVideoOutputWin(void)\r
{\r
//VideoOutputWindowCentrale = mainWindowCentrale->addSubWindow(videoWidget);\r
//VideoOutputWin->show();\r
//VideoOutputWin->RefreshContents(videoWidget);\r
}\r
+#endif\r
\r
\r
+// Resize video window based on zoom factor\r
+// It doesn't apply in debugger mode as we use this window to display disassembly\r
void MainWin::ResizeMainWindow(void)\r
{\r
if (!vjs.softTypeDebugger)\r
{\r
- videoWidget->setFixedSize(zoomLevel * VIRTUAL_SCREEN_WIDTH,\r
- zoomLevel * (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL));\r
+ videoWidget->setFixedSize(zoomLevel * VIRTUAL_SCREEN_WIDTH, zoomLevel * (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL));\r
\r
// Show the test pattern if user requested plzDontKillMyComputer mode\r
if (!powerButtonOn && plzDontKillMyComputer)\r
for (uint32_t y = 0; y < videoWidget->rasterHeight; y++)\r
{\r
if (vjs.hardwareTypeNTSC)\r
+ {\r
memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));\r
+ }\r
else\r
+ {\r
memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern2 + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));\r
+ }\r
}\r
}\r
\r
vjs.hardwareTypeNTSC = settings.value("hardwareTypeNTSC", true).toBool();\r
vjs.frameSkip = settings.value("frameSkip", 0).toInt();\r
vjs.useJaguarBIOS = settings.value("useJaguarBIOS", false).toBool();\r
+ vjs.useRetailBIOS = settings.value("useRetailBIOS", false).toBool();\r
+ vjs.useDevBIOS = settings.value("useDevBIOS", false).toBool();\r
vjs.GPUEnabled = settings.value("GPUEnabled", true).toBool();\r
vjs.DSPEnabled = settings.value("DSPEnabled", true).toBool();\r
vjs.audioEnabled = settings.value("audioEnabled", true).toBool();\r
vjs.glFilter = settings.value("glFilterType", 1).toInt();\r
vjs.renderType = settings.value("renderType", 0).toInt();\r
vjs.biosType = settings.value("biosType", BT_M_SERIES).toInt();\r
+ vjs.jaguarModel = settings.value("jaguarModel", JAG_M_SERIES).toInt();\r
vjs.useFastBlitter = settings.value("useFastBlitter", false).toBool();\r
strcpy(vjs.EEPROMPath, settings.value("EEPROMs", QStandardPaths::writableLocation(QStandardPaths::DataLocation).append("/eeproms/")).toString().toUtf8().data());\r
strcpy(vjs.ROMPath, settings.value("ROMs", QStandardPaths::writableLocation(QStandardPaths::DataLocation).append("/software/")).toString().toUtf8().data());\r
+ strcpy(vjs.screenshotPath, settings.value("Screenshots", QStandardPaths::writableLocation(QStandardPaths::DataLocation).append("/screenshots/")).toString().toUtf8().data());\r
\r
// Read settings from the Debugger mode\r
settings.beginGroup("debugger");\r
strcpy(vjs.debuggerROMPath, settings.value("DefaultROM", "").toString().toUtf8().data());\r
+ strcpy(vjs.sourcefilesearchPaths, settings.value("SourceFileSearchPaths", "").toString().toUtf8().data());\r
vjs.nbrdisasmlines = settings.value("NbrDisasmLines", 32).toUInt();\r
vjs.disasmopcodes = settings.value("DisasmOpcodes", true).toBool();\r
vjs.displayHWlabels = settings.value("DisplayHWLabels", true).toBool();\r
\r
// Write important settings to the log file\r
WriteLog("MainWin: Paths\n");\r
- WriteLog(" EEPROMPath = \"%s\"\n", vjs.EEPROMPath);\r
- WriteLog(" ROMPath = \"%s\"\n", vjs.ROMPath);\r
- WriteLog(" AlpineROMPath = \"%s\"\n", vjs.alpineROMPath);\r
- WriteLog("DebuggerROMPath = \"%s\"\n", vjs.debuggerROMPath);\r
- WriteLog(" absROMPath = \"%s\"\n", vjs.absROMPath);\r
- WriteLog(" Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));\r
+ WriteLog(" EEPROMPath = \"%s\"\n", vjs.EEPROMPath);\r
+ WriteLog(" ROMPath = \"%s\"\n", vjs.ROMPath);\r
+ WriteLog(" AlpineROMPath = \"%s\"\n", vjs.alpineROMPath);\r
+ WriteLog(" DebuggerROMPath = \"%s\"\n", vjs.debuggerROMPath);\r
+ WriteLog(" absROMPath = \"%s\"\n", vjs.absROMPath);\r
+ WriteLog(" ScreenshotsPath = \"%s\"\n", vjs.screenshotPath);\r
+ WriteLog("SourceFileSearchPaths = \"%s\"\n", vjs.sourcefilesearchPaths);\r
+ WriteLog("MainWin: Misc.\n");\r
+ WriteLog(" Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));\r
\r
#if 0\r
// Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *\r
vjs.p2KeyBindings[BUTTON_s] = settings.value("p2k_star", Qt::Key_Asterisk).toInt();\r
#endif\r
\r
+ WriteLog("Read setting = Done\n");\r
+\r
ReadProfiles(&settings);\r
+ DBGManager_SourceFileSearchPathsSet(vjs.sourcefilesearchPaths);\r
}\r
\r
\r
size = settings.value("exceptionVectorTableBrowseWinSize", QSize(400, 400)).toSize();\r
exceptionvectortableBrowseWin->resize(size);\r
\r
+ // Call Stack browser UI information\r
+ pos = settings.value("CallStackBrowseWinPos", QPoint(200, 200)).toPoint();\r
+ CallStackBrowseWin->move(pos);\r
+ settings.value("CallStackBrowseWinIsVisible", false).toBool() ? ShowCallStackBrowserWin() : void();\r
+ size = settings.value("CallStackBrowseWinSize", QSize(400, 400)).toSize();\r
+ CallStackBrowseWin->resize(size);\r
+\r
// Memories browser UI information\r
for (i = 0; i < vjs.nbrmemory1browserwindow; i++)\r
{\r
}\r
\r
settings.endGroup();\r
+\r
+ WriteLog("Read UI setting = Done\n");\r
}\r
\r
\r
settings.setValue("hardwareTypeNTSC", vjs.hardwareTypeNTSC);\r
settings.setValue("frameSkip", vjs.frameSkip);\r
settings.setValue("useJaguarBIOS", vjs.useJaguarBIOS);\r
+ settings.setValue("useRetailBIOS", vjs.useRetailBIOS);\r
+ settings.setValue("useDevBIOS", vjs.useDevBIOS);\r
settings.setValue("GPUEnabled", vjs.GPUEnabled);\r
settings.setValue("DSPEnabled", vjs.DSPEnabled);\r
settings.setValue("audioEnabled", vjs.audioEnabled);\r
settings.setValue("useOpenGL", vjs.useOpenGL);\r
settings.setValue("glFilterType", vjs.glFilter);\r
settings.setValue("renderType", vjs.renderType);\r
+ settings.setValue("jaguarModel", vjs.jaguarModel);\r
settings.setValue("biosType", vjs.biosType);\r
settings.setValue("useFastBlitter", vjs.useFastBlitter);\r
- settings.setValue("JagBootROM", vjs.jagBootPath);\r
- settings.setValue("CDBootROM", vjs.CDBootPath);\r
+ //settings.setValue("JagBootROM", vjs.jagBootPath);\r
+ //settings.setValue("CDBootROM", vjs.CDBootPath);\r
settings.setValue("EEPROMs", vjs.EEPROMPath);\r
settings.setValue("ROMs", vjs.ROMPath);\r
+ settings.setValue("Screenshots", vjs.screenshotPath);\r
\r
// Write settings from the Alpine mode\r
settings.beginGroup("alpine");\r
settings.setValue("displayFullSourceFilename", vjs.displayFullSourceFilename);\r
settings.setValue("NbrMemory1BrowserWindow", (unsigned int)vjs.nbrmemory1browserwindow);\r
settings.setValue("DefaultROM", vjs.debuggerROMPath);\r
+ settings.setValue("SourceFileSearchPaths", vjs.sourcefilesearchPaths);\r
settings.endGroup();\r
\r
// Write settings from the Keybindings\r
#endif\r
\r
WriteProfiles(&settings);\r
+ DBGManager_SourceFileSearchPathsSet(vjs.sourcefilesearchPaths);\r
}\r
\r
\r
settings.setValue("exceptionVectorTableBrowseWinPos", exceptionvectortableBrowseWin->pos());\r
settings.setValue("exceptionVectorTableBrowseWinIsVisible", exceptionvectortableBrowseWin->isVisible());\r
settings.setValue("exceptionVectorTableBrowseWinSize", exceptionvectortableBrowseWin->size());\r
+ settings.setValue("CallStackBrowseWinPos", CallStackBrowseWin->pos());\r
+ settings.setValue("CallStackBrowseWinIsVisible", CallStackBrowseWin->isVisible());\r
+ settings.setValue("CallStackBrowseWinSize", CallStackBrowseWin->size());\r
for (i = 0; i < vjs.nbrmemory1browserwindow; i++)\r
{\r
sprintf(mem1Name, "mem1BrowseWinPos[%i]", (unsigned int)i);\r
\r
\r
// Refresh alpine debug windows\r
-void MainWin::RefreshAlpineWindows(void)\r
+void MainWin::AlpineRefreshWindows(void)\r
{\r
cpuBrowseWin->RefreshContents();\r
memBrowseWin->RefreshContents();\r
}\r
\r
\r
-// Reset soft debugger & alpine debug windows\r
-void MainWin::ResetDebuggerWindows(void)\r
+// Reset soft debugger windows\r
+void MainWin::DebuggerResetWindows(void)\r
{\r
if (vjs.softTypeDebugger)\r
{\r
+ FilesrcListWin->Reset();\r
+ allWatchBrowseWin->Reset();\r
heapallocatorBrowseWin->Reset();\r
- }\r
\r
- //ResetAlpineWindows();\r
+ //ResetAlpineWindows();\r
+ }\r
}\r
\r
\r
// Refresh soft debugger & alpine debug windows\r
-void MainWin::RefreshDebuggerWindows(void)\r
+void MainWin::DebuggerRefreshWindows(void)\r
{\r
size_t i;\r
\r
if (vjs.softTypeDebugger)\r
{\r
+ FilesrcListWin->RefreshContents();\r
m68kDasmWin->RefreshContents();\r
GPUDasmWin->RefreshContents();\r
DSPDasmWin->RefreshContents();\r
allWatchBrowseWin->RefreshContents();\r
LocalBrowseWin->RefreshContents();\r
+ CallStackBrowseWin->RefreshContents();\r
heapallocatorBrowseWin->RefreshContents();\r
for (i = 0; i < vjs.nbrmemory1browserwindow; i++)\r
{\r
mem1BrowseWin[i]->RefreshContents(i);\r
}\r
\r
- RefreshAlpineWindows();\r
+ AlpineRefreshWindows();\r
}\r
}\r
+\r
+\r
+// Create and save screenshot\r
+void MainWin::MakeScreenshot(void)\r
+{\r
+ char Text[256];\r
+ QImage screenshot;\r
+ time_t now = time(0);\r
+ struct tm tstruct;\r
+\r
+ // Create filename\r
+ tstruct = *localtime(&now);\r
+ sprintf(Text, "%svj_%i%i%i_%i%i%i.jpg", vjs.screenshotPath, tstruct.tm_year, tstruct.tm_mon, tstruct.tm_mday, tstruct.tm_hour, tstruct.tm_min, tstruct.tm_sec);\r
+\r
+ // Create screenshot\r
+ screenshot = videoWidget->grabFrameBuffer();\r
+ screenshot.save((char *)Text, "JPG", 100);\r
+}\r
+\r
HCoop / clinton / Virtual-Jaguar-Rx.git / blobdiff