Ticket #8711: backends-lib.v5.1

Index: backends/platform/sdl/sdl.cpp
===================================================================
--- backends/platform/sdl/sdl.cpp       (revision 28684)
+++ backends/platform/sdl/sdl.cpp       (working copy)
@@ -473,3 +473,30 @@
                _cdEndTime = SDL_GetTicks() + _cdrom->track[_cdTrack].length * 1000 / CD_FPS;
        }
 }
+
+enum {
+       kCmdTestBtn = 'TEST'
+};
+
+GUI::StaticTextWidget *_stw;
+
+void OSystem_SDL::genereteBackendTab (GUI::GuiObject *boss) {
+       new GUI::ButtonWidget(boss, "gameoptions_extrapath", "Click!", kCmdTestBtn, 'Q');
+       _stw = new GUI::StaticTextWidget(boss, "gameoptions_id", "test");
+}
+
+bool OSystem_SDL::handleBackendTabCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
+       switch(cmd) {
+               case kCmdTestBtn:
+                       _stw->setEnabled(!_stw->isEnabled());
+                       _stw->draw();
+                       return true;
+               default:
+                       return false;
+       }
+}
+
+Common::String OSystem_SDL::getExtraThemeConfig() {
+       Common::String myConfigINI("[XxY]\ngameoptions_gamepath.enabled=false\n");
+       return myConfigINI;
+}
\ No newline at end of file
Index: backends/platform/sdl/sdl.h
===================================================================
--- backends/platform/sdl/sdl.h (revision 28684)
+++ backends/platform/sdl/sdl.h (working copy)
@@ -34,7 +34,10 @@
 #include "graphics/scaler.h"
 #include "backends/intern.h"
 
+#include "gui/object.h"
+#include "gui/widget.h"
 
+
 namespace Audio {
        class Mixer;
 }
@@ -410,6 +413,20 @@
        virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 
        void handleScalerHotkeys(const SDL_KeyboardEvent &key);
+
+       // backend lib methods
+
+public:
+
+       virtual Common::String getBackendTabName () {
+               return "test";
+       }
+       
+       virtual void genereteBackendTab (GUI::GuiObject *boss);
+
+       virtual bool handleBackendTabCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+
+       virtual Common::String getExtraThemeConfig();
 };
 
 #endif
Index: common/system.h
===================================================================
--- common/system.h     (revision 28684)
+++ common/system.h     (working copy)
@@ -31,6 +31,8 @@
 #include "common/noncopyable.h"
 #include "common/rect.h"
 
+#include "gui/object.h"
+
 namespace Audio {
        class Mixer;
 }
@@ -885,6 +887,41 @@
         */
        virtual Common::SaveFileManager *getSavefileManager() = 0;
 
+       // backend lib methods
+
+       // backend specific game options tab methods
+
+       /**
+        * Returns the name of the backend specific tab in game edit dialog
+        */
+       virtual Common::String getBackendTabName() {
+               return "";
+       }
+
+       /**
+        * Hook method to allow the backends generate their own specific tab in game edit dialog
+        */
+       virtual void genereteBackendTab(GUI::GuiObject *boss) {}
+
+       /**
+        * Hook method to allow the backends process the events from their
+        * own specific tab in game edit dialog
+        */
+       virtual bool handleBackendTabCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
+               return false;
+       }
+
+       // disabling launcher dialog GUI elements method
+       
+       /**
+        * Returns the additional backend specific theme config 
+        * that may be optionally processed by each theme after it has loaded its main config
+        */
+       // currently it's intented to be used by backends to disable specific GUI elements on launcher dialog
+       virtual Common::String getExtraThemeConfig() {
+               return "";
+       }
+       
        //@}
 };
 
 Index: gui/ThemeModern.cpp
===================================================================
--- gui/ThemeModern.cpp (revision 28684)
+++ gui/ThemeModern.cpp (working copy)
@@ -135,7 +135,7 @@
 
        if (isThemeLoadingRequired()) {
                loadTheme(_defaultConfig);
-               loadTheme(_configFile, false); // Don't reset
+               loadTheme(_configFile, false, true); // Don't reset
 
                processExtraValues();
        }
