SDL: Add ability to suspend screensaver
Jeffrey Pfau jeffrey@endrift.com
Tue, 05 May 2015 22:43:44 -0700
12 files changed,
392 insertions(+),
281 deletions(-)
jump to
M
CHANGES
→
CHANGES
@@ -14,6 +14,7 @@ - Menu items for specific solar sensor brightness levels
- Remappable controls for tilt and gyroscope sensors - Status messages for actions taken while a game is running (e.g. save/load state) - Memory inspector + - Screensaver can now be suspended while a game is running Bugfixes: - GBA: Fix timers not updating timing when writing to only the reload register - All: Fix sanitize-deb script not cleaning up after itself
M
src/gba/supervisor/config.c
→
src/gba/supervisor/config.c
@@ -204,6 +204,9 @@ }
if (_lookupIntValue(config, "resampleVideo", &fakeBool)) { opts->resampleVideo = fakeBool; } + if (_lookupIntValue(config, "suspendScreensaver", &fakeBool)) { + opts->suspendScreensaver = fakeBool; + } if (_lookupIntValue(config, "mute", &fakeBool)) { opts->mute = fakeBool; }@@ -251,6 +254,7 @@ ConfigurationSetIntValue(&config->defaultsTable, 0, "volume", opts->volume);
ConfigurationSetIntValue(&config->defaultsTable, 0, "mute", opts->mute); ConfigurationSetIntValue(&config->defaultsTable, 0, "lockAspectRatio", opts->lockAspectRatio); ConfigurationSetIntValue(&config->defaultsTable, 0, "resampleVideo", opts->resampleVideo); + ConfigurationSetIntValue(&config->defaultsTable, 0, "suspendScreensaver", opts->suspendScreensaver); switch (opts->idleOptimization) { case IDLE_LOOP_IGNORE:
M
src/gba/supervisor/config.h
→
src/gba/supervisor/config.h
@@ -35,6 +35,7 @@ int width;
int height; bool lockAspectRatio; bool resampleVideo; + bool suspendScreensaver; int volume; bool mute;
M
src/platform/qt/ConfigController.cpp
→
src/platform/qt/ConfigController.cpp
@@ -114,6 +114,7 @@ m_opts.rewindEnable = false;
m_opts.rewindBufferInterval = 0; m_opts.rewindBufferCapacity = 0; m_opts.useBios = true; + m_opts.suspendScreensaver = true; GBAConfigLoadDefaults(&m_config, &m_opts); GBAConfigLoad(&m_config); GBAConfigMap(&m_config, &m_opts);
M
src/platform/qt/InputController.cpp
→
src/platform/qt/InputController.cpp
@@ -469,3 +469,17 @@
bool InputController::hasPendingEvent(GBAKey key) const { return m_pendingEvents.contains(key); } + +#if defined(BUILD_SDL) && SDL_VERSION_ATLEAST(2, 0, 0) +void InputController::suspendScreensaver() { + GBASDLSuspendScreensaver(&s_sdlEvents); +} + +void InputController::resumeScreensaver() { + GBASDLResumeScreensaver(&s_sdlEvents); +} + +void InputController::setScreensaverSuspendable(bool suspendable) { + GBASDLSetScreensaverSuspendable(&s_sdlEvents, suspendable); +} +#endif
M
src/platform/qt/InputController.h
→
src/platform/qt/InputController.h
@@ -80,6 +80,13 @@
public slots: void testGamepad(int type); +#if defined(BUILD_SDL) && SDL_VERSION_ATLEAST(2, 0, 0) + // TODO: Move these to somewhere that makes sense + void suspendScreensaver(); + void resumeScreensaver(); + void setScreensaverSuspendable(bool); +#endif + private: void postPendingEvent(GBAKey); void clearPendingEvent(GBAKey);
M
src/platform/qt/SettingsView.cpp
→
src/platform/qt/SettingsView.cpp
@@ -34,6 +34,7 @@ loadSetting("rewindBufferInterval", m_ui.rewindInterval);
loadSetting("rewindBufferCapacity", m_ui.rewindCapacity); loadSetting("resampleVideo", m_ui.resampleVideo); loadSetting("allowOpposingDirections", m_ui.allowOpposingDirections); + loadSetting("suspendScreensaver", m_ui.suspendScreensaver); QString idleOptimization = loadSetting("idleOptimization"); if (idleOptimization == "ignore") {@@ -87,6 +88,7 @@ saveSetting("rewindBufferInterval", m_ui.rewindInterval);
saveSetting("rewindBufferCapacity", m_ui.rewindCapacity); saveSetting("resampleVideo", m_ui.resampleVideo); saveSetting("allowOpposingDirections", m_ui.allowOpposingDirections); + saveSetting("suspendScreensaver", m_ui.suspendScreensaver); switch (m_ui.idleOptimization->currentIndex() + IDLE_LOOP_IGNORE) { case IDLE_LOOP_IGNORE:
M
src/platform/qt/SettingsView.ui
→
src/platform/qt/SettingsView.ui
@@ -6,8 +6,8 @@ <property name="geometry">
<rect> <x>0</x> <y>0</y> - <width>374</width> - <height>608</height> + <width>656</width> + <height>366</height> </rect> </property> <property name="sizePolicy">@@ -21,21 +21,21 @@ <string>Settings</string>
</property> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QFormLayout" name="formLayout"> - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>BIOS file:</string> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <layout class="QFormLayout" name="formLayout"> + <property name="fieldGrowthPolicy"> + <enum>QFormLayout::ExpandingFieldsGrow</enum> </property> - </widget> - </item> - <item row="0" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLineEdit" name="bios"> + <item row="0" column="0"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>Audio driver:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="audioDriver"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch>@@ -44,345 +44,370 @@ </sizepolicy>
</property> </widget> </item> - <item> - <widget class="QPushButton" name="biosBrowse"> + <item row="1" column="0"> + <widget class="QLabel" name="audioBufferSizeLabel"> <property name="text"> - <string>Browse</string> + <string>Audio buffer:</string> </property> </widget> </item> - </layout> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="skipBios"> - <property name="text"> - <string>Skip BIOS intro</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QCheckBox" name="useBios"> - <property name="text"> - <string>Use BIOS file</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>Audio driver:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QComboBox" name="audioDriver"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="audioBufferSizeLabel"> - <property name="text"> - <string>Audio buffer:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_9"> - <item> - <widget class="QComboBox" name="audioBufferSize"> - <property name="editable"> - <bool>true</bool> + <item row="1" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_11"> + <item> + <widget class="QComboBox" name="audioBufferSize"> + <property name="editable"> + <bool>true</bool> + </property> + <property name="currentText"> + <string>2048</string> + </property> + <property name="currentIndex"> + <number>2</number> + </property> + <item> + <property name="text"> + <string>512</string> + </property> + </item> + <item> + <property name="text"> + <string>1024</string> + </property> + </item> + <item> + <property name="text"> + <string>2048</string> + </property> + </item> + <item> + <property name="text"> + <string>4096</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>samples</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>Volume:</string> </property> - <property name="currentText"> - <string>2048</string> + </widget> + </item> + <item row="2" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QSlider" name="volume"> + <property name="maximum"> + <number>256</number> + </property> + <property name="pageStep"> + <number>16</number> + </property> + <property name="value"> + <number>256</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mute"> + <property name="text"> + <string>Mute</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="3" column="0" colspan="2"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="currentIndex"> - <number>2</number> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Sync:</string> </property> + </widget> + </item> + <item row="4" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_10"> <item> - <property name="text"> - <string>512</string> - </property> + <widget class="QCheckBox" name="videoSync"> + <property name="text"> + <string>Video</string> + </property> + </widget> </item> <item> - <property name="text"> - <string>1024</string> - </property> + <widget class="QCheckBox" name="audioSync"> + <property name="text"> + <string>Audio</string> + </property> + </widget> </item> + </layout> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Frameskip:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_16"> <item> - <property name="text"> - <string>2048</string> - </property> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Skip every</string> + </property> + </widget> </item> <item> - <property name="text"> - <string>4096</string> - </property> + <widget class="QSpinBox" name="frameskip"/> + </item> + <item> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>frames</string> + </property> + </widget> </item> - </widget> + </layout> </item> - <item> - <widget class="QLabel" name="label_10"> + <item row="6" column="0"> + <widget class="QLabel" name="label_3"> <property name="text"> - <string>samples</string> + <string>FPS target:</string> </property> </widget> </item> - </layout> - </item> - <item row="6" column="0"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>Volume:</string> - </property> - </widget> - </item> - <item row="6" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QSlider" name="volume"> - <property name="maximum"> - <number>256</number> - </property> - <property name="pageStep"> - <number>16</number> - </property> - <property name="value"> - <number>256</number> - </property> + <item row="6" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QSpinBox" name="fpsTarget"> + <property name="maximum"> + <number>240</number> + </property> + <property name="value"> + <number>60</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>frames per second</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="7" column="0" colspan="2"> + <widget class="Line" name="line_4"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item> - <widget class="QCheckBox" name="mute"> + <item row="8" column="1"> + <widget class="QCheckBox" name="lockAspectRatio"> <property name="text"> - <string>Mute</string> + <string>Lock aspect ratio</string> </property> </widget> </item> - </layout> - </item> - <item row="7" column="0" colspan="2"> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="8" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Sync:</string> - </property> - </widget> - </item> - <item row="8" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_10"> - <item> - <widget class="QCheckBox" name="videoSync"> + <item row="9" column="1"> + <widget class="QCheckBox" name="resampleVideo"> <property name="text"> - <string>Video</string> + <string>Resample video</string> </property> </widget> </item> - <item> - <widget class="QCheckBox" name="audioSync"> + <item row="10" column="1"> + <widget class="QCheckBox" name="suspendScreensaver"> <property name="text"> - <string>Audio</string> + <string>Suspend screensaver</string> + </property> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> </layout> </item> - <item row="9" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>Frameskip:</string> + <item> + <widget class="Line" name="line_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> </widget> </item> - <item row="9" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_16"> - <item> - <widget class="QLabel" name="label_12"> + <item> + <layout class="QFormLayout" name="formLayout_4"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> <property name="text"> - <string>Skip every</string> + <string>BIOS file:</string> </property> </widget> </item> - <item> - <widget class="QSpinBox" name="frameskip"/> + <item row="0" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLineEdit" name="bios"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="biosBrowse"> + <property name="text"> + <string>Browse</string> + </property> + </widget> + </item> + </layout> </item> - <item> - <widget class="QLabel" name="label_13"> + <item row="1" column="1"> + <widget class="QCheckBox" name="skipBios"> <property name="text"> - <string>frames</string> + <string>Skip BIOS intro</string> </property> </widget> </item> - </layout> - </item> - <item row="10" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>FPS target:</string> - </property> - </widget> - </item> - <item row="10" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QSpinBox" name="fpsTarget"> - <property name="maximum"> - <number>240</number> + <item row="2" column="1"> + <widget class="QCheckBox" name="useBios"> + <property name="text"> + <string>Use BIOS file</string> + </property> + <property name="checked"> + <bool>true</bool> </property> - <property name="value"> - <number>60</number> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="Line" name="line_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> </widget> </item> - <item> - <widget class="QLabel" name="label_11"> + <item row="4" column="1"> + <widget class="QCheckBox" name="rewind"> <property name="text"> - <string>frames per second</string> + <string>Enable rewind</string> </property> </widget> </item> - </layout> - </item> - <item row="11" column="1"> - <widget class="QCheckBox" name="lockAspectRatio"> - <property name="text"> - <string>Lock aspect ratio</string> - </property> - </widget> - </item> - <item row="12" column="1"> - <widget class="QCheckBox" name="resampleVideo"> - <property name="text"> - <string>Resample video</string> - </property> - </widget> - </item> - <item row="13" column="0" colspan="2"> - <widget class="Line" name="line_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="14" column="1"> - <widget class="QCheckBox" name="rewind"> - <property name="text"> - <string>Enable rewind</string> - </property> - </widget> - </item> - <item row="15" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Rewind interval:</string> - </property> - </widget> - </item> - <item row="15" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_12"> - <item> - <widget class="QLabel" name="label_5"> + <item row="5" column="0"> + <widget class="QLabel" name="label_4"> <property name="text"> - <string>Every</string> + <string>Rewind interval:</string> </property> </widget> </item> - <item> - <widget class="QSpinBox" name="rewindInterval"/> + <item row="5" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_12"> + <item> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Every</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="rewindInterval"/> + </item> + <item> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>frames</string> + </property> + </widget> + </item> + </layout> </item> - <item> - <widget class="QLabel" name="label_6"> + <item row="6" column="0"> + <widget class="QLabel" name="label_8"> <property name="text"> - <string>frames</string> + <string>Rewind length:</string> </property> </widget> </item> - </layout> - </item> - <item row="16" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Rewind length:</string> - </property> - </widget> - </item> - <item row="16" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_13"> - <item> - <widget class="QSpinBox" name="rewindCapacity"/> + <item row="6" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_13"> + <item> + <widget class="QSpinBox" name="rewindCapacity"/> + </item> + <item> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>intervals</string> + </property> + </widget> + </item> + </layout> </item> - <item> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>intervals</string> + <item row="7" column="0" colspan="2"> + <widget class="Line" name="line_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> </widget> </item> - </layout> - </item> - <item row="17" column="1"> - <widget class="QCheckBox" name="allowOpposingDirections"> - <property name="text"> - <string>Allow opposing input directions</string> - </property> - </widget> - </item> - <item row="18" column="0" colspan="2"> - <widget class="Line" name="line_4"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="19" column="0"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>Idle loops</string> - </property> - </widget> - </item> - <item row="19" column="1"> - <widget class="QComboBox" name="idleOptimization"> - <item> - <property name="text"> - <string>Run all</string> - </property> + <item row="8" column="1"> + <widget class="QCheckBox" name="allowOpposingDirections"> + <property name="text"> + <string>Allow opposing input directions</string> + </property> + </widget> </item> - <item> - <property name="text"> - <string>Remove known</string> - </property> + <item row="9" column="0"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>Idle loops</string> + </property> + </widget> </item> - <item> - <property name="text"> - <string>Detect and remove</string> - </property> + <item row="9" column="1"> + <widget class="QComboBox" name="idleOptimization"> + <item> + <property name="text"> + <string>Run all</string> + </property> + </item> + <item> + <property name="text"> + <string>Remove known</string> + </property> + </item> + <item> + <property name="text"> + <string>Detect and remove</string> + </property> + </item> + </widget> </item> - </widget> + </layout> </item> </layout> </item>
M
src/platform/qt/Window.cpp
→
src/platform/qt/Window.cpp
@@ -89,8 +89,10 @@ move(windowPos.toPoint());
} connect(m_controller, SIGNAL(gameStarted(GBAThread*)), this, SLOT(gameStarted(GBAThread*))); + connect(m_controller, SIGNAL(gameStarted(GBAThread*)), &m_inputController, SLOT(suspendScreensaver())); connect(m_controller, SIGNAL(gameStopped(GBAThread*)), m_display, SLOT(stopDrawing())); connect(m_controller, SIGNAL(gameStopped(GBAThread*)), this, SLOT(gameStopped())); + connect(m_controller, SIGNAL(gameStopped(GBAThread*)), &m_inputController, SLOT(resumeScreensaver())); connect(m_controller, SIGNAL(stateLoaded(GBAThread*)), m_display, SLOT(forceDraw())); connect(m_controller, SIGNAL(rewound(GBAThread*)), m_display, SLOT(forceDraw())); connect(m_controller, SIGNAL(gamePaused(GBAThread*)), m_display, SLOT(pauseDrawing()));@@ -102,7 +104,9 @@ menuBar()->hide();
} }); #endif + connect(m_controller, SIGNAL(gamePaused(GBAThread*)), &m_inputController, SLOT(resumeScreensaver())); connect(m_controller, SIGNAL(gameUnpaused(GBAThread*)), m_display, SLOT(unpauseDrawing())); + connect(m_controller, SIGNAL(gameUnpaused(GBAThread*)), &m_inputController, SLOT(suspendScreensaver())); connect(m_controller, SIGNAL(postLog(int, const QString&)), m_logView, SLOT(postLog(int, const QString&))); connect(m_controller, SIGNAL(frameAvailable(const uint32_t*)), this, SLOT(recordFrame())); connect(m_controller, SIGNAL(frameAvailable(const uint32_t*)), m_display, SLOT(framePosted(const uint32_t*)));@@ -191,6 +195,8 @@
if (opts->fullscreen) { enterFullScreen(); } + + m_inputController.setScreensaverSuspendable(opts->suspendScreensaver); m_mruFiles = m_config->getMRU(); updateMRU();
M
src/platform/sdl/main.c
→
src/platform/sdl/main.c
@@ -117,6 +117,11 @@ GBASDLAttachPlayer(&renderer.events, &renderer.player);
GBASDLPlayerLoadConfig(&renderer.player, GBAConfigGetInput(&config)); context.overrides = GBAConfigGetOverrides(&config); +#if SDL_VERSION_ATLEAST(2, 0, 0) + GBASDLSetScreensaverSuspendable(&renderer.events, opts.suspendScreensaver); + GBASDLSuspendScreensaver(&renderer.events); +#endif + int didFail = 0; if (GBAThreadStart(&context)) { renderer.runloop(&context, &renderer);@@ -125,6 +130,11 @@ } else {
didFail = 1; printf("Could not run game. Are you sure the file exists and is a Game Boy Advance game?\n"); } + +#if SDL_VERSION_ATLEAST(2, 0, 0) + GBASDLResumeScreensaver(&renderer.events); + GBASDLSetScreensaverSuspendable(&renderer.events, false); +#endif if (GBAThreadHasCrashed(&context)) { didFail = 1;
M
src/platform/sdl/sdl-events.c
→
src/platform/sdl/sdl-events.c
@@ -32,7 +32,7 @@
bool GBASDLInitEvents(struct GBASDLEvents* context) { int subsystem = SDL_INIT_JOYSTICK; #if SDL_VERSION_ATLEAST(2, 0, 0) - subsystem |= SDL_INIT_HAPTIC; + subsystem |= SDL_INIT_HAPTIC | SDL_INIT_VIDEO; #endif if (SDL_InitSubSystem(subsystem) < 0) { return false;@@ -68,6 +68,8 @@ }
#if !SDL_VERSION_ATLEAST(2, 0, 0) SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); +#else + context->screensaverSuspendDepth = 0; #endif return true; }@@ -582,3 +584,33 @@ }
CircleBufferWrite32(&rotation->zHistory, theta.i); rotation->zDelta += theta.f - oldZ; } + +#if SDL_VERSION_ATLEAST(2, 0, 0) +void GBASDLSuspendScreensaver(struct GBASDLEvents* events) { + if (events->screensaverSuspendDepth == 0 && events->screensaverSuspendable) { + SDL_DisableScreenSaver(); + } + ++events->screensaverSuspendDepth; +} + +void GBASDLResumeScreensaver(struct GBASDLEvents* events) { + --events->screensaverSuspendDepth; + if (events->screensaverSuspendDepth == 0 && events->screensaverSuspendable) { + SDL_EnableScreenSaver(); + } +} + +void GBASDLSetScreensaverSuspendable(struct GBASDLEvents* events, bool suspendable) { + bool wasSuspendable = events->screensaverSuspendable; + events->screensaverSuspendable = suspendable; + if (events->screensaverSuspendDepth > 0) { + if (suspendable && !wasSuspendable) { + SDL_DisableScreenSaver(); + } else if (!suspendable && wasSuspendable) { + SDL_EnableScreenSaver(); + } + } else { + SDL_EnableScreenSaver(); + } +} +#endif
M
src/platform/sdl/sdl-events.h
→
src/platform/sdl/sdl-events.h
@@ -29,6 +29,8 @@ int playersAttached;
size_t joysticksClaimed[MAX_PLAYERS]; #if SDL_VERSION_ATLEAST(2, 0, 0) SDL_Haptic** haptic; + int screensaverSuspendDepth; + bool screensaverSuspendable; #endif };@@ -81,5 +83,11 @@ void GBASDLPlayerLoadConfig(struct GBASDLPlayer*, const struct Configuration*);
void GBASDLPlayerSaveConfig(const struct GBASDLPlayer*, struct Configuration*); void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLPlayer* sdlContext, const union SDL_Event* event); + +#if SDL_VERSION_ATLEAST(2, 0, 0) +void GBASDLSuspendScreensaver(struct GBASDLEvents*); +void GBASDLResumeScreensaver(struct GBASDLEvents*); +void GBASDLSetScreensaverSuspendable(struct GBASDLEvents*, bool suspendable); +#endif #endif