// JPM 09/12/2017 Added 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 09/04/2018 Added the new Models and BIOS handler\r
+// JPM 09/17/2018 Added a screenshot feature\r
//\r
\r
// FIXED:\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
powerAct->setChecked(false);\r
connect(powerAct, SIGNAL(triggered()), this, SLOT(TogglePowerState()));\r
\r
+ // Pause feature\r
QIcon pauseIcon;\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->setShortcutContext(Qt::ApplicationShortcut);\r
connect(pauseAct, SIGNAL(triggered()), this, SLOT(ToggleRunState()));\r
\r
+ // Screenshot feature\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
zoomActs = new QActionGroup(this);\r
\r
x1Act = new QAction(QIcon(":/res/zoom100.png"), tr("Zoom 100%"), zoomActs);\r
allWatchBrowseAct->setStatusTip(tr("Shows all Watch browser window"));\r
connect(allWatchBrowseAct, SIGNAL(triggered()), this, SLOT(ShowAllWatchBrowserWin()));\r
\r
- LocalBrowseAct = new QAction(QIcon(":/res/debug-local.png"), tr("Local"), this);\r
- LocalBrowseAct->setStatusTip(tr("Shows Local browser 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
heapallocatorBrowseAct = new QAction(QIcon(""), tr("Heap allocator"), this);\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
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
running = false; // Prevent bad things(TM) from happening...\r
pauseForFileSelector = false; // Reset the file selector pause flag\r
\r
+#ifndef NEWMODELSBIOSHANDLER\r
uint8_t * biosPointer = jaguarBootROM;\r
\r
if (vjs.hardwareTypeAlpine || vjs.softTypeDebugger)\r
}\r
\r
memcpy(jagMemSpace + 0xE00000, biosPointer, 0x20000);\r
+#else\r
+ SelectBIOS(vjs.biosType);\r
+#endif\r
\r
powerAct->setDisabled(false);\r
powerAct->setChecked(true);\r
}\r
else\r
{\r
+ // Prevent the Alpine mode to crash in case of software without a start address\r
if (vjs.hardwareTypeAlpine && !jaguarRunAddress)\r
{\r
ToggleRunState();\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
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("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
RefreshAlpineWindows();\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(Text, "JPG", 100);\r
+}\r
+\r
HCoop / clinton / Virtual-Jaguar-Rx.git / blobdiff