[Scummvm-git-logs] scummvm master -> 4bb4770c41800de9fd390c95440e723f65e4b8de
sev-
noreply at scummvm.org
Mon Mar 2 22:17:39 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
c80dcca547 BACKENDS: OPENGL: Gracefully ignore incorrect resize request
e74195cca3 BACKENDS: OPENGLSDL: Rename force_resize into dumper_force_resize in ConfMan
16e2d79370 GUI: Rename force_resize into dumper_force_resize in ConfMan
4bb4770c41 BASE: Added --dump-all-dialogs command line option
Commit: c80dcca5470592718389e1dee40a97e2a237fff6
https://github.com/scummvm/scummvm/commit/c80dcca5470592718389e1dee40a97e2a237fff6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-03-02T23:17:27+01:00
Commit Message:
BACKENDS: OPENGL: Gracefully ignore incorrect resize request
If we call resize before the context is created, which could happen
during dialog dumping, we just ignore the request
Changed paths:
backends/graphics/opengl/opengl-graphics.cpp
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index cec90363349..db491a079b6 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -1461,7 +1461,8 @@ void OpenGLGraphicsManager::grabPalette(byte *colors, uint start, uint num) cons
void OpenGLGraphicsManager::handleResizeImpl(const int width, const int height) {
if (!_targetBuffer) {
- error("PANIC: Resizing with empty context target buffer");
+ warning("PANIC: Resizing with empty context target buffer, ignoring");
+ return;
}
// Setup backbuffer size.
Commit: e74195cca3a0166c290b1bd0f7b26a0b52ef82d4
https://github.com/scummvm/scummvm/commit/e74195cca3a0166c290b1bd0f7b26a0b52ef82d4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-03-02T23:17:27+01:00
Commit Message:
BACKENDS: OPENGLSDL: Rename force_resize into dumper_force_resize in ConfMan
This adds more clarity to what does this option belong to
Changed paths:
backends/graphics/openglsdl/openglsdl-graphics.cpp
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 79b4ecc180c..037b05b7bc5 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -354,7 +354,7 @@ void OpenGLSdlGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFor
_graphicsScale = 2;
}
- if (ConfMan.getBool("force_resize", Common::ConfigManager::kApplicationDomain)) {
+ if (ConfMan.getBool("dumper_force_resize", Common::ConfigManager::kApplicationDomain)) {
notifyResize(w, h);
}
@@ -413,7 +413,7 @@ void OpenGLSdlGraphicsManager::notifyResize(const int width, const int height) {
getWindowSizeFromSdl(¤tWidth, ¤tHeight);
float dpiScale = _window->getSdlDpiScalingFactor();
- if (ConfMan.getBool("force_resize", Common::ConfigManager::kApplicationDomain)) {
+ if (ConfMan.getBool("dumper_force_resize", Common::ConfigManager::kApplicationDomain)) {
currentWidth = width;
currentHeight = height;
}
@@ -425,7 +425,7 @@ void OpenGLSdlGraphicsManager::notifyResize(const int width, const int height) {
debug(3, "req: %d x %d cur: %d x %d, scale: %f", width, height, currentWidth, currentHeight, dpiScale);
- if (ConfMan.getBool("force_resize", Common::ConfigManager::kApplicationDomain)) {
+ if (ConfMan.getBool("dumper_force_resize", Common::ConfigManager::kApplicationDomain)) {
createOrUpdateWindow(currentWidth, currentHeight, 0);
}
Commit: 16e2d79370283a66624d6d1c533f1fbdbf7970ed
https://github.com/scummvm/scummvm/commit/16e2d79370283a66624d6d1c533f1fbdbf7970ed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-03-02T23:17:27+01:00
Commit Message:
GUI: Rename force_resize into dumper_force_resize in ConfMan
Changed paths:
gui/dump-all-dialogs.cpp
diff --git a/gui/dump-all-dialogs.cpp b/gui/dump-all-dialogs.cpp
index 596c662b9e9..43f0329f36b 100644
--- a/gui/dump-all-dialogs.cpp
+++ b/gui/dump-all-dialogs.cpp
@@ -181,7 +181,7 @@ void dumpAllDialogs(const Common::String &message) {
0};
// HACK: Pass info to backend to force window resize
- ConfMan.setBool("force_resize", true, Common::ConfigManager::kApplicationDomain);
+ ConfMan.setBool("dumper_force_resize", true, Common::ConfigManager::kApplicationDomain);
Common::FSNode dumpDir("snapshots");
if (!dumpDir.isDirectory())
@@ -220,7 +220,10 @@ void dumpAllDialogs(const Common::String &message) {
// Clean up the temporary flag.
// Since we are still within the same method where we added,
// there is no need to flush config to the disk
- ConfMan.removeKey("force_resize", Common::ConfigManager::kApplicationDomain);
+ ConfMan.removeKey("dumper_force_resize", Common::ConfigManager::kApplicationDomain);
+ ConfMan.flushToDisk();
+
+ warning("ALL DIALOGS DUMPED");
}
} // End of namespace GUI
Commit: 4bb4770c41800de9fd390c95440e723f65e4b8de
https://github.com/scummvm/scummvm/commit/4bb4770c41800de9fd390c95440e723f65e4b8de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-03-02T23:17:27+01:00
Commit Message:
BASE: Added --dump-all-dialogs command line option
Is not intended for usage by users, hence not documented.
Also, make sure we cleanup its internally used settings,
it talsk to ConfMan via "dumper_force_resize" key
Changed paths:
base/commandLine.cpp
base/main.cpp
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 05358432232..536a1d7e09b 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -994,6 +994,10 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
DO_LONG_OPTION_PATH("themepath")
END_OPTION
+ // This is for internal use only, intentianally not documented
+ DO_LONG_OPTION_BOOL("dump-all-dialogs")
+ END_OPTION
+
DO_LONG_OPTION("shader")
Common::SearchSet _shaderSet;
Common::generateZipSet(_shaderSet, "shaders.dat", "shaders*.dat");
@@ -2308,6 +2312,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
"render-mode",
"random-seed",
"renderer",
+ "dump-all-dialogs",
nullptr
};
diff --git a/base/main.cpp b/base/main.cpp
index 7b2c1e7f8e2..77ceac8736a 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -472,6 +472,9 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
// Update the config file
ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
+ // Immediately remove possible residue for Dump All Dialogs feature
+ ConfMan.removeKey("dumper_force_resize", Common::ConfigManager::kApplicationDomain);
+
// Load and setup the debuglevel and the debug flags. We do this at the
// soonest possible moment to ensure debug output starts early on, if
// requested.
@@ -701,9 +704,9 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
CloudMan.syncSaves();
#endif
-#if 0
- GUI::dumpAllDialogs();
-#endif
+ if (ConfMan.hasKey("dump_all_dialogs")) {
+ GUI::dumpAllDialogs();
+ }
// Print out CPU extension info
// Separate block to keep the stack clean
@@ -738,13 +741,13 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
}
// Unless a game was specified, show the launcher dialog
- if (nullptr == ConfMan.getActiveDomain())
+ if (nullptr == ConfMan.getActiveDomain() && !ConfMan.hasKey("dump_all_dialogs"))
launcherDialog();
// FIXME: We're now looping the launcher. This, of course, doesn't
// work as well as it should. In theory everything should be destroyed
// cleanly, so this is now enabled to encourage people to fix bits :)
- while (nullptr != ConfMan.getActiveDomain()) {
+ while (nullptr != ConfMan.getActiveDomain() && !ConfMan.hasKey("dump_all_dialogs")) {
saveLastLaunchedTarget(ConfMan.getActiveDomainName());
EngineMan.upgradeTargetIfNecessary(ConfMan.getActiveDomainName());
More information about the Scummvm-git-logs
mailing list