[Scummvm-cvs-logs] SF.net SVN: scummvm: [32901] scummvm/branches/gsoc2008-vkeybd/gui
sk4425 at users.sourceforge.net
sk4425 at users.sourceforge.net
Fri Jul 4 00:39:18 CEST 2008
Revision: 32901
http://scummvm.svn.sourceforge.net/scummvm/?rev=32901&view=rev
Author: sk4425
Date: 2008-07-03 15:39:18 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
VirtualKeyboardParser mostly completed - needs to be tested
Added Paths:
-----------
scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.cpp
scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.h
Removed Paths:
-------------
scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.cpp
scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.h
Deleted: scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.cpp 2008-07-03 22:38:19 UTC (rev 32900)
+++ scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.cpp 2008-07-03 22:39:18 UTC (rev 32901)
@@ -1,102 +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 "gui/virtualKeyboard.h"
-#include "gui/virtualKeyboardParser.h"
-#include "common/config-manager.h"
-#include "graphics/imageman.h"
-#include "common/unzip.h"
-
-namespace GUI {
-
-VirtualKeyboard::VirtualKeyboard() {
- assert(g_system);
- _system = g_system;
-
- _parser = new VirtualKeyboardParser(this);
-
-}
-
-VirtualKeyboard::~VirtualKeyboard() {
-
-}
-
-bool VirtualKeyboard::loadKeyboardPack(Common::String packName) {
- if (ConfMan.hasKey("extrapath"))
- Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
-
- if (Common::File::exists(packName + ".xml")) {
- // uncompressed keyboard pack
- if (!_parser->loadFile(packName + ".xml"))
- return false;
-
- } else if (Common::File::exists(packName + ".zip")) {
- // compressed keyboard pack
-#ifdef USE_ZLIB
- unzFile zipFile = unzOpen((packName + ".zip").c_str());
- if (zipFile && unzLocateFile(zipFile, (packName + ".xml").c_str(), 2) == UNZ_OK) {
- unz_file_info fileInfo;
- unzOpenCurrentFile(zipFile);
- unzGetCurrentFileInfo(zipFile, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
- byte *buffer = new byte[fileInfo.uncompressed_size+1];
- assert(buffer);
- memset(buffer, 0, (fileInfo.uncompressed_size+1)*sizeof(uint8));
- unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size);
- unzCloseCurrentFile(zipFile);
- if (!_parser->loadBuffer(buffer, true)) {
- unzClose(zipFile);
- return false;
- }
- } else {
- unzClose(zipFile);
- return false;
- }
- unzClose(zipFile);
-
- ImageMan.addArchive(packName + ".zip");
-#else
- return false;
-#endif
- } else {
- warning("Keyboard pack not found");
- return false;
- }
-
- return _parser->parse();
-}
-
-void VirtualKeyboard::show() {
-
-}
-
-void VirtualKeyboard::runLoop() {
-
-}
-
-void VirtualKeyboard::draw() {
-
-}
-
-} // end of namespace GUI
Deleted: scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.h 2008-07-03 22:38:19 UTC (rev 32900)
+++ scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.h 2008-07-03 22:39:18 UTC (rev 32901)
@@ -1,94 +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 GUI_VIRTUAL_KEYBOARD_H
-#define GUI_VIRTUAL_KEYBOARD_H
-
-class OSystem;
-
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-#include "common/imagemap.h"
-#include "common/singleton.h"
-#include "common/str.h"
-#include "graphics/surface.h"
-
-namespace GUI {
-
-class VirtualKeyboardParser;
-
-
-
-class VirtualKeyboard : public Common::Singleton<VirtualKeyboard> {
-private:
- /** Type of key event */
- enum EventType {
- kEventKey,
- kEventSwitchMode,
-
- kEventMax
- };
-
- struct Event {
- Common::String name;
- EventType type;
- void *data;
- };
-
- typedef Common::HashMap<Common::String, Event, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> EventMap;
-
- struct Mode {
- Common::String name;
- Common::String resolution;
- Common::String bitmapName;
- Graphics::Surface *image;
- Common::ImageMap imageMap;
- EventMap events;
- };
-
-public:
- VirtualKeyboard();
- virtual ~VirtualKeyboard();
-
- bool loadKeyboardPack(Common::String packName);
- void show();
-
-private:
- OSystem *_system;
-
- friend class VirtualKeyboardParser;
- VirtualKeyboardParser *_parser;
-
- void runLoop();
- void draw();
-
- Common::HashMap<Common::String, Mode, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _modes;
-};
-
-
-} // End of namespace GUI
-
-
-#endif
Copied: scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.cpp (from rev 32900, scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.cpp)
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.cpp (rev 0)
+++ scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.cpp 2008-07-03 22:39:18 UTC (rev 32901)
@@ -0,0 +1,102 @@
+/* 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 "gui/virtualKeyboard.h"
+#include "gui/virtualKeyboardParser.h"
+#include "common/config-manager.h"
+#include "graphics/imageman.h"
+#include "common/unzip.h"
+
+namespace GUI {
+
+VirtualKeyboard::VirtualKeyboard() {
+ assert(g_system);
+ _system = g_system;
+
+ _parser = new VirtualKeyboardParser(this);
+
+}
+
+VirtualKeyboard::~VirtualKeyboard() {
+
+}
+
+bool VirtualKeyboard::loadKeyboardPack(Common::String packName) {
+ if (ConfMan.hasKey("extrapath"))
+ Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
+
+ if (Common::File::exists(packName + ".xml")) {
+ // uncompressed keyboard pack
+ if (!_parser->loadFile(packName + ".xml"))
+ return false;
+
+ } else if (Common::File::exists(packName + ".zip")) {
+ // compressed keyboard pack
+#ifdef USE_ZLIB
+ unzFile zipFile = unzOpen((packName + ".zip").c_str());
+ if (zipFile && unzLocateFile(zipFile, (packName + ".xml").c_str(), 2) == UNZ_OK) {
+ unz_file_info fileInfo;
+ unzOpenCurrentFile(zipFile);
+ unzGetCurrentFileInfo(zipFile, &fileInfo, NULL, 0, NULL, 0, NULL, 0);
+ byte *buffer = new byte[fileInfo.uncompressed_size+1];
+ assert(buffer);
+ memset(buffer, 0, (fileInfo.uncompressed_size+1)*sizeof(uint8));
+ unzReadCurrentFile(zipFile, buffer, fileInfo.uncompressed_size);
+ unzCloseCurrentFile(zipFile);
+ if (!_parser->loadBuffer(buffer, true)) {
+ unzClose(zipFile);
+ return false;
+ }
+ } else {
+ unzClose(zipFile);
+ return false;
+ }
+ unzClose(zipFile);
+
+ ImageMan.addArchive(packName + ".zip");
+#else
+ return false;
+#endif
+ } else {
+ warning("Keyboard pack not found");
+ return false;
+ }
+
+ return _parser->parse();
+}
+
+void VirtualKeyboard::show() {
+
+}
+
+void VirtualKeyboard::runLoop() {
+
+}
+
+void VirtualKeyboard::draw() {
+
+}
+
+} // end of namespace GUI
Copied: scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.h (from rev 32900, scummvm/branches/gsoc2008-vkeybd/gui/Copy of virtualKeyboard.h)
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.h (rev 0)
+++ scummvm/branches/gsoc2008-vkeybd/gui/virtualKeyboard.h 2008-07-03 22:39:18 UTC (rev 32901)
@@ -0,0 +1,94 @@
+/* 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 GUI_VIRTUAL_KEYBOARD_H
+#define GUI_VIRTUAL_KEYBOARD_H
+
+class OSystem;
+
+#include "common/hashmap.h"
+#include "common/hash-str.h"
+#include "common/imagemap.h"
+#include "common/singleton.h"
+#include "common/str.h"
+#include "graphics/surface.h"
+
+namespace GUI {
+
+class VirtualKeyboardParser;
+
+
+
+class VirtualKeyboard : public Common::Singleton<VirtualKeyboard> {
+private:
+ /** Type of key event */
+ enum EventType {
+ kEventKey,
+ kEventSwitchMode,
+
+ kEventMax
+ };
+
+ struct Event {
+ Common::String name;
+ EventType type;
+ void *data;
+ };
+
+ typedef Common::HashMap<Common::String, Event, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> EventMap;
+
+ struct Mode {
+ Common::String name;
+ Common::String resolution;
+ Common::String bitmapName;
+ Graphics::Surface *image;
+ Common::ImageMap imageMap;
+ EventMap events;
+ };
+
+public:
+ VirtualKeyboard();
+ virtual ~VirtualKeyboard();
+
+ bool loadKeyboardPack(Common::String packName);
+ void show();
+
+private:
+ OSystem *_system;
+
+ friend class VirtualKeyboardParser;
+ VirtualKeyboardParser *_parser;
+
+ void runLoop();
+ void draw();
+
+ Common::HashMap<Common::String, Mode, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _modes;
+};
+
+
+} // End of namespace GUI
+
+
+#endif
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