thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Committed my patch #2123680 "SDL: Backend transaction / rollback support".

Browse source 
svn-id: r35062
This commit is contained in:
Johannes Schickel 2008-11-14 22:08:10 +00:00
parent bb87d39424
commit 5a0556f09c
31 changed files with 461 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

55
engines/engine.cpp
View file

@ -125,15 +125,62 @@ void initCommonGFX(bool defaultTo1XScaler) {
g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
}
void initGraphics(int width, int height, bool defaultTo1xScaler) {
g_system->beginGFXTransaction();
initCommonGFX(defaultTo1xScaler);
g_system->initSize(width, height);
OSystem::TransactionError gfxError = g_system->endGFXTransaction();
if (gfxError == OSystem::kTransactionSuccess)
return;
// Error out on size switch failure
if (gfxError & OSystem::kTransactionSizeChangeFailed) {
char buffer[16];
snprintf(buffer, 16, "%dx%d", width, height);
Common::String message = "Could not switch to resolution: '";
message += buffer;
message += "'.";
GUIErrorMessage(message);
error(message.c_str());
}
// Just show warnings then these occur:
if (gfxError & OSystem::kTransactionModeSwitchFailed) {
Common::String message = "Could not switch to video mode: '";
message += ConfMan.get("gfx_mode");
message += "'.";
GUI::MessageDialog dialog(message);
dialog.runModal();
}
if (gfxError & OSystem::kTransactionAspectRatioFailed) {
GUI::MessageDialog dialog("Could not apply aspect ratio setting.");
dialog.runModal();
}
if (gfxError & OSystem::kTransactionFullscreenFailed) {
GUI::MessageDialog dialog("Could not apply fullscreen setting.");
dialog.runModal();
}
}
void GUIErrorMessage(const Common::String msg) {
g_system->setWindowCaption("Error");
g_system->beginGFXTransaction();
initCommonGFX(false);
g_system->initSize(320, 200);
g_system->endGFXTransaction();
GUI::MessageDialog dialog(msg);
dialog.runModal();
if (g_system->endGFXTransaction() == OSystem::kTransactionSuccess) {
GUI::MessageDialog dialog(msg);
dialog.runModal();
} else {
error(msg.c_str());
}
}
void Engine::checkCD() {