From 0cd183b94b7d24f9df8453ee126bceddc1dfd857 Mon Sep 17 00:00:00 2001
From: Vicent Marti
Date: Thu, 26 Jun 2008 13:50:16 +0000
Subject: InterfaceManager now loads themes.
svn-id: r32800
---
base/main.cpp | 2 --
common/xmlparser.cpp | 19 ----------------
common/xmlparser.h | 24 ++++++++++++++++++-
dists/msvc9/scummvm.vcproj | 11 ++++-----
gui/InterfaceManager.cpp | 51 ++++++++++-------------------------------
gui/InterfaceManager.h | 7 ++++--
gui/ThemeDefaultXML.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++++
gui/ThemeParser.cpp | 12 ++++++++++
gui/ThemeParser.h | 2 ++
gui/module.mk | 1 +
10 files changed, 116 insertions(+), 70 deletions(-)
create mode 100644 gui/ThemeDefaultXML.cpp
diff --git a/base/main.cpp b/base/main.cpp
index 20775f24db..53b4cb7cf4 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -72,8 +72,6 @@ static bool launcherDialog(OSystem &system) {
#if 1
- GUI::ThemeParser parser;
- parser.debug_testEval();
g_InterfaceManager.runGUI();
return true;
diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
index 6cb3a8a441..22b8b22e48 100644
--- a/common/xmlparser.cpp
+++ b/common/xmlparser.cpp
@@ -34,25 +34,6 @@ namespace Common {
using namespace Graphics;
-void XMLParser::debug_testEval() {
- static const char *debugConfigText =
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "\n"
- "/* lol this is just a simple test*/\n"
- "";
-
- loadBuffer(debugConfigText);
- _fileName = "test_parse.xml";
-
- parse();
-}
-
-
bool XMLParser::parserError(const char *errorString, ...) {
_state = kParserError;
diff --git a/common/xmlparser.h b/common/xmlparser.h
index 3eb87efd31..4c8e1b986f 100644
--- a/common/xmlparser.h
+++ b/common/xmlparser.h
@@ -120,23 +120,45 @@ public:
int depth;
};
+ /**
+ * Loads a file into the parser.
+ * Used for the loading of Theme Description files
+ * straight from the filesystem.
+ *
+ * @param filename Name of the file to load.
+ */
virtual bool loadFile(Common::String filename) {
Common::File *f = new Common::File;
if (!f->open(filename, Common::File::kFileReadMode))
return false;
+ _fileName = filename;
_text.loadStream(f);
return true;
}
+ /**
+ * Loads a memory buffer into the parser.
+ * Used for loading the default theme fallback directly
+ * from memory if no themes can be found.
+ *
+ * @param buffer Pointer to the buffer.
+ * @param disposable Sets if the XMLParser owns the buffer,
+ * i.e. if it can be freed safely after it's
+ * no longer needed by the parser.
+ */
virtual bool loadBuffer(const char *buffer, bool disposable = false) {
_text.loadStream(new MemoryReadStream((const byte*)buffer, strlen(buffer), disposable));
+ _fileName = "Memory Stream";
return true;
}
+ /**
+ * The actual parsing function.
+ * Parses the loaded data stream, returns true if successful.
+ */
virtual bool parse();
- void debug_testEval();
/**
* Returns the active node being parsed (the one on top of
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index 57ee62e358..cd502b3ca8 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -1224,6 +1224,10 @@
RelativePath="..\..\gui\ThemeClassic.cpp"
>
+
+
@@ -1231,13 +1235,6 @@
-
-
-
getEventManager();
+
+ loadTheme("modern_theme.xml");
+
_system->showOverlay();
- Graphics::DrawStep *steps = new Graphics::DrawStep[5];
+ Graphics::DrawStep *steps = new Graphics::DrawStep[2];
steps[0].gradColor1.r = 214;
steps[0].gradColor1.g = 113;
steps[0].gradColor1.b = 8;
+ steps[0].gradColor1.set = true;
steps[0].gradColor2.r = 240;
steps[0].gradColor2.g = 200;
steps[0].gradColor2.b = 25;
+ steps[0].gradColor2.set = true;
steps[0].fillMode = VectorRenderer::kFillGradient;
steps[0].drawingCall = &VectorRenderer::drawCallback_FILLSURFACE;
- steps[1].gradColor1.r = 206;
- steps[1].gradColor1.g = 121;
- steps[1].gradColor1.b = 99;
- steps[1].gradColor2.r = 173;
- steps[1].gradColor2.g = 40;
- steps[1].gradColor2.b = 8;
- steps[1].radius = 8; // radius
- steps[1].fillArea = true;
- steps[1].drawingCall = &VectorRenderer::drawCallback_ROUNDSQ;
- steps[1].scale = (1 << 16);
-
- steps[2].radius = 8; // radius
- steps[2].fillArea = false;
- steps[2].x.relative = true;
- steps[2].x.pos = 32;
- steps[2].y.relative = false;
- steps[2].y.pos = 32;
- steps[2].w = 128;
- steps[2].h = 32;
- steps[2].drawingCall = &VectorRenderer::drawCallback_ROUNDSQ;
- steps[2].scale = (1 << 16);
-
- steps[3].fgColor.r = 255;
- steps[3].fgColor.g = 255;
- steps[3].fgColor.b = 255;
- steps[3].drawingCall = &VectorRenderer::drawCallback_VOID;
-
- Common::Rect area = Common::Rect(32, 32, 256, 256);
-
bool running = true;
while (running) { // draw!!
_vectorRenderer->drawStep(Common::Rect(), steps[0]);
- _vectorRenderer->drawStep(Common::Rect(), steps[3]);
- _vectorRenderer->drawStep(area, steps[1]);
- _vectorRenderer->drawStep(area, steps[2]);
-// _vectorRenderer->drawStep(Common::Rect(32, 32, 256, 256), &steps[3]);
-
_vectorRenderer->copyFrame(_system);
Common::Event event;
diff --git a/gui/InterfaceManager.h b/gui/InterfaceManager.h
index 97af6732e0..906c5173e1 100644
--- a/gui/InterfaceManager.h
+++ b/gui/InterfaceManager.h
@@ -190,12 +190,13 @@ public:
return _initOk && _themeOk;
}
- bool loadTheme(Common::String &themeName);
+ bool loadTheme(Common::String themeName);
protected:
template void screenInit();
- bool loadThemeXML(Common::String &themeName);
+ bool loadThemeXML(Common::String themeName);
+ bool loadDefaultXML();
void freeRenderer() {
delete _vectorRenderer;
@@ -232,6 +233,8 @@ protected:
bool _initOk;
bool _themeOk;
bool _caching;
+
+ static const char *_defaultXML;
};
struct WidgetDrawData {
diff --git a/gui/ThemeDefaultXML.cpp b/gui/ThemeDefaultXML.cpp
new file mode 100644
index 0000000000..406e05badf
--- /dev/null
+++ b/gui/ThemeDefaultXML.cpp
@@ -0,0 +1,57 @@
+/* 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/system.h"
+#include "gui/InterfaceManager.h"
+
+namespace GUI {
+
+bool InterfaceManager::loadDefaultXML() {
+ const char *defaultXML =
+/**
+ * Default theme description file. Work in progress.
+ * Newlines are not necessary, parser ignores them.
+ * You may use single quotes (') instead of scaped double quotes.
+ * Remember to indent properly the XML so it's easier to read and
+ * to maintain!
+ */
+""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+ ""
+"";
+
+ if (!parser()->loadBuffer(defaultXML, true))
+ return false;
+
+ return parser()->parse();
+}
+
+}
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 6e60d8a499..5c0d1cbbdc 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -45,6 +45,7 @@ ThemeParser::ThemeParser() : XMLParser() {
_callbacks["palette"] = &ThemeParser::parserCallback_palette;
_callbacks["color"] = &ThemeParser::parserCallback_color;
_callbacks["render_info"] = &ThemeParser::parserCallback_renderInfo;
+ _callbacks["layout_info"] = &ThemeParser::parserCallback_layoutInfo;
_drawFunctions["circle"] = &Graphics::VectorRenderer::drawCallback_CIRCLE;
_drawFunctions["square"] = &Graphics::VectorRenderer::drawCallback_SQUARE;
@@ -97,6 +98,17 @@ bool ThemeParser::parserCallback_renderInfo() {
return true;
}
+bool ThemeParser::parserCallback_layoutInfo() {
+ ParserNode *layoutNode = getActiveNode();
+
+ assert(layoutNode->name == "layout_info");
+
+ if (getParentNode(layoutNode) != 0)
+ return parserError(" keys must be root elements.");
+
+ return true;
+}
+
bool ThemeParser::parserCallback_palette() {
ParserNode *paletteNode = getActiveNode();
diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index c012e4fb45..95d9135e12 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -323,6 +323,8 @@ protected:
bool parserCallback_palette();
bool parserCallback_color();
bool parserCallback_renderInfo();
+ bool parserCallback_layoutInfo();
+
bool validateKeyIntSigned(const char *key) {
if (!isdigit(*key) && *key != '+' && *key != '-')
diff --git a/gui/module.mk b/gui/module.mk
index eecf9a093d..81be839777 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -25,6 +25,7 @@ MODULE_OBJS := \
widget.o \
theme.o \
ThemeClassic.o \
+ ThemeDefaultXML.o \
ThemeModern.o \
ThemeParser.o \
theme-config.o
--
cgit v1.2.3