Index: gui/theme.h
===================================================================
--- gui/theme.h (revision 28684)
+++ gui/theme.h (working copy)
@@ -211,7 +211,7 @@
        bool isThemeLoadingRequired();
        bool sectionIsSkipped(Common::ConfigFile &config, const char *name, int w, int h);
        void loadTheme(Common::ConfigFile &config, bool reset = true);
-
+       void loadTheme(Common::ConfigFile &config, bool reset, bool doBackendSpecificPostProcessing);
        Eval *_evaluator;
 
        static bool themeConfigUseable(const Common::String &file, const Common::String &style="", Common::String *cStyle=0, Common::ConfigFile *cfg=0);
Index: gui/widget.h
===================================================================
--- gui/widget.h        (revision 28684)
+++ gui/widget.h        (working copy)
@@ -148,7 +148,7 @@
        int getHints() const            { return _hints; }
 
        void setEnabled(bool e)         { if (e) setFlags(WIDGET_ENABLED); else clearFlags(WIDGET_ENABLED); }
-       bool isEnabled() const          { return _flags & WIDGET_ENABLED; }
+       bool isEnabled() const;
        bool isVisible() const;
 
 protected:
Index: gui/launcher.cpp
===================================================================
--- gui/launcher.cpp    (revision 28684)
+++ gui/launcher.cpp    (working copy)
@@ -259,6 +259,14 @@
                _savePathWidget->setLabel("Default");
        }
 
+       //
+       // 8) Backend tab
+       //
+       if (!g_system->getBackendTabName().empty()){
+               tab->addTab(g_system->getBackendTabName());
+               g_system->genereteBackendTab(tab);
+       }
+
        // Activate the first tab
        tab->setActiveTab(0);
 
@@ -464,7 +472,9 @@
                }
                // FALL THROUGH to default case
        default:
-               OptionsDialog::handleCommand(sender, cmd, data);
+               if(!g_system->handleBackendTabCommand(sender, cmd, data)) {
+                       OptionsDialog::handleCommand(sender, cmd, data);
+               }
        }
 }
 
Index: gui/ThemeClassic.cpp
===================================================================
--- gui/ThemeClassic.cpp        (revision 28684)
+++ gui/ThemeClassic.cpp        (working copy)
@@ -70,7 +70,7 @@
 
        if (isThemeLoadingRequired()) {
                loadTheme(_defaultConfig);
-               loadTheme(_configFile, false);
+               loadTheme(_configFile, false, true);
 
                setupConfig();
        }
Index: gui/theme-config.cpp
===================================================================
--- gui/theme-config.cpp        (revision 28684)
+++ gui/theme-config.cpp        (working copy)
@@ -766,4 +766,16 @@
        debug(3, "Number of variables: %d", _evaluator->getNumVars());
 }
 
+void Theme::loadTheme(Common::ConfigFile &config, bool reset, bool doBackendSpecificPostProcessing) {
+       loadTheme(config, reset);
+
+       if (doBackendSpecificPostProcessing && !g_system->getExtraThemeConfig().empty()) {
+               Common::ConfigFile myConfig;
+               Common::String myConfigINI = g_system->getExtraThemeConfig();
+               Common::MemoryReadStream s((const byte *)myConfigINI.c_str(), strlen(myConfigINI.c_str()));
+               myConfig.loadFromStream(s);
+               loadTheme(myConfig, false);
+       }
+}
+
 } // End of namespace GUI
Index: gui/widget.cpp
===================================================================
--- gui/widget.cpp      (revision 28684)
+++ gui/widget.cpp      (working copy)
@@ -135,6 +135,12 @@
        return 0;
 }
 
+bool Widget::isEnabled() const {
+       if (g_gui.evaluator()->getVar(_name + ".enabled") == 0)
+               return false;
+       return _flags & WIDGET_ENABLED;
+}
+
 bool Widget::isVisible() const {
        if (g_gui.evaluator()->getVar(_name + ".visible") == 0)
                return false;