- adds the new gui renderer also a new implementation for the classic gui

 - adds a ImageMan and ImageDec class for loading and managing image files
 - adds a loader for zip files which is used by the new theme and the image manager
 - changes the widgets to use the new gui code
 - changes the scumm dialogs to use the new gui code
 - fixes a #include problem in the sky debugger with the new gui code

 To use the new gui copy gui/themes/default-theme.zip to your extrapath.
If the theme zip can not be found the gui will fallback to the classic theme.
If you want to change the gui styles use "gui_theme=classic" for the classic theme
and "gui_theme=default-theme" for the new theme.

Thanks to eriktorbjorn for testing and help with the new theme and to sev for
reviewing this patch.

svn-id: r20227

1 files changed, 146 insertions, 0 deletions

diff --git a/graphics/imageman.cpp b/graphics/imageman.cpp
new file mode 100644
index 0000000000..7e78b52279
--- /dev/null
+++ b/graphics/imageman.cpp
@@ -0,0 +1,146 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $Header $
+ */
+
+#include "graphics/imagedec.h"
+#include "graphics/imageman.h"
+#include "graphics/surface.h"
+
+DECLARE_SINGLETON(Graphics::ImageManager);
+
+namespace Graphics {
+ImageManager::ImageManager() : _surfaces()
+#ifdef USE_ZLIB
+, _archives()
+#endif
+{
+}
+
+ImageManager::~ImageManager() {
+	for (Iterator pos = _surfaces.begin(); pos != _surfaces.end(); ++pos) {
+		(*pos)->surface->free();
+		delete (*pos)->surface;
+		delete *pos;
+		*pos = 0;
+	}
+	_surfaces.clear();
+#ifdef USE_ZLIB
+	for (ZipIterator pos = _archives.begin(); pos != _archives.end(); ++pos) {
+		unzClose(*pos);
+	}
+	_archives.clear();
+#endif
+}
+
+bool ImageManager::addArchive(const Common::String &name) {
+#ifdef USE_ZLIB
+	unzFile newFile = unzOpen(name.c_str());
+	if (!newFile)
+		return false;
+	_archives.push_back(newFile);
+#endif
+	return true;
+}
+
+bool ImageManager::registerSurface(const Common::String &name, Surface *surf) {
+	if (getSurface(name)) {
+		return false;
+	}
+
+	Entry *newHandle = new Entry;
+	if (!newHandle)
+		return false;
+
+	if (!surf) {
+		surf = ImageDecoder::loadFile(name);
+		if (!surf) {
+#ifdef USE_ZLIB
+			ZipIterator file = _archives.end();
+			for (ZipIterator pos = _archives.begin(); pos != _archives.end(); ++pos) {
+				if (unzLocateFile(*pos, name.c_str(), 2) == UNZ_OK) {
+					file = pos;
+					break;
+				}
+			}
+
+			if (file == _archives.end())
+				return false;
+
+			unz_file_info fileInfo;
+			unzOpenCurrentFile(*file);
+			unzGetCurrentFileInfo(*file, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
+			uint8 *buffer = new uint8[fileInfo.uncompressed_size];
+			assert(buffer);
+			unzReadCurrentFile(*file, buffer, fileInfo.uncompressed_size);
+			unzCloseCurrentFile(*file);
+			Common::MemoryReadStream stream(buffer, fileInfo.uncompressed_size);
+			surf = ImageDecoder::loadFile(stream);
+			delete [] buffer;
+
+			if (!surf)
+				return false;
+#else
+			return false;
+#endif
+		}
+	}
+
+	newHandle->surface = surf;
+	newHandle->name = name;
+	_surfaces.push_back(newHandle);
+
+	return true;
+}
+
+bool ImageManager::unregisterSurface(const Common::String &name) {
+	Iterator pos = searchHandle(name);
+	if (pos == _surfaces.end()) {
+		// no surface handle it as success
+		return true;
+	}
+
+	(*pos)->surface->free();
+	delete (*pos)->surface;
+	delete *pos;
+	*pos = 0;
+
+	_surfaces.erase(pos);
+
+	return true;
+}
+
+Surface * ImageManager::getSurface(const Common::String &name) {
+	Iterator pos = searchHandle(name);
+	if (pos == _surfaces.end()) {
+		// no surface handle it as success
+		return 0;
+	}
+	return (*pos)->surface;
+}
+
+ImageManager::Iterator ImageManager::searchHandle(const Common::String &name) {
+	Iterator pos = _surfaces.begin();
+	while (pos != _surfaces.end()) {
+		if ((*pos)->name == name)
+			break;
+		++pos;
+	}
+	return pos;
+}
+} // end of namespace Graphics