Revision: 35931
http://scummvm.svn.sourceforge.net/scummvm/?rev=35931&view=rev
Author: fingolfin
Date: 2009-01-20 00:03:35 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Some basic work on the vkeybd code
Modified Paths:
--------------
scummvm/trunk/backends/module.mk
scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard.h
Property Changed:
----------------
scummvm/trunk/backends/vkeybd/
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk 2009-01-19 23:57:49 UTC (rev 35930)
+++ scummvm/trunk/backends/module.mk 2009-01-20 00:03:35 UTC (rev 35931)
@@ -36,7 +36,12 @@
saves/compressed/compressed-saves.o \
saves/posix/posix-saves.o \
saves/psp/psp-saves.o \
- timer/default/default-timer.o
+ timer/default/default-timer.o \
+ vkeybd/image-map.o \
+ vkeybd/polygon.o \
+ vkeybd/virtual-keyboard.o \
+ vkeybd/virtual-keyboard-gui.o \
+ vkeybd/virtual-keyboard-parser.o
# Include common rules
include $(srcdir)/rules.mk
Property changes on: scummvm/trunk/backends/vkeybd
___________________________________________________________________
Added: svn:ignore
+ .deps
*.o
lib*.a
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp 2009-01-19 23:57:49 UTC (rev 35930)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp 2009-01-20 00:03:35 UTC (rev 35931)
@@ -28,7 +28,7 @@
#ifdef ENABLE_VKEYBD
#include "graphics/cursorman.h"
-#include "gui/newgui.h"
+#include "gui/GuiManager.h"
namespace Common {
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp 2009-01-19 23:57:49 UTC (rev 35930)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp 2009-01-20 00:03:35 UTC (rev 35931)
@@ -28,8 +28,8 @@
#ifdef ENABLE_VKEYBD
#include "common/keyboard.h"
-#include "graphics/imageman.h"
#include "common/util.h"
+#include "common/system.h"
namespace Common {
@@ -261,21 +261,26 @@
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
}
+ const Graphics::PixelFormat format = g_system->getOverlayFormat();
+ int r, g, b;
if (node->values.contains("transparent_color")) {
- int r, g, b;
if (!parseIntegerKey(node->values["transparent_color"].c_str(), 3, &r, &g, &b))
return parserError("Could not parse color value");
- _mode->transparentColor = g_system->RGBToColor(r, g, b);
- } else // default to purple
- _mode->transparentColor = g_system->RGBToColor(255, 0, 255);
+ } else {
+ // default to purple
+ r = 255;
+ g = 0;
+ b = 255;
+ }
+ _mode->transparentColor = Graphics::RGBToColor(r, g, b, format);
if (node->values.contains("display_font_color")) {
- int r, g, b;
if (!parseIntegerKey(node->values["display_font_color"].c_str(), 3, &r, &g, &b))
return parserError("Could not parse color value");
- _mode->displayFontColor = g_system->RGBToColor(r, g, b);
- } else
- _mode->displayFontColor = g_system->RGBToColor(0, 0, 0); // default to black
+ } else {
+ r = g = b = 0; // default to black
+ }
+ _mode->displayFontColor = Graphics::RGBToColor(r, g, b, format);
_layoutParsed = true;
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-01-19 23:57:49 UTC (rev 35930)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-01-20 00:03:35 UTC (rev 35931)
@@ -32,7 +32,6 @@
#include "backends/vkeybd/keycode-descriptions.h"
#include "common/config-manager.h"
#include "common/fs.h"
-#include "graphics/imageman.h"
#include "common/unzip.h"
#define KEY_START_CHAR ('[')
@@ -81,25 +80,25 @@
_kbdGUI->initSize(_system->getOverlayWidth(), _system->getOverlayHeight());
- FilesystemNode *vkDir = 0;
+ FSNode vkDir;
if (ConfMan.hasKey("vkeybdpath")) {
- vkDir = new FilesystemNode(ConfMan.get("vkeybdpath"));
+ vkDir = FSNode(ConfMan.get("vkeybdpath"));
} else if (ConfMan.hasKey("extrapath")) {
- vkDir = new FilesystemNode(ConfMan.get("extrapath"));
+ vkDir = FSNode(ConfMan.get("extrapath"));
} else { // use current directory
- vkDir = new FilesystemNode(".");
+ vkDir = FSNode(".");
}
- if (vkDir->getChild(packName + ".xml").exists()) {
+ if (vkDir.getChild(packName + ".xml").exists()) {
// uncompressed keyboard pack
- if (!_parser->loadFile(vkDir->getChild(packName + ".xml")))
+ if (!_parser->loadFile(vkDir.getChild(packName + ".xml")))
return false;
- } else if (vkDir->getChild(packName + ".zip").exists()) {
+ } else if (vkDir.getChild(packName + ".zip").exists()) {
// compressed keyboard pack
#ifdef USE_ZLIB
- ZipArchive arch(vkDir->getChild(packName + ".zip").getPath().c_str());
+ ZipArchive arch(vkDir.getChild(packName + ".zip").getPath().c_str());
if (arch.hasFile(packName + ".xml")) {
if (!_parser->loadStream(arch.openFile(packName + ".xml")))
return false;
@@ -107,7 +106,7 @@
warning("Could not find %s.xml file in %s.zip keyboard pack", packName.c_str(), packName.c_str());
return false;
}
- ImageMan.addArchive(vkDir->getChild(packName + ".zip").getPath().c_str());
+ ImageMan.addArchive(vkDir.getChild(packName + ".zip").getPath().c_str());
#else
return false;
#endif
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.h
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.h 2009-01-19 23:57:49 UTC (rev 35930)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.h 2009-01-20 00:03:35 UTC (rev 35931)
@@ -35,11 +35,14 @@
#include "common/events.h"
#include "common/hashmap.h"
#include "common/hash-str.h"
-#include "backends/vkeybd/image-map.h"
#include "common/keyboard.h"
#include "common/list.h"
#include "common/str.h"
+#include "backends/vkeybd/image-map.h"
+#include "graphics/surface.h"
+
+
namespace Common {
class VirtualKeyboardGUI;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.