//
// mainwin.cpp - Qt-based GUI for Virtual Jaguar: Main Application Window
-// by James L. Hammons
+// by James Hammons
// (C) 2009 Underground Software
//
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
//
// Who When What
// --- ---------- -------------------------------------------------------------
// - Add dbl click/enter to select in cart list, ESC to dimiss [DONE]
// - Autoscan/autoload all available BIOS from 'software' folder [DONE]
// - Add 1 key jumping in cartridge list (press 'R', jumps to carts starting with 'R', etc) [DONE]
+// - Controller configuration [DONE]
//
// STILL TO BE DONE:
//
-// - Controller configuration
// - Remove SDL dependencies (sound, mainly) from Jaguar core lib
// - Fix inconsistency with trailing slashes in paths (eeproms needs one, software doesn't)
//
+// SFDX CODE: S1E9T8H5M23YS
// Uncomment this for debugging...
//#define DEBUG
#include "mainwin.h"
#include "SDL.h"
-#include "glwidget.h"
+#include "app.h"
#include "about.h"
-#include "settings.h"
-#include "filepicker.h"
#include "configdialog.h"
+#include "filepicker.h"
+#include "gamepad.h"
#include "generaltab.h"
+#include "glwidget.h"
+#include "help.h"
+#include "settings.h"
#include "version.h"
+#include "debug/cpubrowser.h"
+#include "debug/m68kdasmbrowser.h"
+#include "debug/memorybrowser.h"
+#include "debug/opbrowser.h"
+#include "debug/riscdasmbrowser.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
-
-// Uncomment this to use built-in BIOS/CD-ROM BIOS
-// You'll need a copy of jagboot.h & jagcd.h for this to work...!
-// Creating those is left as an exercise for the reader. ;-)
-//#define USE_BUILT_IN_BIOS
-
-//#ifdef USE_BUILT_IN_BIOS
-//#include "jagboot.h"
-//#include "jagcd.h"
//#endif
// The way BSNES controls things is by setting a timer with a zero
// 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(false), 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"));
-// setWindowTitle("Virtual Jaguar v2.0.0");
QString title = QString(tr("Virtual Jaguar " VJ_RELEASE_VERSION ));
setWindowTitle(title);
aboutWin = new AboutWindow(this);
+ helpWin = new HelpWindow(this);
filePickWin = new FilePickerWindow(this);
+ memBrowseWin = new MemoryBrowserWindow(this);
+ cpuBrowseWin = new CPUBrowserWindow(this);
+ opBrowseWin = new OPBrowserWindow(this);
+ m68kDasmBrowseWin = new M68KDasmBrowserWindow(this);
+ riscDasmBrowseWin = new RISCDasmBrowserWindow(this);
- videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setUnifiedTitleAndToolBarOnMac(true);
// Create actions
quitAppAct = new QAction(tr("E&xit"), this);
- quitAppAct->setShortcuts(QKeySequence::Quit);
+// quitAppAct->setShortcuts(QKeySequence::Quit);
+// quitAppAct->setShortcut(QKeySequence(tr("Alt+x")));
+ quitAppAct->setShortcut(QKeySequence(tr("Ctrl+q")));
quitAppAct->setStatusTip(tr("Quit Virtual Jaguar"));
connect(quitAppAct, SIGNAL(triggered()), this, SLOT(close()));
- powerAct = new QAction(QIcon(":/res/power.png"), tr("&Power"), this);
+ powerGreen.addFile(":/res/power-off.png", QSize(), QIcon::Normal, QIcon::Off);
+ powerGreen.addFile(":/res/power-on-green.png", QSize(), QIcon::Normal, QIcon::On);
+ powerRed.addFile(":/res/power-off.png", QSize(), QIcon::Normal, QIcon::Off);
+ powerRed.addFile(":/res/power-on-red.png", QSize(), QIcon::Normal, QIcon::On);
+
+// powerAct = new QAction(QIcon(":/res/power.png"), tr("&Power"), this);
+ powerAct = new QAction(powerGreen, tr("&Power"), this);
powerAct->setStatusTip(tr("Powers Jaguar on/off"));
powerAct->setCheckable(true);
powerAct->setChecked(false);
- powerAct->setDisabled(true);
+// powerAct->setDisabled(true);
connect(powerAct, SIGNAL(triggered()), this, SLOT(TogglePowerState()));
- pauseAct = new QAction(QIcon(":/res/pause.png"), tr("Pause"), this);
+ QIcon pauseIcon;
+ pauseIcon.addFile(":/res/pause-off", QSize(), QIcon::Normal, QIcon::Off);
+ pauseIcon.addFile(":/res/pause-on", QSize(), QIcon::Normal, QIcon::On);
+// pauseAct = new QAction(QIcon(":/res/pause.png"), tr("Pause"), this);
+ pauseAct = new QAction(pauseIcon, tr("Pause"), this);
pauseAct->setStatusTip(tr("Toggles the running state"));
pauseAct->setCheckable(true);
pauseAct->setDisabled(true);
palAct->setCheckable(true);
connect(palAct, SIGNAL(triggered()), this, SLOT(SetPAL()));
- blurAct = new QAction(QIcon(":/res/generic.png"), tr("Blur"), this);
+ blurAct = new QAction(QIcon(":/res/blur.png"), tr("Blur"), this);
blurAct->setStatusTip(tr("Sets OpenGL rendering to GL_NEAREST"));
blurAct->setCheckable(true);
connect(blurAct, SIGNAL(triggered()), this, SLOT(ToggleBlur()));
aboutAct->setStatusTip(tr("Blatant self-promotion"));
connect(aboutAct, SIGNAL(triggered()), this, SLOT(ShowAboutWin()));
+ helpAct = new QAction(QIcon(":/res/vj-icon.png"), tr("&Contents..."), this);
+ helpAct->setStatusTip(tr("Help is available, if you should need it"));
+ connect(helpAct, SIGNAL(triggered()), this, SLOT(ShowHelpWin()));
+
filePickAct = new QAction(QIcon(":/res/software.png"), tr("&Insert Cartridge..."), this);
filePickAct->setStatusTip(tr("Insert a cartridge into Virtual Jaguar"));
filePickAct->setShortcut(QKeySequence(tr("Ctrl+i")));
connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart()));
- configAct = new QAction(QIcon(":/res/generic.png"), tr("&Configure"), this);
+ configAct = new QAction(QIcon(":/res/wrench.png"), tr("&Configure"), this);
configAct->setStatusTip(tr("Configure options for Virtual Jaguar"));
configAct->setShortcut(QKeySequence(tr("Ctrl+c")));
connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
useCDAct->setCheckable(true);
connect(useCDAct, SIGNAL(triggered()), this, SLOT(ToggleCDUsage()));
+ frameAdvanceAct = new QAction(QIcon(":/res/frame-advance.png"), tr("&Frame Advance"), this);
+ frameAdvanceAct->setShortcut(QKeySequence(tr("F7")));
+ connect(frameAdvanceAct, SIGNAL(triggered()), this, SLOT(FrameAdvance()));
+
+ fullScreenAct = new QAction(QIcon(":/res/fullscreen.png"), tr("F&ull Screen"), this);
+ fullScreenAct->setShortcut(QKeySequence(tr("F9")));
+ fullScreenAct->setCheckable(true);
+ connect(fullScreenAct, SIGNAL(triggered()), this, SLOT(ToggleFullScreen()));
+
+ // Debugger Actions
+ memBrowseAct = new QAction(QIcon(":/res/tool-memory.png"), tr("Memory Browser"), this);
+ memBrowseAct->setStatusTip(tr("Shows the Jaguar memory browser window"));
+// memBrowseAct->setCheckable(true);
+ connect(memBrowseAct, SIGNAL(triggered()), this, SLOT(ShowMemoryBrowserWin()));
+
+ cpuBrowseAct = new QAction(QIcon(":/res/tool-cpu.png"), tr("CPU Browser"), this);
+ cpuBrowseAct->setStatusTip(tr("Shows the Jaguar CPU browser window"));
+// memBrowseAct->setCheckable(true);
+ connect(cpuBrowseAct, SIGNAL(triggered()), this, SLOT(ShowCPUBrowserWin()));
+
+ opBrowseAct = new QAction(QIcon(":/res/tool-op.png"), tr("OP Browser"), this);
+ opBrowseAct->setStatusTip(tr("Shows the Jaguar OP browser window"));
+// memBrowseAct->setCheckable(true);
+ connect(opBrowseAct, SIGNAL(triggered()), this, SLOT(ShowOPBrowserWin()));
+
+ m68kDasmBrowseAct = new QAction(QIcon(":/res/tool-68k-dis.png"), tr("68K Listing Browser"), this);
+ m68kDasmBrowseAct->setStatusTip(tr("Shows the 68K disassembly browser window"));
+// memBrowseAct->setCheckable(true);
+ connect(m68kDasmBrowseAct, SIGNAL(triggered()), this, SLOT(ShowM68KDasmBrowserWin()));
+
+ riscDasmBrowseAct = new QAction(QIcon(":/res/tool-risc-dis.png"), tr("RISC Listing Browser"), this);
+ riscDasmBrowseAct->setStatusTip(tr("Shows the RISC disassembly browser window"));
+// memBrowseAct->setCheckable(true);
+ connect(riscDasmBrowseAct, SIGNAL(triggered()), this, SLOT(ShowRISCDasmBrowserWin()));
+
// Misc. connections...
connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
connect(filePickWin, SIGNAL(FilePickerHiding()), this, SLOT(Unpause()));
// Create menus & toolbars
- fileMenu = menuBar()->addMenu(tr("&File"));
- fileMenu->addAction(filePickAct);
- fileMenu->addAction(useCDAct);
+ fileMenu = menuBar()->addMenu(tr("&Jaguar"));
fileMenu->addAction(powerAct);
fileMenu->addAction(pauseAct);
+ fileMenu->addAction(frameAdvanceAct);
+ fileMenu->addAction(filePickAct);
+ fileMenu->addAction(useCDAct);
fileMenu->addAction(configAct);
fileMenu->addAction(quitAppAct);
+ if (vjs.hardwareTypeAlpine)
+ {
+ debugMenu = menuBar()->addMenu(tr("&Debug"));
+ debugMenu->addAction(memBrowseAct);
+ debugMenu->addAction(cpuBrowseAct);
+ debugMenu->addAction(opBrowseAct);
+ debugMenu->addAction(m68kDasmBrowseAct);
+ debugMenu->addAction(riscDasmBrowseAct);
+ }
+
helpMenu = menuBar()->addMenu(tr("&Help"));
+ helpMenu->addAction(helpAct);
helpMenu->addAction(aboutAct);
toolbar = addToolBar(tr("Stuff"));
toolbar->addAction(palAct);
toolbar->addSeparator();
toolbar->addAction(blurAct);
+ toolbar->addAction(fullScreenAct);
+
+ if (vjs.hardwareTypeAlpine)
+ {
+ debugbar = addToolBar(tr("&Debug"));
+ debugbar->addAction(memBrowseAct);
+ debugbar->addAction(cpuBrowseAct);
+ debugbar->addAction(opBrowseAct);
+ debugbar->addAction(m68kDasmBrowseAct);
+ debugbar->addAction(riscDasmBrowseAct);
+ }
// 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);
-
// Do this in case original size isn't correct (mostly for the first-run case)
ResizeMainWindow();
// Set up timer based loop for animation...
timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(Timer()));
- timer->start(20);
+ // This isn't very accurate for NTSC: This is early by 40 msec per frame.
+ // This is because it's discarding the 0.6666... on the end of the fraction.
+ // Alas, 6 doesn't divide cleanly into 10. :-P
+//Should we defer this until SyncUI? Probably.
+//No, it doesn't work, because it uses setInterval() instead of start()...
+// timer->start(vjs.hardwareTypeNTSC ? 16 : 20);
+
+ // We set this initially, to make VJ behave somewhat as it would if no
+ // cart were inserted and the BIOS was set as active...
+ jaguarCartInserted = true;
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
- // Get the BIOS ROM
-#ifdef USE_BUILT_IN_BIOS
-// WriteLog("VJ: Using built in BIOS/CD BIOS...\n");
-// memcpy(jaguarBootROM, jagBootROM, 0x20000);
-// memcpy(jaguarCDBootROM, jagCDROM, 0x40000);
-//// BIOSLoaded = CDBIOSLoaded = true;
-// biosAvailable |= (BIOS_NORMAL | BIOS_CD);
-#else
-// What would be nice here would be a way to check if the BIOS was loaded so that we
-// could disable the pushbutton on the Misc Options menu... !!! FIX !!! [DONE here, but needs to be fixed in GUI as well!]
-// WriteLog("VJ: About to attempt to load BIOSes...\n");
-//This is short-circuiting the file finding thread... ??? WHY ???
-//Not anymore. Was related to a QImage object creation/corruption bug elsewhere.
-// BIOSLoaded = (JaguarLoadROM(jaguarBootROM, vjs.jagBootPath) == 0x20000 ? true : false);
-// WriteLog("VJ: BIOS is %savailable...\n", (BIOSLoaded ? "" : "not "));
-// CDBIOSLoaded = (JaguarLoadROM(jaguarCDBootROM, vjs.CDBootPath) == 0x40000 ? true : false);
-// WriteLog("VJ: CD BIOS is %savailable...\n", (CDBIOSLoaded ? "" : "not "));
-#endif
-
- 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
+
+ // 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)...
+ // (Really, this is to sync command line options passed in)
+ 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);
+
+ fullScreen = vjs.fullscreen;
+ SetFullScreen(fullScreen);
+
+ // Reset the timer to be what was set in the command line (if any):
+// timer->setInterval(vjs.hardwareTypeNTSC ? 16 : 20);
+ timer->start(vjs.hardwareTypeNTSC ? 16 : 20);
+}
+
+
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)
{
+ // From jaguar.cpp
+ extern bool startM68KTracing;
+
+ // We ignore the Alt key for now, since it causes problems with the GUI
+ if (e->key() == Qt::Key_Alt)
+ {
+ e->accept();
+ return;
+ }
+ else if (e->key() == Qt::Key_F11)
+ {
+ startM68KTracing = true;
+ e->accept();
+ return;
+ }
+
+/*
+ if (e->key() == Qt::Key_F9)
+ {
+ ToggleFullScreen();
+ return;
+ }
+*/
HandleKeys(e, true);
}
+
void MainWin::keyReleaseEvent(QKeyEvent * e)
{
+ // We ignore the Alt key for now, since it causes problems with the GUI
+ if (e->key() == Qt::Key_Alt)
+ {
+ e->accept();
+ return;
+ }
+
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_0_buttons[BUTTON_D] = 0;
if (e->key() == (int)vjs.p1KeyBindings[BUTTON_D] && joypad_0_buttons[BUTTON_U])
joypad_0_buttons[BUTTON_U] = 0;
+
+ if (e->key() == (int)vjs.p2KeyBindings[BUTTON_L] && joypad_1_buttons[BUTTON_R])
+ joypad_1_buttons[BUTTON_R] = 0;
+ if (e->key() == (int)vjs.p2KeyBindings[BUTTON_R] && joypad_1_buttons[BUTTON_L])
+ joypad_1_buttons[BUTTON_L] = 0;
+ if (e->key() == (int)vjs.p2KeyBindings[BUTTON_U] && joypad_1_buttons[BUTTON_D])
+ 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...!
for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
{
if (e->key() == (int)vjs.p1KeyBindings[i])
- joypad_0_buttons[i] = (uint8)state;
+// joypad_0_buttons[i] = (uint8)state;
+ joypad_0_buttons[i] = (state ? 0x01 : 0x00);
+
+// Pad #2 is screwing up pad #1. Prolly a problem in joystick.cpp...
+// So let's try to fix it there. :-P [DONE]
+ if (e->key() == (int)vjs.p2KeyBindings[i])
+// joypad_1_buttons[i] = (uint8)state;
+ joypad_1_buttons[i] = (state ? 0x01 : 0x00);
}
}
+
+void MainWin::HandleGamepads(void)
+{
+ Gamepad::Update();
+
+ for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
+ {
+ if (vjs.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT))
+ joypad_0_buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
+
+ if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT))
+ joypad_1_buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
+ }
+}
+
+
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)
{
- // Random hash & trash
- // We try to simulate an untuned tank circuit here... :-)
- for(uint32_t x=0; x<videoWidget->rasterWidth; x++)
+ // Some machines can't handle this, so we give them the option to disable it. :-)
+ if (!plzDontKillMyComputer)
{
- for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
+ // Random hash & trash
+ // We try to simulate an untuned tank circuit here... :-)
+ for(uint32_t x=0; x<videoWidget->rasterWidth; x++)
{
- videoWidget->buffer[(y * videoWidget->textureWidth) + x] = (rand() & 0xFF) << 8 | (rand() & 0xFF) << 16 | (rand() & 0xFF) << 24;// | (rand() & 0xFF);//0x000000FF;
- // buffer[(y * textureWidth) + x] = x*y;
+ for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
+ {
+ videoWidget->buffer[(y * videoWidget->textureWidth) + x]
+ = (rand() & 0xFF) << 8 | (rand() & 0xFF) << 16 | (rand() & 0xFF) << 24;
+ }
}
}
}
else
{
// Otherwise, run the Jaguar simulation
+ HandleGamepads();
JaguarExecuteNew();
-// memcpy(videoWidget->buffer, backbuffer, videoWidget->rasterHeight * videoWidget->rasterWidth);
- memcpy(videoWidget->buffer, backbuffer, videoWidget->rasterHeight * videoWidget->textureWidth * sizeof(uint32_t));
-// memcpy(surface->pixels, backbuffer, TOMGetVideoModeWidth() * TOMGetVideoModeHeight() * 4);
}
videoWidget->updateGL();
}
+
void MainWin::TogglePowerState(void)
{
powerButtonOn = !powerButtonOn;
+ running = true;
// With the power off, we simulate white noise on the screen. :-)
if (!powerButtonOn)
{
+ useCDAct->setDisabled(false);
+ palAct->setDisabled(false);
+ ntscAct->setDisabled(false);
pauseAct->setChecked(false);
pauseAct->setDisabled(true);
showUntunedTankCircuit = true;
- running = true;
// 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. :-)
+ DACPauseAudioThread();
TOMReset();
}
else
{
-//NOTE: Low hanging fruit: We can simplify this a lot...
+ useCDAct->setDisabled(true);
+ palAct->setDisabled(true);
+ ntscAct->setDisabled(true);
+ pauseAct->setChecked(false);
+ pauseAct->setDisabled(false);
+ showUntunedTankCircuit = false;
+
// Otherwise, we prepare for running regular software...
- if (!CDActive)
- {
- showUntunedTankCircuit = false;//(cartridgeLoaded ? false : true);
- pauseAct->setChecked(false);
- pauseAct->setDisabled(false);//!cartridgeLoaded);
- }
- // Or, set up for the Jaguar CD
- else
+ if (CDActive)
{
// Should check for cartridgeLoaded here as well...!
// We can clear it when toggling CDActive on, so that when we power cycle it does the
// expected thing. Otherwise, if we use the file picker to insert a cart, we expect
// to run the cart! Maybe have a RemoveCart function that only works if the CD unit
// is active?
- showUntunedTankCircuit = false;
- pauseAct->setChecked(false);
- pauseAct->setDisabled(false);
- memcpy(jagMemSpace + 0x800000, jaguarCDBootROM, 0x40000);
setWindowTitle(QString("Virtual Jaguar " VJ_RELEASE_VERSION
" - Now playing: Jaguar CD"));
}
WriteLog("GUI: Resetting Jaguar...\n");
JaguarReset();
- running = true;
+ DACPauseAudioThread(false);
}
}
+
void MainWin::ToggleRunState(void)
{
running = !running;
{
for(uint32_t i=0; i<(uint32_t)(videoWidget->textureWidth * 256); i++)
{
- uint32_t pixel = backbuffer[i];
+ uint32_t pixel = videoWidget->buffer[i];
uint8_t r = (pixel >> 24) & 0xFF, g = (pixel >> 16) & 0xFF, b = (pixel >> 8) & 0xFF;
pixel = ((r + g + b) / 3) & 0x00FF;
- backbuffer[i] = 0x000000FF | (pixel << 16) | (pixel << 8);
+ videoWidget->buffer[i] = 0x000000FF | (pixel << 16) | (pixel << 8);
}
- memcpy(videoWidget->buffer, backbuffer, videoWidget->rasterHeight * videoWidget->textureWidth * sizeof(uint32_t));
-
videoWidget->updateGL();
}
+
+ // Pause/unpause any running/non-running threads...
+ DACPauseAudioThread(!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 (running)
+ // If the emulator is running, we pause it here and unpause it later
+ // if we dismiss the file selector without choosing anything
+ if (running && powerButtonOn)
{
ToggleRunState();
pauseForFileSelector = true;
filePickWin->show();
}
+
void MainWin::Unpause(void)
{
// Here we unpause the emulator if it was paused when we went into the file selector
if (pauseForFileSelector)
{
pauseForFileSelector = false;
- ToggleRunState();
+
+ // Some nutter might have unpaused while in the file selector, so check for that
+ if (!running)
+ ToggleRunState();
}
}
+
void MainWin::LoadSoftware(QString file)
{
running = false; // Prevent bad things(TM) from happening...
pauseForFileSelector = false; // Reset the file selector pause flag
SET32(jaguarMainRAM, 0, 0x00200000); // Set top of stack...
- cartridgeLoaded = (JaguarLoadFile(file.toAscii().data()) ? true : false);
+ cartridgeLoaded = JaguarLoadFile(file.toAscii().data());
char * biosPointer = jaguarBootROM;
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;
+#if 0
if (CDActive)
{
powerAct->setDisabled(false);
{
powerAct->setDisabled(true);
}
+#else
+ // Set up the Jaguar CD for execution, otherwise, clear memory
+ if (CDActive)
+ memcpy(jagMemSpace + 0x800000, jaguarCDBootROM, 0x40000);
+ else
+ memset(jagMemSpace + 0x800000, 0xFF, 0x40000);
+#endif
+}
+
+
+void MainWin::FrameAdvance(void)
+{
+//printf("Frame Advance...\n");
+ // Execute 1 frame, then exit (only useful in Pause mode)
+ JaguarExecuteNew();
+ videoWidget->updateGL();
+}
+
+
+void MainWin::SetFullScreen(bool state/*= true*/)
+{
+ if (state)
+ {
+ mainWinPosition = pos();
+// mainWinSize = size();
+ menuBar()->hide();
+ statusBar()->hide();
+ x1Act->setDisabled(true);
+ x2Act->setDisabled(true);
+ x3Act->setDisabled(true);
+ showFullScreen();
+ // This is needed because the fullscreen may happen on a different
+ // screen than screen 0:
+ int screenNum = QApplication::desktop()->screenNumber(videoWidget);
+ QRect r = QApplication::desktop()->availableGeometry(screenNum);
+// double targetWidth = 320.0, targetHeight = (vjs.hardwareTypeNTSC ? 240.0 : 256.0);
+ double targetWidth = (double)VIRTUAL_SCREEN_WIDTH,
+ targetHeight = (double)(vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL);
+ double aspectRatio = targetWidth / targetHeight;
+ // NOTE: Really should check here to see which dimension constrains the other.
+ // Right now, we assume that height is the constraint.
+ int newWidth = (int)(aspectRatio * (double)r.height());
+ videoWidget->offset = (r.width() - newWidth) / 2;
+ videoWidget->fullscreen = true;
+ videoWidget->outputWidth = newWidth;
+
+// videoWidget->setFixedSize(newWidth, r.height());
+ videoWidget->setFixedSize(r.width(), r.height());
+ showFullScreen();
+ }
+ else
+ {
+ // Reset the video widget to windowed mode
+ videoWidget->offset = 0;
+ videoWidget->fullscreen = false;
+ x1Act->setDisabled(false);
+ x2Act->setDisabled(false);
+ x3Act->setDisabled(false);
+ menuBar()->show();
+ statusBar()->show();
+ showNormal();
+ ResizeMainWindow();
+ move(mainWinPosition);
+ }
+
+ // For some reason, this doesn't work: If the emu is paused, toggling from
+ // fullscreen to windowed (& vice versa) shows a white screen.
+// videoWidget->updateGL();
}
+
+void MainWin::ToggleFullScreen(void)
+{
+ fullScreen = !fullScreen;
+ SetFullScreen(fullScreen);
+}
+
+
+void MainWin::ShowMemoryBrowserWin(void)
+{
+ memBrowseWin->show();
+ memBrowseWin->RefreshContents();
+}
+
+
+void MainWin::ShowCPUBrowserWin(void)
+{
+ cpuBrowseWin->show();
+ cpuBrowseWin->RefreshContents();
+}
+
+
+void MainWin::ShowOPBrowserWin(void)
+{
+ opBrowseWin->show();
+ opBrowseWin->RefreshContents();
+}
+
+
+void MainWin::ShowM68KDasmBrowserWin(void)
+{
+ m68kDasmBrowseWin->show();
+ m68kDasmBrowseWin->RefreshContents();
+}
+
+
+void MainWin::ShowRISCDasmBrowserWin(void)
+{
+ riscDasmBrowseWin->show();
+ riscDasmBrowseWin->RefreshContents();
+}
+
+
void MainWin::ResizeMainWindow(void)
{
- videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));
+// videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));
+ videoWidget->setFixedSize(zoomLevel * VIRTUAL_SCREEN_WIDTH,
+ zoomLevel * (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL));
show();
for(int i=0; i<2; i++)
}
}
+
+#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");
- QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
+ mainWinPosition = settings.value("pos", QPoint(200, 200)).toPoint();
QSize size = settings.value("size", QSize(400, 400)).toSize();
resize(size);
- move(pos);
- pos = settings.value("cartLoadPos", QPoint(200, 200)).toPoint();
+ move(mainWinPosition);
+ QPoint pos = settings.value("cartLoadPos", QPoint(200, 200)).toPoint();
filePickWin->move(pos);
- zoomLevel = settings.value("zoom", 1).toInt();
+ zoomLevel = settings.value("zoom", 2).toInt();
allowUnknownSoftware = settings.value("showUnknownSoftware", false).toBool();
vjs.useJoystick = settings.value("useJoystick", false).toBool();
vjs.hardwareTypeNTSC = settings.value("hardwareTypeNTSC", true).toBool();
vjs.frameSkip = settings.value("frameSkip", 0).toInt();
vjs.useJaguarBIOS = settings.value("useJaguarBIOS", false).toBool();
+ vjs.GPUEnabled = settings.value("GPUEnabled", true).toBool();
vjs.DSPEnabled = settings.value("DSPEnabled", false).toBool();
vjs.audioEnabled = settings.value("audioEnabled", true).toBool();
vjs.usePipelinedDSP = settings.value("usePipelinedDSP", false).toBool();
vjs.fullscreen = settings.value("fullscreen", false).toBool();
vjs.useOpenGL = settings.value("useOpenGL", true).toBool();
- vjs.glFilter = settings.value("glFilterType", 0).toInt();
+ vjs.glFilter = settings.value("glFilterType", 1).toInt();
vjs.renderType = settings.value("renderType", 0).toInt();
vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
// strcpy(vjs.jagBootPath, settings.value("JagBootROM", "./bios/[BIOS] Atari Jaguar (USA, Europe).zip").toString().toAscii().data());
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_Up).toInt();
- vjs.p1KeyBindings[BUTTON_D] = settings.value("p1k_down", Qt::Key_Down).toInt();
- vjs.p1KeyBindings[BUTTON_L] = settings.value("p1k_left", Qt::Key_Left).toInt();
- vjs.p1KeyBindings[BUTTON_R] = settings.value("p1k_right", Qt::Key_Right).toInt();
- vjs.p1KeyBindings[BUTTON_C] = settings.value("p1k_c", Qt::Key_Z).toInt();
- vjs.p1KeyBindings[BUTTON_B] = settings.value("p1k_b", Qt::Key_X).toInt();
- vjs.p1KeyBindings[BUTTON_A] = settings.value("p1k_a", Qt::Key_C).toInt();
- vjs.p1KeyBindings[BUTTON_OPTION] = settings.value("p1k_option", Qt::Key_Apostrophe).toInt();
- vjs.p1KeyBindings[BUTTON_PAUSE] = settings.value("p1k_pause", Qt::Key_Return).toInt();
+ vjs.p1KeyBindings[BUTTON_U] = settings.value("p1k_up", Qt::Key_S).toInt();
+ vjs.p1KeyBindings[BUTTON_D] = settings.value("p1k_down", Qt::Key_X).toInt();
+ vjs.p1KeyBindings[BUTTON_L] = settings.value("p1k_left", Qt::Key_A).toInt();
+ vjs.p1KeyBindings[BUTTON_R] = settings.value("p1k_right", Qt::Key_D).toInt();
+ vjs.p1KeyBindings[BUTTON_C] = settings.value("p1k_c", Qt::Key_J).toInt();
+ vjs.p1KeyBindings[BUTTON_B] = settings.value("p1k_b", Qt::Key_K).toInt();
+ vjs.p1KeyBindings[BUTTON_A] = settings.value("p1k_a", Qt::Key_L).toInt();
+ vjs.p1KeyBindings[BUTTON_OPTION] = settings.value("p1k_option", Qt::Key_O).toInt();
+ vjs.p1KeyBindings[BUTTON_PAUSE] = settings.value("p1k_pause", Qt::Key_P).toInt();
vjs.p1KeyBindings[BUTTON_0] = settings.value("p1k_0", Qt::Key_0).toInt();
vjs.p1KeyBindings[BUTTON_1] = settings.value("p1k_1", Qt::Key_1).toInt();
vjs.p1KeyBindings[BUTTON_2] = settings.value("p1k_2", Qt::Key_2).toInt();
vjs.p1KeyBindings[BUTTON_7] = settings.value("p1k_7", Qt::Key_7).toInt();
vjs.p1KeyBindings[BUTTON_8] = settings.value("p1k_8", Qt::Key_8).toInt();
vjs.p1KeyBindings[BUTTON_9] = settings.value("p1k_9", Qt::Key_9).toInt();
- vjs.p1KeyBindings[BUTTON_d] = settings.value("p1k_pound", Qt::Key_Slash).toInt();
- vjs.p1KeyBindings[BUTTON_s] = settings.value("p1k_star", Qt::Key_Asterisk).toInt();
+ vjs.p1KeyBindings[BUTTON_d] = settings.value("p1k_pound", Qt::Key_Minus).toInt();
+ vjs.p1KeyBindings[BUTTON_s] = settings.value("p1k_star", Qt::Key_Equal).toInt();
vjs.p2KeyBindings[BUTTON_U] = settings.value("p2k_up", Qt::Key_Up).toInt();
vjs.p2KeyBindings[BUTTON_D] = settings.value("p2k_down", Qt::Key_Down).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("hardwareTypeNTSC", vjs.hardwareTypeNTSC);
settings.setValue("frameSkip", vjs.frameSkip);
settings.setValue("useJaguarBIOS", vjs.useJaguarBIOS);
+ settings.setValue("GPUEnabled", vjs.GPUEnabled);
settings.setValue("DSPEnabled", vjs.DSPEnabled);
settings.setValue("audioEnabled", vjs.audioEnabled);
settings.setValue("usePipelinedDSP", vjs.usePipelinedDSP);
settings.setValue("p2k_star", vjs.p2KeyBindings[BUTTON_s]);
}
-// Here's how Byuu does it...
-// I think I have it working now... :-)
-#if 0
-void Utility::resizeMainWindow()
-{
- unsigned region = config().video.context->region;
- unsigned multiplier = config().video.context->multiplier;
- unsigned width = 256 * multiplier;
- unsigned height = (region == 0 ? 224 : 239) * multiplier;
-
- if(config().video.context->correctAspectRatio)
- {
- if(region == 0)
- {
- width = (double)width * config().video.ntscAspectRatio + 0.5; //NTSC adjust
- }
- else
- {
- width = (double)width * config().video.palAspectRatio + 0.5; //PAL adjust
- }
- }
-
- if(config().video.isFullscreen == false)
- {
- //get effective desktop work area region (ignore Windows taskbar, OS X dock, etc.)
- QRect deskRect = QApplication::desktop()->availableGeometry(mainWindow);
-
- //ensure window size will not be larger than viewable desktop area
- constrainSize(height, width, deskRect.height()); //- frameHeight);
- constrainSize(width, height, deskRect.width()); //- frameWidth );
-
- mainWindow->canvas->setFixedSize(width, height);
- mainWindow->show();
- }
- else
- {
- for(unsigned i = 0; i < 2; i++)
- {
- unsigned iWidth = width, iHeight = height;
-
- constrainSize(iHeight, iWidth, mainWindow->canvasContainer->size().height());
- constrainSize(iWidth, iHeight, mainWindow->canvasContainer->size().width());
-
- //center canvas onscreen; ensure it is not larger than viewable area
- mainWindow->canvas->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- mainWindow->canvas->setFixedSize(iWidth, iHeight);
- mainWindow->canvas->setMinimumSize(0, 0);
-
- usleep(2000);
- QApplication::processEvents();
- }
- }
- //workaround for Qt/Xlib bug:
- //if window resize occurs with cursor over it, Qt shows Qt::Size*DiagCursor;
- //so force it to show Qt::ArrowCursor, as expected
- mainWindow->setCursor(Qt::ArrowCursor);
- mainWindow->canvasContainer->setCursor(Qt::ArrowCursor);
- mainWindow->canvas->setCursor(Qt::ArrowCursor);
-
- //workaround for DirectSound(?) bug:
- //window resizing sometimes breaks audio sync, this call re-initializes it
- updateAvSync();
-}
-
-void Utility::setScale(unsigned scale)
+void MainWin::WriteUISettings(void)
{
- config().video.context->multiplier = scale;
- resizeMainWindow();
- mainWindow->shrink();
- mainWindow->syncUi();
-}
+ QSettings settings("Underground Software", "Virtual Jaguar");
+ settings.setValue("pos", pos());
+ settings.setValue("size", size());
+ settings.setValue("cartLoadPos", filePickWin->pos());
-void QbWindow::shrink()
-{
- if(config().video.isFullscreen == false)
- {
- for(unsigned i = 0; i < 2; i++)
- {
- resize(0, 0);
- usleep(2000);
- QApplication::processEvents();
- }
- }
+ settings.setValue("zoom", zoomLevel);
}
-#endif
projects / virtualjaguar / blobdiff