[Scummvm-cvs-logs] SF.net SVN: scummvm:[54265] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Nov 16 11:19:02 CET 2010
Revision: 54265
http://scummvm.svn.sourceforge.net/scummvm/?rev=54265&view=rev
Author: fingolfin
Date: 2010-11-16 10:19:01 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
GUI: Rename gui/GuiManager.* to gui/gui-manager.*
Modified Paths:
--------------
scummvm/trunk/backends/keymapper/remap-dialog.cpp
scummvm/trunk/backends/platform/dc/vmsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp
scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
scummvm/trunk/base/main.cpp
scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj
scummvm/trunk/engines/dialogs.cpp
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/mohawk/dialogs.cpp
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/input.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/sword1/resman.cpp
scummvm/trunk/engines/sword1/sword1.cpp
scummvm/trunk/gui/KeysDialog.h
scummvm/trunk/gui/ThemeParser.cpp
scummvm/trunk/gui/Tooltip.cpp
scummvm/trunk/gui/about.cpp
scummvm/trunk/gui/browser.cpp
scummvm/trunk/gui/chooser.cpp
scummvm/trunk/gui/console.h
scummvm/trunk/gui/dialog.cpp
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/massadd.cpp
scummvm/trunk/gui/message.cpp
scummvm/trunk/gui/module.mk
scummvm/trunk/gui/object.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/widget.cpp
Added Paths:
-----------
scummvm/trunk/gui/gui-manager.cpp
scummvm/trunk/gui/gui-manager.h
Removed Paths:
-------------
scummvm/trunk/gui/GuiManager.cpp
scummvm/trunk/gui/GuiManager.h
Modified: scummvm/trunk/backends/keymapper/remap-dialog.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/remap-dialog.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/backends/keymapper/remap-dialog.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#ifdef ENABLE_KEYMAPPER
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widgets/popup.h"
#include "gui/widgets/scrollbar.h"
#include "gui/ThemeEval.h"
Modified: scummvm/trunk/backends/platform/dc/vmsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/vmsave.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/backends/platform/dc/vmsave.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -28,7 +28,7 @@
#include "dc.h"
#include "icon.h"
#include <common/savefile.h>
-#include <gui/GuiManager.h>
+#include <gui/gui-manager.h>
#include <gui/message.h>
#include <common/zlib.h>
Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#include "dsoptions.h"
#include "dsmain.h"
#include "gui/dialog.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widgets/list.h"
#include "gui/widgets/tab.h"
#include "osystem_ds.h"
Modified: scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/backends/platform/wince/CELauncherDialog.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -32,7 +32,7 @@
#include "engines/metaengine.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widget.h"
#include "gui/browser.h"
#include "gui/message.h"
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -29,7 +29,7 @@
#include "graphics/cursorman.h"
#include "graphics/fontman.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
namespace Common {
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/base/main.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -49,7 +49,7 @@
#include "common/tokenizer.h"
#include "common/translation.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/message.h"
#include "gui/error.h"
Modified: scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj
===================================================================
--- scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj 2010-11-16 10:19:01 UTC (rev 54265)
@@ -917,7 +917,7 @@
DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
DF09418C0F63CB26002D821E /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
DF0941920F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
- DF0941930F63CB26002D821E /* GuiManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* GuiManager.cpp */; };
+ DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; };
DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
DF0941950F63CB26002D821E /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
DF0941960F63CB26002D821E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
@@ -1061,7 +1061,7 @@
DF2EC51A10E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; };
DF2FFB930F485D890006E566 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
- DF2FFBD90F485E360006E566 /* GuiManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* GuiManager.cpp */; };
+ DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; };
DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
DF2FFC290F4862520006E566 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
@@ -3057,7 +3057,7 @@
DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; };
DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; };
DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; };
- DFF95C280FB22D5700A3EC78 /* GuiManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* GuiManager.cpp */; };
+ DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; };
DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; };
DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; };
DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; };
@@ -3362,8 +3362,8 @@
DF2FFB920F485D890006E566 /* pixelformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixelformat.h; sourceTree = "<group>"; };
DF2FFBD10F485DFB0006E566 /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; };
DF2FFBD20F485DFB0006E566 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
- DF2FFBD50F485E360006E566 /* GuiManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GuiManager.cpp; sourceTree = "<group>"; };
- DF2FFBD60F485E360006E566 /* GuiManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuiManager.h; sourceTree = "<group>"; };
+ DF2FFBD50F485E360006E566 /* gui-manager.hcpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui-manager.hcpp; sourceTree = "<group>"; };
+ DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui-manager.h; sourceTree = "<group>"; };
DF2FFBDB0F485E480006E566 /* scummclassic.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = scummclassic.zip; sourceTree = "<group>"; };
DF2FFBF80F4860A60006E566 /* posix-saves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-saves.cpp"; sourceTree = "<group>"; };
DF2FFBF90F4860A60006E566 /* posix-saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-saves.h"; sourceTree = "<group>"; };
@@ -7446,8 +7446,8 @@
DFE4779B0D81F4E900B6D1FB /* EditTextWidget.h */,
DF9B9246118E46730069C19D /* error.cpp */,
DF9B9247118E46730069C19D /* error.h */,
- DF2FFBD50F485E360006E566 /* GuiManager.cpp */,
- DF2FFBD60F485E360006E566 /* GuiManager.h */,
+ DF2FFBD50F485E360006E566 /* gui-manager.hcpp */,
+ DF2FFBD60F485E360006E566 /* gui-manager.h */,
DFE4779E0D81F4E900B6D1FB /* Key.cpp */,
DFE4779F0D81F4E900B6D1FB /* Key.h */,
DFE477A20D81F4E900B6D1FB /* launcher.cpp */,
@@ -8470,7 +8470,7 @@
DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */,
DF2FFB930F485D890006E566 /* dither.cpp in Sources */,
DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */,
- DF2FFBD90F485E360006E566 /* GuiManager.cpp in Sources */,
+ DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */,
DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */,
DF2FFC290F4862520006E566 /* bmv.cpp in Sources */,
DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */,
@@ -9496,7 +9496,7 @@
DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */,
DF09418C0F63CB26002D821E /* dither.cpp in Sources */,
DF0941920F63CB26002D821E /* debug.cpp in Sources */,
- DF0941930F63CB26002D821E /* GuiManager.cpp in Sources */,
+ DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */,
DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */,
DF0941950F63CB26002D821E /* bmv.cpp in Sources */,
DF0941960F63CB26002D821E /* dialogs.cpp in Sources */,
@@ -10531,7 +10531,7 @@
DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */,
DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */,
DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */,
- DFF95C280FB22D5700A3EC78 /* GuiManager.cpp in Sources */,
+ DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */,
DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */,
DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */,
DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */,
Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/dialogs.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -33,7 +33,7 @@
#include "graphics/scaler.h"
#include "gui/about.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/launcher.h"
#include "gui/widgets/list.h"
#include "gui/message.h"
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/engine.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -46,7 +46,7 @@
#include "gui/debugger.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "sound/mixer.h"
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/gob/gob.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -34,7 +34,7 @@
#include "common/md5.h"
#include "sound/mididrv.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/dialog.h"
#include "gui/widget.h"
Modified: scummvm/trunk/engines/mohawk/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/dialogs.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/mohawk/dialogs.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -28,7 +28,7 @@
#include "mohawk/riven.h"
#include "mohawk/dialogs.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "common/savefile.h"
#include "common/translation.h"
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -36,7 +36,7 @@
#include "gui/about.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widgets/list.h"
#include "gui/ThemeEval.h"
Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/scumm/input.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -28,7 +28,7 @@
#include "common/system.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "scumm/debugger.h"
#include "scumm/dialogs.h"
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -34,7 +34,7 @@
#include "engines/util.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "graphics/cursorman.h"
Modified: scummvm/trunk/engines/sword1/resman.cpp
===================================================================
--- scummvm/trunk/engines/sword1/resman.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/sword1/resman.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -36,7 +36,7 @@
#include "sword1/swordres.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
namespace Sword1 {
void guiFatalError(char *msg) {
Modified: scummvm/trunk/engines/sword1/sword1.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sword1.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/engines/sword1/sword1.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -41,7 +41,7 @@
#include "engines/util.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
namespace Sword1 {
Deleted: scummvm/trunk/gui/GuiManager.cpp
===================================================================
--- scummvm/trunk/gui/GuiManager.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/GuiManager.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -1,514 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#include "common/events.h"
-#include "common/system.h"
-#include "common/util.h"
-#include "common/config-manager.h"
-#include "common/algorithm.h"
-#include "common/timer.h"
-#include "common/translation.h"
-
-#include "backends/keymapper/keymapper.h"
-
-#include "gui/GuiManager.h"
-#include "gui/dialog.h"
-#include "gui/ThemeEngine.h"
-#include "gui/ThemeEval.h"
-
-#include "graphics/cursorman.h"
-
-DECLARE_SINGLETON(GUI::GuiManager);
-
-namespace GUI {
-
-enum {
- kDoubleClickDelay = 500, // milliseconds
- kCursorAnimateDelay = 250,
- kTooltipDelay = 1250
-};
-
-// Constructor
-GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _tooltipCheck(false),
- _stateIsSaved(false), _cursorAnimateCounter(0), _cursorAnimateTimer(0) {
- _theme = 0;
- _useStdCursor = false;
-
- _system = g_system;
- _lastScreenChangeID = _system->getScreenChangeID();
- _width = _system->getOverlayWidth();
- _height = _system->getOverlayHeight();
-
- // Clear the cursor
- memset(_cursor, 0xFF, sizeof(_cursor));
-
- // Enable translation
- TransMan.setLanguage(ConfMan.get("gui_language").c_str());
-
- ConfMan.registerDefault("gui_theme", "scummmodern");
- Common::String themefile(ConfMan.get("gui_theme"));
-
- ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode));
- ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ThemeEngine::findMode(ConfMan.get("gui_renderer"));
-
- // Try to load the theme
- if (!loadNewTheme(themefile, gfxMode)) {
- // Loading the theme failed, try to load the built-in theme
- if (!loadNewTheme("builtin", gfxMode)) {
- // Loading the built-in theme failed as well. Bail out
- error("Failed to load any GUI theme, aborting");
- }
- }
-
- _tooltip = 0;
-}
-
-GuiManager::~GuiManager() {
- delete _theme;
- delete _tooltip;
-}
-
-#ifdef ENABLE_KEYMAPPER
-void GuiManager::initKeymap() {
- using namespace Common;
-
- bool tmp;
- Keymapper *mapper = _system->getEventManager()->getKeymapper();
-
- // Do not try to recreate same keymap over again
- if (mapper->getKeymap("gui", tmp) != 0)
- return;
-
- Action *act;
- Keymap *guiMap = new Keymap("gui");
-
- act = new Action(guiMap, "CLOS", _("Close"), kGenericActionType, kStartKeyType);
- act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0));
-
- act = new Action(guiMap, "CLIK", _("Mouse click"));
- act->addLeftClickEvent();
-
- act = new Action(guiMap, "VIRT", _("Display keyboard"), kVirtualKeyboardActionType);
- act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
-
- act = new Action(guiMap, "REMP", _("Remap keys"), kKeyRemapActionType);
- act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
-
- mapper->addGlobalKeymap(guiMap);
-}
-#endif
-
-bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx, bool forced) {
- // If we are asked to reload the currently active theme, just do nothing
- // FIXME: Actually, why? It might be desirable at times to force a theme reload...
- if (!forced)
- if (_theme && id == _theme->getThemeId() && gfx == _theme->getGraphicsMode())
- return true;
-
- ThemeEngine *newTheme = 0;
-
- if (gfx == ThemeEngine::kGfxDisabled)
- gfx = ThemeEngine::_defaultRendererMode;
-
- // Try to load the new theme
- newTheme = new ThemeEngine(id, gfx);
- assert(newTheme);
-
- if (!newTheme->init())
- return false;
-
- //
- // Disable and delete the old theme
- //
- if (_theme)
- _theme->disable();
- delete _theme;
-
- if (_useStdCursor) {
- CursorMan.popCursorPalette();
- CursorMan.popCursor();
- }
-
- //
- // Enable the new theme
- //
- _theme = newTheme;
- _useStdCursor = !_theme->ownCursor();
-
- // If _stateIsSaved is set, we know that a Theme is already initialized,
- // thus we initialize the new theme properly
- if (_stateIsSaved) {
- _theme->enable();
-
- if (_useStdCursor)
- setupCursor();
- }
-
- // refresh all dialogs
- for (int i = 0; i < _dialogStack.size(); ++i)
- _dialogStack[i]->reflowLayout();
-
- // We need to redraw immediately. Otherwise
- // some other event may cause a widget to be
- // redrawn before redraw() has been called.
- _redrawStatus = kRedrawFull;
- redraw();
- _system->updateScreen();
-
- return true;
-}
-
-void GuiManager::redraw() {
- int i;
- ThemeEngine::ShadingStyle shading;
-
- if (_redrawStatus == kRedrawDisabled || _dialogStack.empty())
- return;
-
- shading = (ThemeEngine::ShadingStyle)xmlEval()->getVar("Dialog." + _dialogStack.top()->_name + ".Shading", 0);
-
- // Tanoku: Do not apply shading more than once when opening many dialogs
- // on top of each other. Screen ends up being too dark and it's a
- // performance hog.
- if (_redrawStatus == kRedrawOpenDialog && _dialogStack.size() > 2)
- shading = ThemeEngine::kShadingNone;
-
- switch (_redrawStatus) {
- case kRedrawCloseDialog:
- case kRedrawFull:
- case kRedrawTopDialog:
- _theme->clearAll();
- _theme->openDialog(true, ThemeEngine::kShadingNone);
-
- for (i = 0; i < _dialogStack.size() - 1; i++) {
- _dialogStack[i]->drawDialog();
- }
-
- _theme->finishBuffering();
-
- case kRedrawOpenDialog:
- _theme->updateScreen();
- _theme->openDialog(true, shading);
- _dialogStack.top()->drawDialog();
- _theme->finishBuffering();
- break;
-
- default:
- return;
- }
-
- _theme->updateScreen();
- _redrawStatus = kRedrawDisabled;
-}
-
-Dialog *GuiManager::getTopDialog() const {
- if (_dialogStack.empty())
- return 0;
- return _dialogStack.top();
-}
-
-void GuiManager::runLoop() {
- Dialog *activeDialog = getTopDialog();
- bool didSaveState = false;
- int button;
- uint32 time;
-
- if (activeDialog == 0)
- return;
-
- if (!_stateIsSaved) {
- saveState();
- _theme->enable();
- didSaveState = true;
-
- _useStdCursor = !_theme->ownCursor();
- if (_useStdCursor)
- setupCursor();
-
-// _theme->refresh();
-
- _redrawStatus = kRedrawFull;
- redraw();
- }
-
- _lastMousePosition.x = _lastMousePosition.y = -1;
- _lastMousePosition.time = 0;
-
- Common::EventManager *eventMan = _system->getEventManager();
- uint32 lastRedraw = 0;
- const uint32 waitTime = 1000 / 45;
-
-#ifdef ENABLE_KEYMAPPER
- // Due to circular reference with event manager and GUI
- // we cannot init keymap on the GUI creation. Thus, let's
- // try to do it on every launch, checking whether the
- // map is already existing
- initKeymap();
-
- eventMan->getKeymapper()->pushKeymap("gui");
-#endif
-
- while (!_dialogStack.empty() && activeDialog == getTopDialog()) {
- redraw();
-
- // Don't "tickle" the dialog until the theme has had a chance
- // to re-allocate buffers in case of a scaler change.
-
- activeDialog->handleTickle();
-
- if (_useStdCursor)
- animateCursor();
-// _theme->updateScreen();
-// _system->updateScreen();
-
- if (lastRedraw + waitTime < _system->getMillis()) {
- _theme->updateScreen();
- _system->updateScreen();
- lastRedraw = _system->getMillis();
- }
-
- Common::Event event;
-
- bool eventTookplace = false;
- while (eventMan->pollEvent(event)) {
-
- // The top dialog can change during the event loop. In that case, flush all the
- // dialog-related events since they were probably generated while the old dialog
- // was still visible, and therefore not intended for the new one.
- //
- // This hopefully fixes strange behaviour/crashes with pop-up widgets. (Most easily
- // triggered in 3x mode or when running ScummVM under Valgrind.)
- if (activeDialog != getTopDialog() && event.type != Common::EVENT_SCREEN_CHANGED)
- continue;
-
- Common::Point mouse(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y);
-
- if (lastRedraw + waitTime < _system->getMillis()) {
- _theme->updateScreen();
- _system->updateScreen();
- lastRedraw = _system->getMillis();
- }
-
- switch (event.type) {
- case Common::EVENT_KEYDOWN:
- activeDialog->handleKeyDown(event.kbd);
- eventTookplace = true;
- break;
- case Common::EVENT_KEYUP:
- activeDialog->handleKeyUp(event.kbd);
- eventTookplace = true;
- break;
- case Common::EVENT_MOUSEMOVE:
- activeDialog->handleMouseMoved(mouse.x, mouse.y, 0);
-
- if (mouse.x != _lastMousePosition.x || mouse.y != _lastMousePosition.y) {
- _lastMousePosition.x = mouse.x;
- _lastMousePosition.y = mouse.y;
- _lastMousePosition.time = _system->getMillis();
- }
-
- _tooltipCheck = true;
- eventTookplace = true;
- break;
- // We don't distinguish between mousebuttons (for now at least)
- case Common::EVENT_LBUTTONDOWN:
- case Common::EVENT_RBUTTONDOWN:
- eventTookplace = true;
- button = (event.type == Common::EVENT_LBUTTONDOWN ? 1 : 2);
- time = _system->getMillis();
- if (_lastClick.count && (time < _lastClick.time + kDoubleClickDelay)
- && ABS(_lastClick.x - event.mouse.x) < 3
- && ABS(_lastClick.y - event.mouse.y) < 3) {
- _lastClick.count++;
- } else {
- _lastClick.x = event.mouse.x;
- _lastClick.y = event.mouse.y;
- _lastClick.count = 1;
- }
- _lastClick.time = time;
- activeDialog->handleMouseDown(mouse.x, mouse.y, button, _lastClick.count);
- break;
- case Common::EVENT_LBUTTONUP:
- case Common::EVENT_RBUTTONUP:
- eventTookplace = true;
- button = (event.type == Common::EVENT_LBUTTONUP ? 1 : 2);
- activeDialog->handleMouseUp(mouse.x, mouse.y, button, _lastClick.count);
- break;
- case Common::EVENT_WHEELUP:
- eventTookplace = true;
- activeDialog->handleMouseWheel(mouse.x, mouse.y, -1);
- break;
- case Common::EVENT_WHEELDOWN:
- eventTookplace = true;
- activeDialog->handleMouseWheel(mouse.x, mouse.y, 1);
- break;
- case Common::EVENT_QUIT:
- return;
- case Common::EVENT_SCREEN_CHANGED:
- eventTookplace = true;
- screenChange();
- break;
- default:
- break;
- }
- }
-
- if (_tooltipCheck && _lastMousePosition.time + kTooltipDelay < _system->getMillis()) {
- if (_tooltip == 0)
- _tooltip = new Tooltip();
-
- _tooltipCheck = false;
- _tooltip->tooltipModal(_lastMousePosition.x, _lastMousePosition.y);
- }
-
- if (eventTookplace && _tooltip) {
- _tooltip->mustClose();
- }
-
- // Delay for a moment
- _system->delayMillis(10);
- }
-
-#ifdef ENABLE_KEYMAPPER
- eventMan->getKeymapper()->popKeymap();
-#endif
-
- if (didSaveState) {
- _theme->disable();
- restoreState();
- _useStdCursor = false;
- }
-}
-
-#pragma mark -
-
-void GuiManager::saveState() {
- // Backup old cursor
- _lastClick.x = _lastClick.y = 0;
- _lastClick.time = 0;
- _lastClick.count = 0;
-
- _stateIsSaved = true;
-}
-
-void GuiManager::restoreState() {
- if (_useStdCursor) {
- CursorMan.popCursor();
- CursorMan.popCursorPalette();
- }
-
- _system->updateScreen();
-
- _stateIsSaved = false;
-}
-
-void GuiManager::openDialog(Dialog *dialog) {
- _dialogStack.push(dialog);
- if (_redrawStatus != kRedrawFull)
- _redrawStatus = kRedrawOpenDialog;
-
- // We reflow the dialog just before opening it. If the screen changed
- // since the last time we looked, also refresh the loaded theme,
- // and reflow all other open dialogs, too.
- if (!checkScreenChange())
- dialog->reflowLayout();
-}
-
-void GuiManager::closeTopDialog() {
- // Don't do anything if no dialog is open
- if (_dialogStack.empty())
- return;
-
- // Remove the dialog from the stack
- _dialogStack.pop();
- if (_redrawStatus != kRedrawFull)
- _redrawStatus = kRedrawCloseDialog;
-
- redraw();
-}
-
-void GuiManager::setupCursor() {
- const byte palette[] = {
- 255, 255, 255, 0,
- 255, 255, 255, 0,
- 171, 171, 171, 0,
- 87, 87, 87, 0
- };
-
- CursorMan.pushCursorPalette(palette, 0, 4);
- CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
- CursorMan.showMouse(true);
-}
-
-// Draw the mouse cursor (animated). This is pretty much the same as in old
-// SCUMM games, but the code no longer resembles what we have in cursor.cpp
-// very much. We could plug in a different cursor here if we like to.
-
-void GuiManager::animateCursor() {
- int time = _system->getMillis();
- if (time > _cursorAnimateTimer + kCursorAnimateDelay) {
- for (int i = 0; i < 15; i++) {
- if ((i < 6) || (i > 8)) {
- _cursor[16 * 7 + i] = _cursorAnimateCounter;
- _cursor[16 * i + 7] = _cursorAnimateCounter;
- }
- }
-
- CursorMan.replaceCursor(_cursor, 16, 16, 7, 7, 255);
-
- _cursorAnimateTimer = time;
- _cursorAnimateCounter = (_cursorAnimateCounter + 1) % 4;
- }
-}
-
-bool GuiManager::checkScreenChange() {
- int tmpScreenChangeID = _system->getScreenChangeID();
- if (_lastScreenChangeID != tmpScreenChangeID) {
- screenChange();
- return true;
- }
- return false;
-}
-
-void GuiManager::screenChange() {
- _lastScreenChangeID = _system->getScreenChangeID();
- _width = _system->getOverlayWidth();
- _height = _system->getOverlayHeight();
-
- // reinit the whole theme
- _theme->refresh();
-
- // refresh all dialogs
- for (int i = 0; i < _dialogStack.size(); ++i) {
- _dialogStack[i]->reflowLayout();
- }
- // We need to redraw immediately. Otherwise
- // some other event may cause a widget to be
- // redrawn before redraw() has been called.
- _redrawStatus = kRedrawFull;
- redraw();
- _system->updateScreen();
-}
-
-} // End of namespace GUI
Deleted: scummvm/trunk/gui/GuiManager.h
===================================================================
--- scummvm/trunk/gui/GuiManager.h 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/GuiManager.h 2010-11-16 10:19:01 UTC (rev 54265)
@@ -1,157 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#ifndef GUIMANAGER_H
-#define GUIMANAGER_H
-
-#include "common/scummsys.h"
-#include "common/singleton.h"
-#include "common/stack.h"
-#include "common/str.h"
-
-#include "graphics/font.h"
-
-#include "gui/widget.h"
-#include "gui/Tooltip.h"
-#include "gui/ThemeEngine.h"
-
-class OSystem;
-
-namespace GUI {
-
-class Dialog;
-class ThemeEval;
-
-#define g_gui (GUI::GuiManager::instance())
-
-
-// Height of a single text line
-#define kLineHeight (g_gui.getFontHeight() + 2)
-
-
-
-// Simple dialog stack class
-// Anybody nesting dialogs deeper than 4 is mad anyway
-typedef Common::FixedStack<Dialog *> DialogStack;
-
-
-/**
- * GUI manager singleton.
- */
-class GuiManager : public Common::Singleton<GuiManager> {
- friend class Dialog;
- friend class Tooltip;
- friend class Common::Singleton<SingletonBaseType>;
- GuiManager();
- ~GuiManager();
-public:
-
- // Main entry for the GUI: this will start an event loop that keeps running
- // until no dialogs are active anymore.
- void runLoop();
-
- bool isActive() const { return ! _dialogStack.empty(); }
-
- bool loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx = ThemeEngine::kGfxDisabled, bool force = false);
- ThemeEngine *theme() { return _theme; }
-
- ThemeEval *xmlEval() { return _theme->getEvaluator(); }
-
- int getWidth() const { return _width; }
- int getHeight() const { return _height; }
-
- const Graphics::Font &getFont(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return *(_theme->getFont(style)); }
- int getFontHeight(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getFontHeight(style); }
- int getStringWidth(const Common::String &str, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getStringWidth(str, style); }
- int getCharWidth(byte c, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getCharWidth(c, style); }
-
- /**
- * Tell the GuiManager to check whether the screen resolution has changed.
- * If that is the case, the GuiManager will reload/refresh the active theme.
- *
- * @return true if the a screen change indeed occurred, false otherwise
- */
- bool checkScreenChange();
-
-protected:
- enum RedrawStatus {
- kRedrawDisabled = 0,
- kRedrawOpenDialog,
- kRedrawCloseDialog,
- kRedrawTopDialog,
- kRedrawFull
- };
-
- OSystem *_system;
-
- ThemeEngine *_theme;
-
-// bool _needRedraw;
- RedrawStatus _redrawStatus;
- int _lastScreenChangeID;
- int _width, _height;
- DialogStack _dialogStack;
-
- bool _stateIsSaved;
-
- bool _useStdCursor;
-
- Tooltip *_tooltip;
- bool _tooltipCheck;
-
- // position and time of last mouse click (used to detect double clicks)
- struct {
- int16 x, y; // Position of mouse when the click occurred
- uint32 time; // Time
- int count; // How often was it already pressed?
- } _lastClick, _lastMousePosition;
-
- // mouse cursor state
- int _cursorAnimateCounter;
- int _cursorAnimateTimer;
- byte _cursor[2048];
-
- void initKeymap();
-
- void saveState();
- void restoreState();
-
- void openDialog(Dialog *dialog);
- void closeTopDialog();
-
- void redraw();
-
- void loop();
-
- void setupCursor();
- void animateCursor();
-
- Dialog *getTopDialog() const;
-
- void screenChange();
-};
-
-} // End of namespace GUI
-
-#endif
Modified: scummvm/trunk/gui/KeysDialog.h
===================================================================
--- scummvm/trunk/gui/KeysDialog.h 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/KeysDialog.h 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#ifndef KEYSDIALOG_H
#define KEYSDIALOG_H
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/dialog.h"
#include "gui/widgets/list.h"
#include "common/str.h"
Modified: scummvm/trunk/gui/ThemeParser.cpp
===================================================================
--- scummvm/trunk/gui/ThemeParser.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/ThemeParser.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#include "gui/ThemeEngine.h"
#include "gui/ThemeEval.h"
#include "gui/ThemeParser.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "graphics/VectorRenderer.h"
Modified: scummvm/trunk/gui/Tooltip.cpp
===================================================================
--- scummvm/trunk/gui/Tooltip.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/Tooltip.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#include "graphics/fontman.h"
#include "gui/widget.h"
#include "gui/dialog.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/Tooltip.h"
#include "gui/ThemeEval.h"
Modified: scummvm/trunk/gui/about.cpp
===================================================================
--- scummvm/trunk/gui/about.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/about.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -30,7 +30,7 @@
#include "common/translation.h"
#include "common/util.h"
#include "gui/about.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widget.h"
#include "gui/ThemeEval.h"
Modified: scummvm/trunk/gui/browser.cpp
===================================================================
--- scummvm/trunk/gui/browser.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/browser.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -23,7 +23,7 @@
*/
#include "gui/browser.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widgets/list.h"
#include "common/config-manager.h"
Modified: scummvm/trunk/gui/chooser.cpp
===================================================================
--- scummvm/trunk/gui/chooser.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/chooser.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -25,7 +25,7 @@
#include "common/system.h"
#include "common/translation.h"
#include "gui/chooser.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widgets/list.h"
namespace GUI {
Modified: scummvm/trunk/gui/console.h
===================================================================
--- scummvm/trunk/gui/console.h 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/console.h 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#define CONSOLE_DIALOG_H
#include "gui/dialog.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
namespace GUI {
Modified: scummvm/trunk/gui/dialog.cpp
===================================================================
--- scummvm/trunk/gui/dialog.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/dialog.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -24,7 +24,7 @@
#include "common/events.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/dialog.h"
#include "gui/widget.h"
#include "gui/widgets/popup.h"
Copied: scummvm/trunk/gui/gui-manager.cpp (from rev 54260, scummvm/trunk/gui/GuiManager.cpp)
===================================================================
--- scummvm/trunk/gui/gui-manager.cpp (rev 0)
+++ scummvm/trunk/gui/gui-manager.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -0,0 +1,514 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#include "common/events.h"
+#include "common/system.h"
+#include "common/util.h"
+#include "common/config-manager.h"
+#include "common/algorithm.h"
+#include "common/timer.h"
+#include "common/translation.h"
+
+#include "backends/keymapper/keymapper.h"
+
+#include "gui/GuiManager.h"
+#include "gui/dialog.h"
+#include "gui/ThemeEngine.h"
+#include "gui/ThemeEval.h"
+
+#include "graphics/cursorman.h"
+
+DECLARE_SINGLETON(GUI::GuiManager);
+
+namespace GUI {
+
+enum {
+ kDoubleClickDelay = 500, // milliseconds
+ kCursorAnimateDelay = 250,
+ kTooltipDelay = 1250
+};
+
+// Constructor
+GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _tooltipCheck(false),
+ _stateIsSaved(false), _cursorAnimateCounter(0), _cursorAnimateTimer(0) {
+ _theme = 0;
+ _useStdCursor = false;
+
+ _system = g_system;
+ _lastScreenChangeID = _system->getScreenChangeID();
+ _width = _system->getOverlayWidth();
+ _height = _system->getOverlayHeight();
+
+ // Clear the cursor
+ memset(_cursor, 0xFF, sizeof(_cursor));
+
+ // Enable translation
+ TransMan.setLanguage(ConfMan.get("gui_language").c_str());
+
+ ConfMan.registerDefault("gui_theme", "scummmodern");
+ Common::String themefile(ConfMan.get("gui_theme"));
+
+ ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode));
+ ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ThemeEngine::findMode(ConfMan.get("gui_renderer"));
+
+ // Try to load the theme
+ if (!loadNewTheme(themefile, gfxMode)) {
+ // Loading the theme failed, try to load the built-in theme
+ if (!loadNewTheme("builtin", gfxMode)) {
+ // Loading the built-in theme failed as well. Bail out
+ error("Failed to load any GUI theme, aborting");
+ }
+ }
+
+ _tooltip = 0;
+}
+
+GuiManager::~GuiManager() {
+ delete _theme;
+ delete _tooltip;
+}
+
+#ifdef ENABLE_KEYMAPPER
+void GuiManager::initKeymap() {
+ using namespace Common;
+
+ bool tmp;
+ Keymapper *mapper = _system->getEventManager()->getKeymapper();
+
+ // Do not try to recreate same keymap over again
+ if (mapper->getKeymap("gui", tmp) != 0)
+ return;
+
+ Action *act;
+ Keymap *guiMap = new Keymap("gui");
+
+ act = new Action(guiMap, "CLOS", _("Close"), kGenericActionType, kStartKeyType);
+ act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0));
+
+ act = new Action(guiMap, "CLIK", _("Mouse click"));
+ act->addLeftClickEvent();
+
+ act = new Action(guiMap, "VIRT", _("Display keyboard"), kVirtualKeyboardActionType);
+ act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
+
+ act = new Action(guiMap, "REMP", _("Remap keys"), kKeyRemapActionType);
+ act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
+
+ mapper->addGlobalKeymap(guiMap);
+}
+#endif
+
+bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx, bool forced) {
+ // If we are asked to reload the currently active theme, just do nothing
+ // FIXME: Actually, why? It might be desirable at times to force a theme reload...
+ if (!forced)
+ if (_theme && id == _theme->getThemeId() && gfx == _theme->getGraphicsMode())
+ return true;
+
+ ThemeEngine *newTheme = 0;
+
+ if (gfx == ThemeEngine::kGfxDisabled)
+ gfx = ThemeEngine::_defaultRendererMode;
+
+ // Try to load the new theme
+ newTheme = new ThemeEngine(id, gfx);
+ assert(newTheme);
+
+ if (!newTheme->init())
+ return false;
+
+ //
+ // Disable and delete the old theme
+ //
+ if (_theme)
+ _theme->disable();
+ delete _theme;
+
+ if (_useStdCursor) {
+ CursorMan.popCursorPalette();
+ CursorMan.popCursor();
+ }
+
+ //
+ // Enable the new theme
+ //
+ _theme = newTheme;
+ _useStdCursor = !_theme->ownCursor();
+
+ // If _stateIsSaved is set, we know that a Theme is already initialized,
+ // thus we initialize the new theme properly
+ if (_stateIsSaved) {
+ _theme->enable();
+
+ if (_useStdCursor)
+ setupCursor();
+ }
+
+ // refresh all dialogs
+ for (int i = 0; i < _dialogStack.size(); ++i)
+ _dialogStack[i]->reflowLayout();
+
+ // We need to redraw immediately. Otherwise
+ // some other event may cause a widget to be
+ // redrawn before redraw() has been called.
+ _redrawStatus = kRedrawFull;
+ redraw();
+ _system->updateScreen();
+
+ return true;
+}
+
+void GuiManager::redraw() {
+ int i;
+ ThemeEngine::ShadingStyle shading;
+
+ if (_redrawStatus == kRedrawDisabled || _dialogStack.empty())
+ return;
+
+ shading = (ThemeEngine::ShadingStyle)xmlEval()->getVar("Dialog." + _dialogStack.top()->_name + ".Shading", 0);
+
+ // Tanoku: Do not apply shading more than once when opening many dialogs
+ // on top of each other. Screen ends up being too dark and it's a
+ // performance hog.
+ if (_redrawStatus == kRedrawOpenDialog && _dialogStack.size() > 2)
+ shading = ThemeEngine::kShadingNone;
+
+ switch (_redrawStatus) {
+ case kRedrawCloseDialog:
+ case kRedrawFull:
+ case kRedrawTopDialog:
+ _theme->clearAll();
+ _theme->openDialog(true, ThemeEngine::kShadingNone);
+
+ for (i = 0; i < _dialogStack.size() - 1; i++) {
+ _dialogStack[i]->drawDialog();
+ }
+
+ _theme->finishBuffering();
+
+ case kRedrawOpenDialog:
+ _theme->updateScreen();
+ _theme->openDialog(true, shading);
+ _dialogStack.top()->drawDialog();
+ _theme->finishBuffering();
+ break;
+
+ default:
+ return;
+ }
+
+ _theme->updateScreen();
+ _redrawStatus = kRedrawDisabled;
+}
+
+Dialog *GuiManager::getTopDialog() const {
+ if (_dialogStack.empty())
+ return 0;
+ return _dialogStack.top();
+}
+
+void GuiManager::runLoop() {
+ Dialog *activeDialog = getTopDialog();
+ bool didSaveState = false;
+ int button;
+ uint32 time;
+
+ if (activeDialog == 0)
+ return;
+
+ if (!_stateIsSaved) {
+ saveState();
+ _theme->enable();
+ didSaveState = true;
+
+ _useStdCursor = !_theme->ownCursor();
+ if (_useStdCursor)
+ setupCursor();
+
+// _theme->refresh();
+
+ _redrawStatus = kRedrawFull;
+ redraw();
+ }
+
+ _lastMousePosition.x = _lastMousePosition.y = -1;
+ _lastMousePosition.time = 0;
+
+ Common::EventManager *eventMan = _system->getEventManager();
+ uint32 lastRedraw = 0;
+ const uint32 waitTime = 1000 / 45;
+
+#ifdef ENABLE_KEYMAPPER
+ // Due to circular reference with event manager and GUI
+ // we cannot init keymap on the GUI creation. Thus, let's
+ // try to do it on every launch, checking whether the
+ // map is already existing
+ initKeymap();
+
+ eventMan->getKeymapper()->pushKeymap("gui");
+#endif
+
+ while (!_dialogStack.empty() && activeDialog == getTopDialog()) {
+ redraw();
+
+ // Don't "tickle" the dialog until the theme has had a chance
+ // to re-allocate buffers in case of a scaler change.
+
+ activeDialog->handleTickle();
+
+ if (_useStdCursor)
+ animateCursor();
+// _theme->updateScreen();
+// _system->updateScreen();
+
+ if (lastRedraw + waitTime < _system->getMillis()) {
+ _theme->updateScreen();
+ _system->updateScreen();
+ lastRedraw = _system->getMillis();
+ }
+
+ Common::Event event;
+
+ bool eventTookplace = false;
+ while (eventMan->pollEvent(event)) {
+
+ // The top dialog can change during the event loop. In that case, flush all the
+ // dialog-related events since they were probably generated while the old dialog
+ // was still visible, and therefore not intended for the new one.
+ //
+ // This hopefully fixes strange behaviour/crashes with pop-up widgets. (Most easily
+ // triggered in 3x mode or when running ScummVM under Valgrind.)
+ if (activeDialog != getTopDialog() && event.type != Common::EVENT_SCREEN_CHANGED)
+ continue;
+
+ Common::Point mouse(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y);
+
+ if (lastRedraw + waitTime < _system->getMillis()) {
+ _theme->updateScreen();
+ _system->updateScreen();
+ lastRedraw = _system->getMillis();
+ }
+
+ switch (event.type) {
+ case Common::EVENT_KEYDOWN:
+ activeDialog->handleKeyDown(event.kbd);
+ eventTookplace = true;
+ break;
+ case Common::EVENT_KEYUP:
+ activeDialog->handleKeyUp(event.kbd);
+ eventTookplace = true;
+ break;
+ case Common::EVENT_MOUSEMOVE:
+ activeDialog->handleMouseMoved(mouse.x, mouse.y, 0);
+
+ if (mouse.x != _lastMousePosition.x || mouse.y != _lastMousePosition.y) {
+ _lastMousePosition.x = mouse.x;
+ _lastMousePosition.y = mouse.y;
+ _lastMousePosition.time = _system->getMillis();
+ }
+
+ _tooltipCheck = true;
+ eventTookplace = true;
+ break;
+ // We don't distinguish between mousebuttons (for now at least)
+ case Common::EVENT_LBUTTONDOWN:
+ case Common::EVENT_RBUTTONDOWN:
+ eventTookplace = true;
+ button = (event.type == Common::EVENT_LBUTTONDOWN ? 1 : 2);
+ time = _system->getMillis();
+ if (_lastClick.count && (time < _lastClick.time + kDoubleClickDelay)
+ && ABS(_lastClick.x - event.mouse.x) < 3
+ && ABS(_lastClick.y - event.mouse.y) < 3) {
+ _lastClick.count++;
+ } else {
+ _lastClick.x = event.mouse.x;
+ _lastClick.y = event.mouse.y;
+ _lastClick.count = 1;
+ }
+ _lastClick.time = time;
+ activeDialog->handleMouseDown(mouse.x, mouse.y, button, _lastClick.count);
+ break;
+ case Common::EVENT_LBUTTONUP:
+ case Common::EVENT_RBUTTONUP:
+ eventTookplace = true;
+ button = (event.type == Common::EVENT_LBUTTONUP ? 1 : 2);
+ activeDialog->handleMouseUp(mouse.x, mouse.y, button, _lastClick.count);
+ break;
+ case Common::EVENT_WHEELUP:
+ eventTookplace = true;
+ activeDialog->handleMouseWheel(mouse.x, mouse.y, -1);
+ break;
+ case Common::EVENT_WHEELDOWN:
+ eventTookplace = true;
+ activeDialog->handleMouseWheel(mouse.x, mouse.y, 1);
+ break;
+ case Common::EVENT_QUIT:
+ return;
+ case Common::EVENT_SCREEN_CHANGED:
+ eventTookplace = true;
+ screenChange();
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (_tooltipCheck && _lastMousePosition.time + kTooltipDelay < _system->getMillis()) {
+ if (_tooltip == 0)
+ _tooltip = new Tooltip();
+
+ _tooltipCheck = false;
+ _tooltip->tooltipModal(_lastMousePosition.x, _lastMousePosition.y);
+ }
+
+ if (eventTookplace && _tooltip) {
+ _tooltip->mustClose();
+ }
+
+ // Delay for a moment
+ _system->delayMillis(10);
+ }
+
+#ifdef ENABLE_KEYMAPPER
+ eventMan->getKeymapper()->popKeymap();
+#endif
+
+ if (didSaveState) {
+ _theme->disable();
+ restoreState();
+ _useStdCursor = false;
+ }
+}
+
+#pragma mark -
+
+void GuiManager::saveState() {
+ // Backup old cursor
+ _lastClick.x = _lastClick.y = 0;
+ _lastClick.time = 0;
+ _lastClick.count = 0;
+
+ _stateIsSaved = true;
+}
+
+void GuiManager::restoreState() {
+ if (_useStdCursor) {
+ CursorMan.popCursor();
+ CursorMan.popCursorPalette();
+ }
+
+ _system->updateScreen();
+
+ _stateIsSaved = false;
+}
+
+void GuiManager::openDialog(Dialog *dialog) {
+ _dialogStack.push(dialog);
+ if (_redrawStatus != kRedrawFull)
+ _redrawStatus = kRedrawOpenDialog;
+
+ // We reflow the dialog just before opening it. If the screen changed
+ // since the last time we looked, also refresh the loaded theme,
+ // and reflow all other open dialogs, too.
+ if (!checkScreenChange())
+ dialog->reflowLayout();
+}
+
+void GuiManager::closeTopDialog() {
+ // Don't do anything if no dialog is open
+ if (_dialogStack.empty())
+ return;
+
+ // Remove the dialog from the stack
+ _dialogStack.pop();
+ if (_redrawStatus != kRedrawFull)
+ _redrawStatus = kRedrawCloseDialog;
+
+ redraw();
+}
+
+void GuiManager::setupCursor() {
+ const byte palette[] = {
+ 255, 255, 255, 0,
+ 255, 255, 255, 0,
+ 171, 171, 171, 0,
+ 87, 87, 87, 0
+ };
+
+ CursorMan.pushCursorPalette(palette, 0, 4);
+ CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
+ CursorMan.showMouse(true);
+}
+
+// Draw the mouse cursor (animated). This is pretty much the same as in old
+// SCUMM games, but the code no longer resembles what we have in cursor.cpp
+// very much. We could plug in a different cursor here if we like to.
+
+void GuiManager::animateCursor() {
+ int time = _system->getMillis();
+ if (time > _cursorAnimateTimer + kCursorAnimateDelay) {
+ for (int i = 0; i < 15; i++) {
+ if ((i < 6) || (i > 8)) {
+ _cursor[16 * 7 + i] = _cursorAnimateCounter;
+ _cursor[16 * i + 7] = _cursorAnimateCounter;
+ }
+ }
+
+ CursorMan.replaceCursor(_cursor, 16, 16, 7, 7, 255);
+
+ _cursorAnimateTimer = time;
+ _cursorAnimateCounter = (_cursorAnimateCounter + 1) % 4;
+ }
+}
+
+bool GuiManager::checkScreenChange() {
+ int tmpScreenChangeID = _system->getScreenChangeID();
+ if (_lastScreenChangeID != tmpScreenChangeID) {
+ screenChange();
+ return true;
+ }
+ return false;
+}
+
+void GuiManager::screenChange() {
+ _lastScreenChangeID = _system->getScreenChangeID();
+ _width = _system->getOverlayWidth();
+ _height = _system->getOverlayHeight();
+
+ // reinit the whole theme
+ _theme->refresh();
+
+ // refresh all dialogs
+ for (int i = 0; i < _dialogStack.size(); ++i) {
+ _dialogStack[i]->reflowLayout();
+ }
+ // We need to redraw immediately. Otherwise
+ // some other event may cause a widget to be
+ // redrawn before redraw() has been called.
+ _redrawStatus = kRedrawFull;
+ redraw();
+ _system->updateScreen();
+}
+
+} // End of namespace GUI
Copied: scummvm/trunk/gui/gui-manager.h (from rev 54260, scummvm/trunk/gui/GuiManager.h)
===================================================================
--- scummvm/trunk/gui/gui-manager.h (rev 0)
+++ scummvm/trunk/gui/gui-manager.h 2010-11-16 10:19:01 UTC (rev 54265)
@@ -0,0 +1,157 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef GUIMANAGER_H
+#define GUIMANAGER_H
+
+#include "common/scummsys.h"
+#include "common/singleton.h"
+#include "common/stack.h"
+#include "common/str.h"
+
+#include "graphics/font.h"
+
+#include "gui/widget.h"
+#include "gui/Tooltip.h"
+#include "gui/ThemeEngine.h"
+
+class OSystem;
+
+namespace GUI {
+
+class Dialog;
+class ThemeEval;
+
+#define g_gui (GUI::GuiManager::instance())
+
+
+// Height of a single text line
+#define kLineHeight (g_gui.getFontHeight() + 2)
+
+
+
+// Simple dialog stack class
+// Anybody nesting dialogs deeper than 4 is mad anyway
+typedef Common::FixedStack<Dialog *> DialogStack;
+
+
+/**
+ * GUI manager singleton.
+ */
+class GuiManager : public Common::Singleton<GuiManager> {
+ friend class Dialog;
+ friend class Tooltip;
+ friend class Common::Singleton<SingletonBaseType>;
+ GuiManager();
+ ~GuiManager();
+public:
+
+ // Main entry for the GUI: this will start an event loop that keeps running
+ // until no dialogs are active anymore.
+ void runLoop();
+
+ bool isActive() const { return ! _dialogStack.empty(); }
+
+ bool loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx = ThemeEngine::kGfxDisabled, bool force = false);
+ ThemeEngine *theme() { return _theme; }
+
+ ThemeEval *xmlEval() { return _theme->getEvaluator(); }
+
+ int getWidth() const { return _width; }
+ int getHeight() const { return _height; }
+
+ const Graphics::Font &getFont(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return *(_theme->getFont(style)); }
+ int getFontHeight(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getFontHeight(style); }
+ int getStringWidth(const Common::String &str, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getStringWidth(str, style); }
+ int getCharWidth(byte c, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getCharWidth(c, style); }
+
+ /**
+ * Tell the GuiManager to check whether the screen resolution has changed.
+ * If that is the case, the GuiManager will reload/refresh the active theme.
+ *
+ * @return true if the a screen change indeed occurred, false otherwise
+ */
+ bool checkScreenChange();
+
+protected:
+ enum RedrawStatus {
+ kRedrawDisabled = 0,
+ kRedrawOpenDialog,
+ kRedrawCloseDialog,
+ kRedrawTopDialog,
+ kRedrawFull
+ };
+
+ OSystem *_system;
+
+ ThemeEngine *_theme;
+
+// bool _needRedraw;
+ RedrawStatus _redrawStatus;
+ int _lastScreenChangeID;
+ int _width, _height;
+ DialogStack _dialogStack;
+
+ bool _stateIsSaved;
+
+ bool _useStdCursor;
+
+ Tooltip *_tooltip;
+ bool _tooltipCheck;
+
+ // position and time of last mouse click (used to detect double clicks)
+ struct {
+ int16 x, y; // Position of mouse when the click occurred
+ uint32 time; // Time
+ int count; // How often was it already pressed?
+ } _lastClick, _lastMousePosition;
+
+ // mouse cursor state
+ int _cursorAnimateCounter;
+ int _cursorAnimateTimer;
+ byte _cursor[2048];
+
+ void initKeymap();
+
+ void saveState();
+ void restoreState();
+
+ void openDialog(Dialog *dialog);
+ void closeTopDialog();
+
+ void redraw();
+
+ void loop();
+
+ void setupCursor();
+ void animateCursor();
+
+ Dialog *getTopDialog() const;
+
+ void screenChange();
+};
+
+} // End of namespace GUI
+
+#endif
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/launcher.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -38,7 +38,7 @@
#include "gui/launcher.h"
#include "gui/massadd.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/options.h"
#include "gui/saveload.h"
#include "gui/widgets/edittext.h"
Modified: scummvm/trunk/gui/massadd.cpp
===================================================================
--- scummvm/trunk/gui/massadd.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/massadd.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -31,7 +31,7 @@
#include "gui/launcher.h" // For addGameToConf()
#include "gui/massadd.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/widget.h"
#include "gui/widgets/list.h"
Modified: scummvm/trunk/gui/message.cpp
===================================================================
--- scummvm/trunk/gui/message.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/message.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#include "common/str.h"
#include "common/system.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/ThemeEval.h"
#include "gui/widget.h"
Modified: scummvm/trunk/gui/module.mk
===================================================================
--- scummvm/trunk/gui/module.mk 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/module.mk 2010-11-16 10:19:01 UTC (rev 54265)
@@ -7,7 +7,7 @@
debugger.o \
dialog.o \
error.o \
- GuiManager.o \
+ gui-manager.o \
launcher.o \
massadd.o \
message.o \
Modified: scummvm/trunk/gui/object.cpp
===================================================================
--- scummvm/trunk/gui/object.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/object.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -25,7 +25,7 @@
#include "common/system.h"
#include "gui/object.h"
#include "gui/widget.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/ThemeEval.h"
namespace GUI {
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/options.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#include "gui/themebrowser.h"
#include "gui/chooser.h"
#include "gui/message.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/ThemeEval.h"
#include "gui/options.h"
#include "gui/widgets/popup.h"
Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp 2010-11-16 10:11:57 UTC (rev 54264)
+++ scummvm/trunk/gui/widget.cpp 2010-11-16 10:19:01 UTC (rev 54265)
@@ -26,7 +26,7 @@
#include "graphics/fontman.h"
#include "gui/widget.h"
#include "gui/dialog.h"
-#include "gui/GuiManager.h"
+#include "gui/gui-manager.h"
#include "gui/ThemeEval.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list