#include "app.h"
#include "about.h"
#include "configdialog.h"
+#include "controllertab.h"
#include "filepicker.h"
#include "gamepad.h"
#include "generaltab.h"
#include "glwidget.h"
#include "help.h"
+#include "profile.h"
#include "settings.h"
#include "version.h"
#include "debug/cpubrowser.h"
showUntunedTankCircuit(true), cartridgeLoaded(false), CDActive(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);
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/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()));
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"));
{
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 | JOY_AXIS))
- joypad_0_buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
-
+ joypad0Buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
+/*{
+if (vjs.p1KeyBindings[i] & JOY_AXIS)
+ printf("Axis state (HandleGamepads): %i\n", joypad0Buttons[i]);
+}*/
if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
- joypad_1_buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
+ joypad1Buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
}
}
ConfigDialog dlg(this);
//ick.
dlg.generalTab->useUnknownSoftware->setChecked(allowUnknownSoftware);
+ dlg.controllerTab1->profileNum = lastEditedProfile;
+ dlg.controllerTab1->SetupLastUsedProfile();
if (dlg.exec() == false)
return;
bool allowOld = allowUnknownSoftware;
//ick.
allowUnknownSoftware = dlg.generalTab->useUnknownSoftware->isChecked();
+ lastEditedProfile = dlg.controllerTab1->profileNum;
// We rescan the "software" folder if the user either changed the path or
// checked/unchecked the "Allow unknown files" option in the config dialog.
// Otherwise, run the Jaguar simulation
HandleGamepads();
JaguarExecuteNew();
-// videoWidget->HideMouseIfTimedOut();
videoWidget->HandleMouseHiding();
}
videoWidget->updateGL();
+
+ // FPS handling
+ // Approach: We use a ring buffer to store times (in ms) 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);
+ // Doing it this way is better. Ring buffer size can be arbitrary then.
+ ringBufferPointer = (ringBufferPointer + 1) % RING_BUFFER_SIZE;
+ 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;
+
+ // 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;
+ // If this is updated too frequently to be useful, we can throttle it down
+ // so that it only updates every 10th frame or so
+ statusBar()->showMessage(QString("%1.%2 FPS").arg(fpsIntegerPart).arg(fpsDecimalPart));
+ oldTimestamp = timestamp;
}
pauseAct->setDisabled(true);
showUntunedTankCircuit = true;
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. :-)
+ // 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.
+ // 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));
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"));
}
mainWinPosition = pos();
menuBar()->hide();
statusBar()->hide();
- x1Act->setDisabled(true);
- x2Act->setDisabled(true);
- x3Act->setDisabled(true);
+ toolbar->hide();
+
+ if (debugbar)
+ debugbar->hide();
+
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);
+// 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;
// 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();
+ 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.
- // (It was the ResizeGL() function in GLWidget: it was being called too
- // much, causing the buffer to be deleted, remade & cleared.)
-// videoWidget->updateGL();
}
zoomLevel = settings.value("zoom", 2).toInt();
allowUnknownSoftware = settings.value("showUnknownSoftware", false).toBool();
+ lastEditedProfile = settings.value("lastEditedProfile", 0).toInt();
vjs.useJoystick = settings.value("useJoystick", false).toBool();
vjs.joyport = settings.value("joyport", 0).toInt();
vjs.p2KeyBindings[BUTTON_9] = settings.value("p2k_9", Qt::Key_9).toInt();
vjs.p2KeyBindings[BUTTON_d] = settings.value("p2k_pound", Qt::Key_Slash).toInt();
vjs.p2KeyBindings[BUTTON_s] = settings.value("p2k_star", Qt::Key_Asterisk).toInt();
+
+ ReadProfiles(&settings);
}
settings.setValue("zoom", zoomLevel);
settings.setValue("showUnknownSoftware", allowUnknownSoftware);
+ settings.setValue("lastEditedProfile", lastEditedProfile);
settings.setValue("useJoystick", vjs.useJoystick);
settings.setValue("joyport", vjs.joyport);
settings.setValue("p2k_9", vjs.p2KeyBindings[BUTTON_9]);
settings.setValue("p2k_pound", vjs.p2KeyBindings[BUTTON_d]);
settings.setValue("p2k_star", vjs.p2KeyBindings[BUTTON_s]);
+
+ WriteProfiles(&settings);
}
settings.setValue("zoom", zoomLevel);
}
+