#include "mainwin.h"
#include "SDL.h"
+#include "app.h"
#include "glwidget.h"
#include "about.h"
#include "help.h"
#include "configdialog.h"
#include "generaltab.h"
#include "version.h"
+#include "debug/memorybrowser.h"
#include "dac.h"
#include "jaguar.h"
#include "jagstub2bios.h"
#include "joystick.h"
-#ifdef __GCCWIN32__
+// According to SebRmv, this header isn't seen on Arch Linux either... :-/
+//#ifdef __GCCWIN32__
// Apparently on win32, usleep() is not pulled in by the usual suspects.
#include <unistd.h>
-#endif
+//#endif
// The way BSNES controls things is by setting a timer with a zero
// timeout, sleeping if not emulating anything. Seems there has to be a
// We'll make the VJ core modular so that it doesn't matter what GUI is in
// use, we can drop it in anywhere and use it as-is.
-MainWin::MainWin(): running(true), powerButtonOn(false), showUntunedTankCircuit(true),
- cartridgeLoaded(false), CDActive(false),//, alpineLoadSuccessful(false),
- pauseForFileSelector(false)
+//MainWin::MainWin(QString filenameToRun): running(true), powerButtonOn(false),
+MainWin::MainWin(bool autoRun): running(true), powerButtonOn(false),
+ showUntunedTankCircuit(true), cartridgeLoaded(false), CDActive(false),
+ //, alpineLoadSuccessful(false),
+// pauseForFileSelector(false), loadAndGo(false), plzDontKillMyComputer(false)
+ pauseForFileSelector(false), loadAndGo(autoRun), plzDontKillMyComputer(false)
{
+ for(int i=0; i<8; i++)
+ keyHeld[i] = false;
+
videoWidget = new GLWidget(this);
setCentralWidget(videoWidget);
setWindowIcon(QIcon(":/res/vj-icon.png"));
aboutWin = new AboutWindow(this);
helpWin = new HelpWindow(this);
filePickWin = new FilePickerWindow(this);
+ memBrowseWin = new MemoryBrowserWindow(this);
videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
useCDAct->setCheckable(true);
connect(useCDAct, SIGNAL(triggered()), this, SLOT(ToggleCDUsage()));
- frameAdvanceAct = new QAction(QIcon(":/res/generic.png"), tr("&Frame Advance"), this);
+ frameAdvanceAct = new QAction(QIcon(":/res/frame-advance.png"), tr("&Frame Advance"), this);
frameAdvanceAct->setShortcut(QKeySequence(tr("F7")));
connect(frameAdvanceAct, SIGNAL(triggered()), this, SLOT(FrameAdvance()));
+ // Debugger Actions
+ memBrowseAct = new QAction(QIcon(":/res/generic.png"), tr("Memory Browser"), this);
+ memBrowseAct->setStatusTip(tr("Shows the Jaguar memory browser window"));
+// memBrowseAct->setCheckable(true);
+ connect(memBrowseAct, SIGNAL(triggered()), this, SLOT(ShowMemoryBrowserWin()));
+
// Misc. connections...
connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
connect(filePickWin, SIGNAL(FilePickerHiding()), this, SLOT(Unpause()));
fileMenu->addAction(configAct);
fileMenu->addAction(quitAppAct);
+ if (vjs.hardwareTypeAlpine)
+ {
+ debugMenu = menuBar()->addMenu(tr("&Debug"));
+ debugMenu->addAction(memBrowseAct);
+ }
+
helpMenu = menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(helpAct);
helpMenu->addAction(aboutAct);
toolbar->addSeparator();
toolbar->addAction(blurAct);
+ if (vjs.hardwareTypeAlpine)
+ {
+ debugbar = addToolBar(tr("&Debug"));
+ debugbar->addAction(memBrowseAct);
+ }
+
// Create status bar
statusBar()->showMessage(tr("Ready"));
ReadSettings();
- // Set toolbar buttons/menus based on settings read in (sync the UI)...
- blurAct->setChecked(vjs.glFilter);
- x1Act->setChecked(zoomLevel == 1);
- x2Act->setChecked(zoomLevel == 2);
- x3Act->setChecked(zoomLevel == 3);
-// running = powerAct->isChecked();
- ntscAct->setChecked(vjs.hardwareTypeNTSC);
- palAct->setChecked(!vjs.hardwareTypeNTSC);
- powerAct->setIcon(vjs.hardwareTypeNTSC ? powerRed : powerGreen);
-
// Do this in case original size isn't correct (mostly for the first-run case)
ResizeMainWindow();
WriteLog("Virtual Jaguar %s (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__);
WriteLog("VJ: Initializing jaguar subsystem...\n");
JaguarInit();
+ memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Use the stock BIOS
- filePickWin->ScanSoftwareFolder(allowUnknownSoftware);
+ // Check for filename passed in on the command line...
+// if (!filenameToRun.isEmpty())
+ if (autoRun)
+ {
+// loadAndGo = true;
+ // Attempt to load/run the file the user passed in...
+// LoadSoftware(filenameToRun);
+//// memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Use the stock BIOS
+ // Prevent the file scanner from running...
+ return;
+ }
// Load up the default ROM if in Alpine mode:
if (vjs.hardwareTypeAlpine)
// Attempt to load/run the ABS file...
LoadSoftware(vjs.absROMPath);
memcpy(jagMemSpace + 0xE00000, jaguarDevBootROM2, 0x20000); // Use the stub BIOS
+ // Prevent the scanner from running...
+ return;
}
- else
- memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Otherwise, use the stock BIOS
+// else
+// memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Otherwise, use the stock BIOS
+
+ // Run the scanner if nothing passed in and *not* Alpine mode...
+ // NB: Really need to look into caching the info scanned in here...
+ filePickWin->ScanSoftwareFolder(allowUnknownSoftware);
+}
+
+
+void MainWin::LoadFile(QString file)
+{
+ LoadSoftware(file);
+}
+
+
+void MainWin::SyncUI(void)
+{
+ // Set toolbar buttons/menus based on settings read in (sync the UI)...
+ blurAct->setChecked(vjs.glFilter);
+ x1Act->setChecked(zoomLevel == 1);
+ x2Act->setChecked(zoomLevel == 2);
+ x3Act->setChecked(zoomLevel == 3);
+// running = powerAct->isChecked();
+ ntscAct->setChecked(vjs.hardwareTypeNTSC);
+ palAct->setChecked(!vjs.hardwareTypeNTSC);
+ powerAct->setIcon(vjs.hardwareTypeNTSC ? powerRed : powerGreen);
}
+
void MainWin::closeEvent(QCloseEvent * event)
{
JaguarDone();
- WriteSettings();
+// This should only be done by the config dialog
+// WriteSettings();
+ WriteUISettings();
event->accept(); // ignore() if can't close for some reason
}
+
void MainWin::keyPressEvent(QKeyEvent * e)
{
// We ignore the Alt key for now, since it causes problems with the GUI
HandleKeys(e, true);
}
+
void MainWin::keyReleaseEvent(QKeyEvent * e)
{
// We ignore the Alt key for now, since it causes problems with the GUI
HandleKeys(e, false);
}
+
void MainWin::HandleKeys(QKeyEvent * e, bool state)
{
+ enum { P1LEFT = 0, P1RIGHT, P1UP, P1DOWN, P2LEFT, P2RIGHT, P2UP, P2DOWN };
// We kill bad key combos here, before they can get to the emulator...
// This also kills the illegal instruction problem that cropped up in Rayman!
// May want to do this by killing the old one instead of ignoring the new one...
// Seems to work better that way...
+
+// The problem with this approach is that it causes bad results because it doesn't do
+// any checking of previous states. Need to come up with something better because this
+// causes problems where the keyboard acts as if it were unresponsive. :-P
#if 0
if ((e->key() == vjs.p1KeyBindings[BUTTON_L] && joypad_0_buttons[BUTTON_R])
|| (e->key() == vjs.p1KeyBindings[BUTTON_R] && joypad_0_buttons[BUTTON_L])
|| (e->key() == vjs.p1KeyBindings[BUTTON_D] && joypad_0_buttons[BUTTON_U]))
return;
#else
+#if 0
if (e->key() == (int)vjs.p1KeyBindings[BUTTON_L] && joypad_0_buttons[BUTTON_R])
joypad_0_buttons[BUTTON_R] = 0;
if (e->key() == (int)vjs.p1KeyBindings[BUTTON_R] && joypad_0_buttons[BUTTON_L])
joypad_1_buttons[BUTTON_D] = 0;
if (e->key() == (int)vjs.p2KeyBindings[BUTTON_D] && joypad_1_buttons[BUTTON_U])
joypad_1_buttons[BUTTON_U] = 0;
+#else
+//hrm, this still has sticky state problems... Ugh!
+ // First, settle key states...
+ if (e->key() == (int)vjs.p1KeyBindings[BUTTON_L])
+ keyHeld[P1LEFT] = state;
+ else if (e->key() == (int)vjs.p1KeyBindings[BUTTON_R])
+ keyHeld[P1RIGHT] = state;
+ else if (e->key() == (int)vjs.p1KeyBindings[BUTTON_U])
+ keyHeld[P1UP] = state;
+ else if (e->key() == (int)vjs.p1KeyBindings[BUTTON_D])
+ keyHeld[P1DOWN] = state;
+ else if (e->key() == (int)vjs.p2KeyBindings[BUTTON_L])
+ keyHeld[P2LEFT] = state;
+ else if (e->key() == (int)vjs.p2KeyBindings[BUTTON_R])
+ keyHeld[P2RIGHT] = state;
+ else if (e->key() == (int)vjs.p2KeyBindings[BUTTON_U])
+ keyHeld[P2UP] = state;
+ else if (e->key() == (int)vjs.p2KeyBindings[BUTTON_D])
+ keyHeld[P2DOWN] = state;
+
+ // Next, check for conflicts and bail out if there are any...
+ if ((keyHeld[P1LEFT] && keyHeld[P1RIGHT])
+ || (keyHeld[P1UP] && keyHeld[P1DOWN])
+ || (keyHeld[P2LEFT] && keyHeld[P2RIGHT])
+ || (keyHeld[P2UP] && keyHeld[P2DOWN]))
+ return;
+#endif
#endif
// No bad combos exist, let's stuff the emulator key buffers...!
}
}
+
void MainWin::Open(void)
{
}
+
void MainWin::Configure(void)
{
// Call the configuration dialog and update settings
QString before = vjs.ROMPath;
QString alpineBefore = vjs.alpineROMPath;
QString absBefore = vjs.absROMPath;
- bool audioBefore = vjs.audioEnabled;
+// bool audioBefore = vjs.audioEnabled;
+ bool audioBefore = vjs.DSPEnabled;
dlg.UpdateVJSettings();
QString after = vjs.ROMPath;
QString alpineAfter = vjs.alpineROMPath;
QString absAfter = vjs.absROMPath;
- bool audioAfter = vjs.audioEnabled;
+// bool audioAfter = vjs.audioEnabled;
+ bool audioAfter = vjs.DSPEnabled;
bool allowOld = allowUnknownSoftware;
//ick.
}
}
- // If the "Enable audio" checkbox changed, then we have to re-init the DAC...
+ // If the "Enable DSP" checkbox changed, then we have to re-init the DAC,
+ // since it's running in the host audio IRQ...
if (audioBefore != audioAfter)
{
DACDone();
WriteSettings();
}
+
//
// Here's the main emulator loop
//
if (showUntunedTankCircuit)
{
+ // Some machines can't handle this, so we give them the option to disable it. :-)
+ if (!plzDontKillMyComputer)
+ {
// Random hash & trash
// We try to simulate an untuned tank circuit here... :-)
for(uint32_t x=0; x<videoWidget->rasterWidth; x++)
= (rand() & 0xFF) << 8 | (rand() & 0xFF) << 16 | (rand() & 0xFF) << 24;
}
}
+ }
}
else
{
videoWidget->updateGL();
}
+
void MainWin::TogglePowerState(void)
{
powerButtonOn = !powerButtonOn;
}
}
+
void MainWin::ToggleRunState(void)
{
running = !running;
}
}
+
void MainWin::SetZoom100(void)
{
zoomLevel = 1;
ResizeMainWindow();
}
+
void MainWin::SetZoom200(void)
{
zoomLevel = 2;
ResizeMainWindow();
}
+
void MainWin::SetZoom300(void)
{
zoomLevel = 3;
ResizeMainWindow();
}
+
void MainWin::SetNTSC(void)
{
powerAct->setIcon(powerRed);
timer->setInterval(16);
vjs.hardwareTypeNTSC = true;
ResizeMainWindow();
+ WriteSettings();
}
+
void MainWin::SetPAL(void)
{
powerAct->setIcon(powerGreen);
timer->setInterval(20);
vjs.hardwareTypeNTSC = false;
ResizeMainWindow();
+ WriteSettings();
}
+
void MainWin::ToggleBlur(void)
{
vjs.glFilter = !vjs.glFilter;
+ WriteSettings();
}
+
void MainWin::ShowAboutWin(void)
{
aboutWin->show();
}
+
void MainWin::ShowHelpWin(void)
{
helpWin->show();
}
+
void MainWin::InsertCart(void)
{
// If the emulator is running, we pause it here and unpause it later
filePickWin->show();
}
+
void MainWin::Unpause(void)
{
// Here we unpause the emulator if it was paused when we went into the file selector
}
}
+
void MainWin::LoadSoftware(QString file)
{
running = false; // Prevent bad things(TM) from happening...
powerButtonOn = false;
TogglePowerState();
- if (!vjs.hardwareTypeAlpine)
+ if (!vjs.hardwareTypeAlpine && !loadAndGo)
{
QString newTitle = QString("Virtual Jaguar " VJ_RELEASE_VERSION " - Now playing: %1")
.arg(filePickWin->GetSelectedPrettyName());
}
}
+
void MainWin::ToggleCDUsage(void)
{
CDActive = !CDActive;
#endif
}
+
void MainWin::FrameAdvance(void)
{
//printf("Frame Advance...\n");
videoWidget->updateGL();
}
+
+void MainWin::ShowMemoryBrowserWin(void)
+{
+ memBrowseWin->show();
+ memBrowseWin->RefreshContents();
+}
+
+
void MainWin::ResizeMainWindow(void)
{
videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));
}
}
+
+#warning "!!! Need to check the window geometry to see if the positions are legal !!!"
+// i.e., someone could drag it to another screen, close it, then disconnect that screen
void MainWin::ReadSettings(void)
{
QSettings settings("Underground Software", "Virtual Jaguar");
WriteLog(" ROMPath = \"%s\"\n", vjs.ROMPath);
WriteLog("AlpineROMPath = \"%s\"\n", vjs.alpineROMPath);
WriteLog(" absROMPath = \"%s\"\n", vjs.absROMPath);
+WriteLog("Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));
// Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, *
vjs.p1KeyBindings[BUTTON_U] = settings.value("p1k_up", Qt::Key_S).toInt();
vjs.p2KeyBindings[BUTTON_s] = settings.value("p2k_star", Qt::Key_Asterisk).toInt();
}
+
void MainWin::WriteSettings(void)
{
QSettings settings("Underground Software", "Virtual Jaguar");
settings.setValue("p2k_pound", vjs.p2KeyBindings[BUTTON_d]);
settings.setValue("p2k_star", vjs.p2KeyBindings[BUTTON_s]);
}
+
+
+void MainWin::WriteUISettings(void)
+{
+ QSettings settings("Underground Software", "Virtual Jaguar");
+ settings.setValue("pos", pos());
+ settings.setValue("size", size());
+ settings.setValue("cartLoadPos", filePickWin->pos());
+
+ settings.setValue("zoom", zoomLevel);
+}
projects / virtualjaguar / blobdiff