From 6daa04c6f4134641604f7bbfb7043bcfa618c239 Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Wed, 2 Feb 2022 11:42:39 +0100 Subject: [PATCH] added option for automatic pause/continue of emulation depending on focus (resolves #870) --- Changes.txt | 2 ++ docs/graphics/options_emulation.png | Bin 3429 -> 3606 bytes docs/index.html | 9 +++++++++ src/emucore/EventHandler.cxx | 9 +++++++++ src/emucore/Settings.cxx | 3 +++ src/gui/EmulationDialog.cxx | 17 +++++++++++++++-- src/gui/EmulationDialog.hxx | 1 + 7 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Changes.txt b/Changes.txt index aa88d0d7b..76ce4b1e2 100644 --- a/Changes.txt +++ b/Changes.txt @@ -25,6 +25,8 @@ - Added option to show/hide file extensions. - Extended context menu and shortcuts. + * Added option to automatically pause emulation when focus is lost. + * Added option to toggle autofire mode. * Added another oddball TIA glitch option for score mode color. diff --git a/docs/graphics/options_emulation.png b/docs/graphics/options_emulation.png index b924a7bbc308c9ac7b26d71c78dd552fe1f65e97..032ce64469aa61ad4d070826fb8ffe4cec68b203 100644 GIT binary patch literal 3606 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 literal 3429 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 cW$%F@Tnh>TXR>qle?B0Kb2g^WjJ + + 
-autopause <1|0>
+ Enable or disable automatic pause/continue of emulation, when + Stella loses/gains focus. + 
-pausedim <1|0>
Enable or disable emulation dimming in pause mode. @@ -3966,6 +3971,10 @@ Multi-threadingEnable multi-threaded rendering-threads Fast SuperCharger loadSkip progress loading bars for SuperCharger ROMs-fastscbios Show UI messagesOverlay UI messages onscreen-uimessages + + Automatic pauseEnable or disable automatic pause/continue of emulation, + when Stella loses/gains focus.-autopause + Confirm exiting...Display a popup when emulation is exited-confirmexit When entering/exiting emulation: diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index b41ddaab4..3640e1c8c 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -376,6 +376,15 @@ void EventHandler::handleSystemEvent(SystemEvent e, int, int) enterMenuMode(EventHandlerState::OPTIONSMENU); break; #endif + case SystemEvent::WINDOW_FOCUS_GAINED: + if(myOSystem.settings().getBool("autopause") && myState == EventHandlerState::PAUSE) + setState(EventHandlerState::EMULATION); + break; + case SystemEvent::WINDOW_FOCUS_LOST: + if(myOSystem.settings().getBool("autopause") && myState == EventHandlerState::EMULATION) + setState(EventHandlerState::PAUSE); + break; + default: // handle other events as testing requires // cerr << "handleSystemEvent: " << e << endl; break; diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index ec74d98da..ecec07215 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.cxx @@ -184,6 +184,8 @@ Settings::Settings() setPermanent("dialogfont", "medium"); setPermanent("dialogpos", 0); setPermanent("confirmexit", false); + setPermanent("autopause", false); + // Misc options setPermanent("loglevel", int(Logger::Level::INFO)); @@ -624,6 +626,7 @@ void Settings::usage() const << " large16>\n" << " -dialogpos <0..4> Display all dialogs at given positions\n" << " -confirmexit <0|1> Display a confirm dialog when exiting emulation\n" + << " -autopause <0|1> Pause/continue emulation when focus is lost/gained\n" << " -listdelay Time to wait between keypresses in list widgets\n" << " (300-1000)\n" << " -mwheel Number of lines the mouse wheel will scroll in\n" diff --git a/src/gui/EmulationDialog.cxx b/src/gui/EmulationDialog.cxx index a04ceb6e0..fab449f07 100644 --- a/src/gui/EmulationDialog.cxx +++ b/src/gui/EmulationDialog.cxx @@ -81,7 +81,7 @@ EmulationDialog::EmulationDialog(OSystem& osystem, DialogContainer& parent, // Set real dimensions _w = 37 * fontWidth + HBORDER * 2 + CheckboxWidget::prefixSize(_font); - _h = 12 * (lineHeight + VGAP) + VGAP * 7 + VBORDER * 3 + _th + buttonHeight; + _h = 13 * (lineHeight + VGAP) + VGAP * 7 + VBORDER * 3 + _th + buttonHeight; xpos = HBORDER; ypos = VBORDER + _th; @@ -122,8 +122,14 @@ EmulationDialog::EmulationDialog(OSystem& osystem, DialogContainer& parent, wid.push_back(myUIMessages); ypos += lineHeight + VGAP; - // Confirm dialog when exiting emulation + // Automatically pause emulation when focus is lost xpos = HBORDER; ypos += VGAP * 3; + myAutoPauseWidget = new CheckboxWidget(this, _font, xpos, ypos, "Automatic pause"); + myAutoPauseWidget->setToolTip("Check for automatic pause/continue of\nemulation when Stella loses/gains focus."); + wid.push_back(myAutoPauseWidget); + + // Confirm dialog when exiting emulation + ypos += lineHeight + VGAP; myConfirmExitWidget = new CheckboxWidget(this, _font, xpos, ypos, "Confirm exiting emulation"); wid.push_back(myConfirmExitWidget); @@ -186,6 +192,9 @@ void EmulationDialog::loadConfig() // Multi-threaded rendering myUseThreads->setState(settings.getBool("threads")); + // Automatically pause emulation when focus is lost + myAutoPauseWidget->setState(settings.getBool("autopause")); + // Confirm dialog when exiting emulation myConfirmExitWidget->setState(settings.getBool("confirmexit")); @@ -222,6 +231,9 @@ void EmulationDialog::saveConfig() // Multi-threaded rendering settings.setValue("threads", myUseThreads->getState()); + // Automatically pause emulation when focus is lost + settings.setValue("autopause", myAutoPauseWidget->getState()); + // Confirm dialog when exiting emulation settings.setValue("confirmexit", myConfirmExitWidget->getState()); @@ -254,6 +266,7 @@ void EmulationDialog::setDefaults() myUIMessages->setState(true); myFastSCBios->setState(true); myUseThreads->setState(false); + myAutoPauseWidget->setState(false); myConfirmExitWidget->setState(false); mySaveOnExitGroup->setSelected(0); diff --git a/src/gui/EmulationDialog.hxx b/src/gui/EmulationDialog.hxx index 13603c5d3..fb736fe44 100644 --- a/src/gui/EmulationDialog.hxx +++ b/src/gui/EmulationDialog.hxx @@ -43,6 +43,7 @@ class EmulationDialog : public Dialog CheckboxWidget* myUIMessages{nullptr}; CheckboxWidget* myFastSCBios{nullptr}; CheckboxWidget* myUseThreads{nullptr}; + CheckboxWidget* myAutoPauseWidget{nullptr}; CheckboxWidget* myConfirmExitWidget{nullptr}; RadioButtonGroup* mySaveOnExitGroup{nullptr}; CheckboxWidget* myAutoSlotWidget{nullptr};