//
// STILL TO BE DONE:
//
+// - Fix bug in switching between PAL & NTSC in fullscreen mode.
// - Remove SDL dependencies (sound, mainly) from Jaguar core lib
// - Fix inconsistency with trailing slashes in paths (eeproms needs one, software doesn't)
//
-// SFDX CODE: 9XF9TUHFM2359
+// SFDX CODE: S1E9T8H5M23YS
// Uncomment this for debugging...
//#define DEBUG
#include "dac.h"
#include "jaguar.h"
-#include "tom.h"
#include "log.h"
#include "file.h"
#include "jagbios.h"
+#include "jagbios2.h"
#include "jagcdbios.h"
#include "jagstub2bios.h"
#include "joystick.h"
+#include "m68000/m68kinterface.h"
// According to SebRmv, this header isn't seen on Arch Linux either... :-/
//#ifdef __GCCWIN32__
// 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(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)
{
+ debugbar = NULL;
+
for(int i=0; i<8; i++)
keyHeld[i] = false;
+ // FPS management
+ for(int i=0; i<RING_BUFFER_SIZE; i++)
+ ringBuffer[i] = 0;
+
+ ringBufferPointer = RING_BUFFER_SIZE - 1;
+
videoWidget = new GLWidget(this);
setCentralWidget(videoWidget);
setWindowIcon(QIcon(":/res/vj-icon.png"));
// quitAppAct->setShortcuts(QKeySequence::Quit);
// quitAppAct->setShortcut(QKeySequence(tr("Alt+x")));
quitAppAct->setShortcut(QKeySequence(tr("Ctrl+q")));
+ quitAppAct->setShortcutContext(Qt::ApplicationShortcut);
quitAppAct->setStatusTip(tr("Quit Virtual Jaguar"));
connect(quitAppAct, SIGNAL(triggered()), this, SLOT(close()));
pauseAct->setCheckable(true);
pauseAct->setDisabled(true);
pauseAct->setShortcut(QKeySequence(tr("Esc")));
+ pauseAct->setShortcutContext(Qt::ApplicationShortcut);
connect(pauseAct, SIGNAL(triggered()), this, SLOT(ToggleRunState()));
zoomActs = new QActionGroup(this);
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()));
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")));
+ filePickAct->setShortcutContext(Qt::ApplicationShortcut);
connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart()));
configAct = new QAction(QIcon(":/res/wrench.png"), tr("&Configure"), this);
configAct->setStatusTip(tr("Configure options for Virtual Jaguar"));
configAct->setShortcut(QKeySequence(tr("Ctrl+c")));
+ configAct->setShortcutContext(Qt::ApplicationShortcut);
connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
useCDAct = new QAction(QIcon(":/res/compact-disc.png"), tr("&Use CD Unit"), this);
frameAdvanceAct = new QAction(QIcon(":/res/frame-advance.png"), tr("&Frame Advance"), this);
frameAdvanceAct->setShortcut(QKeySequence(tr("F7")));
+ frameAdvanceAct->setShortcutContext(Qt::ApplicationShortcut);
+ frameAdvanceAct->setDisabled(true);
connect(frameAdvanceAct, SIGNAL(triggered()), this, SLOT(FrameAdvance()));
- fullScreenAct = new QAction(QIcon(":/res/generic.png"), tr("F&ull Screen"), this);
+ fullScreenAct = new QAction(QIcon(":/res/fullscreen.png"), tr("F&ull Screen"), this);
fullScreenAct->setShortcut(QKeySequence(tr("F9")));
+ fullScreenAct->setShortcutContext(Qt::ApplicationShortcut);
+ fullScreenAct->setCheckable(true);
connect(fullScreenAct, SIGNAL(triggered()), this, SLOT(ToggleFullScreen()));
// Debugger Actions
- memBrowseAct = new QAction(QIcon(":/res/generic.png"), tr("Memory Browser"), this);
+ 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/generic.png"), tr("CPU Browser"), this);
+ 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/generic.png"), tr("OP Browser"), this);
+ 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/generic.png"), tr("68K Listing Browser"), this);
+ 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/generic.png"), tr("RISC Listing Browser"), this);
+ 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()));
fileMenu = menuBar()->addMenu(tr("&Jaguar"));
fileMenu->addAction(powerAct);
fileMenu->addAction(pauseAct);
- fileMenu->addAction(frameAdvanceAct);
+// fileMenu->addAction(frameAdvanceAct);
fileMenu->addAction(filePickAct);
fileMenu->addAction(useCDAct);
fileMenu->addAction(configAct);
toolbar = addToolBar(tr("Stuff"));
toolbar->addAction(powerAct);
toolbar->addAction(pauseAct);
+ toolbar->addAction(frameAdvanceAct);
toolbar->addAction(filePickAct);
toolbar->addAction(useCDAct);
toolbar->addSeparator();
debugbar->addAction(riscDasmBrowseAct);
}
+ // Add actions to the main window, as hiding widgets with them
+ // disables them :-P
+ addAction(fullScreenAct);
+ addAction(quitAppAct);
+ addAction(configAct);
+ addAction(pauseAct);
+ addAction(filePickAct);
+ addAction(frameAdvanceAct);
+
// Create status bar
statusBar()->showMessage(tr("Ready"));
// Do this in case original size isn't correct (mostly for the first-run case)
ResizeMainWindow();
+ // Create our test pattern bitmap
+ QImage tempImg(":/res/test-pattern.jpg");
+ QImage tempImgScaled = tempImg.scaled(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_PAL, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+ for(uint32_t y=0; y<VIRTUAL_SCREEN_HEIGHT_PAL; y++)
+ {
+ const QRgb * scanline = (QRgb *)tempImgScaled.constScanLine(y);
+
+ for(uint32_t x=0; x<VIRTUAL_SCREEN_WIDTH; x++)
+ {
+ uint32_t pixel = (qRed(scanline[x]) << 24) | (qGreen(scanline[x]) << 16) | (qBlue(scanline[x]) << 8) | 0xFF;
+ testPattern[(y * VIRTUAL_SCREEN_WIDTH) + x] = pixel;
+ }
+ }
+
// Set up timer based loop for animation...
timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(Timer()));
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
+// memcpy(jagMemSpace + 0xE00000, jaguarBootROM, 0x20000); // Use the stock BIOS
+ memcpy(jagMemSpace + 0xE00000, (vjs.biosType == BT_K_SERIES ? jaguarBootROM : jaguarBootROM2), 0x20000); // Use the stock BIOS
- // Check for filename passed in on the command line...
-// if (!filenameToRun.isEmpty())
+ // Prevent the file scanner from running if filename passed
+ // in on the command line...
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)
// 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...
palAct->setChecked(!vjs.hardwareTypeNTSC);
powerAct->setIcon(vjs.hardwareTypeNTSC ? powerRed : powerGreen);
+ fullScreenAct->setChecked(vjs.fullscreen);
fullScreen = vjs.fullscreen;
SetFullScreen(fullScreen);
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)
{
{
if (e->key() == (int)vjs.p1KeyBindings[i])
// joypad_0_buttons[i] = (uint8)state;
- joypad_0_buttons[i] = (state ? 0x01 : 0x00);
+ joypad0Buttons[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);
+ joypad1Buttons[i] = (state ? 0x01 : 0x00);
}
}
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.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
+ joypad0Buttons[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);
+ if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
+ joypad1Buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
}
}
// Otherwise, run the Jaguar simulation
HandleGamepads();
JaguarExecuteNew();
+ videoWidget->HandleMouseHiding();
}
videoWidget->updateGL();
+
+#if 1
+ // FPS handling
+ // Approach: We use a ring buffer to store timestamps over a given amount
+ // of frames, then sum them to figure out the FPS.
+ uint32_t timestamp = SDL_GetTicks();
+ // This assumes the ring buffer size is a power of 2
+ ringBufferPointer = (ringBufferPointer + 1) & (RING_BUFFER_SIZE - 1);
+ ringBuffer[ringBufferPointer] = timestamp - oldTimestamp;
+ uint32_t elapsedTime = 0;
+
+ for(uint32_t i=0; i<RING_BUFFER_SIZE; i++)
+ elapsedTime += ringBuffer[i];
+
+ // elapsedTime must be non-zero
+ if (elapsedTime == 0)
+ elapsedTime = 1;
+
+#if 0
+ float framesPerSecond = ((float)RING_BUFFER_SIZE / (float)elapsedTime) * 1000.0;
+ statusBar()->showMessage(QString("%1 FPS").arg(framesPerSecond));
+#else
+ // This is in frames per 10 seconds, so we can have 1 decimal
+ uint32_t framesPerSecond = (uint32_t)(((float)RING_BUFFER_SIZE / (float)elapsedTime) * 10000.0);
+ uint32_t fpsIntegerPart = framesPerSecond / 10;
+ uint32_t fpsDecimalPart = framesPerSecond % 10;
+ statusBar()->showMessage(QString("%1.%2 FPS").arg(fpsIntegerPart).arg(fpsDecimalPart));
+#endif
+ oldTimestamp = timestamp;
+#endif
}
// With the power off, we simulate white noise on the screen. :-)
if (!powerButtonOn)
{
+ // Restore the mouse pointer, if hidden:
+ videoWidget->CheckAndRestoreMouseCursor();
useCDAct->setDisabled(false);
palAct->setDisabled(false);
ntscAct->setDisabled(false);
pauseAct->setChecked(false);
pauseAct->setDisabled(true);
showUntunedTankCircuit = 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();
+ // 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. :-)
TOMReset();
+
+ if (plzDontKillMyComputer)
+ {
+ // We have to do it line by line, because the texture pitch is not
+ // the same as the picture buffer's pitch.
+ for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
+ {
+ memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
+ }
+ }
}
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?
+// 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?
setWindowTitle(QString("Virtual Jaguar " VJ_RELEASE_VERSION
" - Now playing: Jaguar CD"));
}
if (!running)
{
+ // Restore the mouse pointer, if hidden:
+ videoWidget->CheckAndRestoreMouseCursor();
+ frameAdvanceAct->setDisabled(false);
+
for(uint32_t i=0; i<(uint32_t)(videoWidget->textureWidth * 256); i++)
{
uint32_t pixel = videoWidget->buffer[i];
videoWidget->updateGL();
}
+ else
+ frameAdvanceAct->setDisabled(true);
// Pause/unpause any running/non-running threads...
DACPauseAudioThread(!running);
{
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());
char * biosPointer = jaguarBootROM;
powerAct->setChecked(true);
powerButtonOn = false;
TogglePowerState();
+ // We have to load our software *after* the Jaguar RESET
+ cartridgeLoaded = JaguarLoadFile(file.toAscii().data());
+ SET32(jaguarMainRAM, 0, 0x00200000); // Set top of stack...
+
+ // This is icky because we've already done it
+// it gets worse :-P
+if (!vjs.useJaguarBIOS)
+ SET32(jaguarMainRAM, 4, jaguarRunAddress);
+
+ m68k_pulse_reset();
if (!vjs.hardwareTypeAlpine && !loadAndGo)
{
{
CDActive = !CDActive;
-#if 0
- if (CDActive)
- {
- powerAct->setDisabled(false);
- }
- else
- {
- 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
}
// Execute 1 frame, then exit (only useful in Pause mode)
JaguarExecuteNew();
videoWidget->updateGL();
+ // Need to execute 1 frames' worth of DSP thread as well :-/
+#warning "!!! Need to execute the DSP thread for 1 frame too !!!"
}
if (state)
{
mainWinPosition = pos();
-// mainWinSize = size();
menuBar()->hide();
statusBar()->hide();
+ toolbar->hide();
+
+ if (debugbar)
+ debugbar->hide();
+
showFullScreen();
- QRect r = QApplication::desktop()->availableGeometry();
-// double targetWidth = 320.0, targetHeight = (vjs.hardwareTypeNTSC ? 240.0 : 256.0);
+ // 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);
+ QRect r = QApplication::desktop()->screenGeometry(screenNum);
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.
+ // 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->setFixedSize(newWidth, r.height());
+ videoWidget->offset = (r.width() - newWidth) / 2;
+ videoWidget->fullscreen = true;
+ videoWidget->outputWidth = newWidth;
+ videoWidget->setFixedSize(r.width(), r.height());
showFullScreen();
}
else
{
+ // Reset the video widget to windowed mode
+ videoWidget->offset = 0;
+ videoWidget->fullscreen = false;
menuBar()->show();
statusBar()->show();
+ toolbar->show();
+
+ if (debugbar)
+ debugbar->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::ResizeMainWindow(void)
{
-// 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 the test pattern if user requested plzDontKillMyComputer mode
+ if (!powerButtonOn && plzDontKillMyComputer)
+ {
+ for(uint32_t y=0; y<videoWidget->rasterHeight; y++)
+ {
+ memcpy(videoWidget->buffer + (y * videoWidget->textureWidth), testPattern + (y * VIRTUAL_SCREEN_WIDTH), VIRTUAL_SCREEN_WIDTH * sizeof(uint32_t));
+ }
+ }
+
show();
for(int i=0; i<2; i++)
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());
-// strcpy(vjs.CDBootPath, settings.value("CDBootROM", "./bios/jagcd.rom").toString().toAscii().data());
+ vjs.biosType = settings.value("biosType", BT_M_SERIES).toInt();
strcpy(vjs.EEPROMPath, settings.value("EEPROMs", "./eeproms/").toString().toAscii().data());
strcpy(vjs.ROMPath, settings.value("ROMs", "./software/").toString().toAscii().data());
strcpy(vjs.alpineROMPath, settings.value("DefaultROM", "").toString().toAscii().data());
strcpy(vjs.absROMPath, settings.value("DefaultABS", "").toString().toAscii().data());
+
WriteLog("MainWin: Paths\n");
-//WriteLog(" jagBootPath = \"%s\"\n", vjs.jagBootPath);
-//WriteLog(" CDBootPath = \"%s\"\n", vjs.CDBootPath);
WriteLog(" EEPROMPath = \"%s\"\n", vjs.EEPROMPath);
WriteLog(" ROMPath = \"%s\"\n", vjs.ROMPath);
WriteLog("AlpineROMPath = \"%s\"\n", vjs.alpineROMPath);
settings.setValue("glFilterType", vjs.glFilter);
settings.setValue("renderType", vjs.renderType);
settings.setValue("writeROM", vjs.allowWritesToROM);
+ settings.setValue("biosType", vjs.biosType);
settings.setValue("JagBootROM", vjs.jagBootPath);
settings.setValue("CDBootROM", vjs.CDBootPath);
settings.setValue("EEPROMs", vjs.EEPROMPath);
projects / virtualjaguar / blobdiff