- moved VirtualKeyboard files into backends/common directory

svn-id: r32941

7 files changed, 68 insertions, 22 deletions

diff --git a/gui/virtualKeyboard.cpp b/backends/common/virtualKeyboard.cpp
index c0e9c0fb47..9937127df4 100644
--- a/gui/virtualKeyboard.cpp
+++ b/backends/common/virtualKeyboard.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "gui/virtualKeyboard.h"
-#include "gui/virtualKeyboardParser.h"
+#include "backends/common/virtualKeyboard.h"
+#include "backends/common/virtualKeyboardParser.h"
 #include "common/config-manager.h"
 #include "common/events.h"
 #include "graphics/imageman.h"
@@ -37,6 +37,7 @@ VirtualKeyboard::VirtualKeyboard() : _currentMode(0), _keyDown(0) {
 	_system = g_system;
 
 	_parser = new VirtualKeyboardParser(this);
+	_loaded = _displaying = false;
 }
 
 VirtualKeyboard::~VirtualKeyboard() {
@@ -116,6 +117,7 @@ bool VirtualKeyboard::loadKeyboardPack(Common::String packName) {
 		}
 	}
 
+	_loaded = true;
 	return true;
 }
 
diff --git a/gui/virtualKeyboard.h b/backends/common/virtualKeyboard.h
index 2d4c32e420..b44d2cd459 100644
--- a/gui/virtualKeyboard.h
+++ b/backends/common/virtualKeyboard.h
@@ -95,6 +95,9 @@ public:
 	bool isDisplaying() { 
 		return _displaying;
 	}
+	bool isLoaded() {
+		return _loaded;
+	}
 
 	/**
 	  * Get the next virtual key event in the event queue.
@@ -118,6 +121,7 @@ private:
 	void runLoop();
 	void redraw();
 
+	bool _loaded;
 	bool _displaying;
 	bool _needRedraw;
 
diff --git a/gui/virtualKeyboardParser.cpp b/backends/common/virtualKeyboardParser.cpp
index 5d8a28e7e9..8475f3e4f6 100644
--- a/gui/virtualKeyboardParser.cpp
+++ b/backends/common/virtualKeyboardParser.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "gui/virtualKeyboardParser.h"
+#include "backends/common/virtualKeyboardParser.h"
 
 #include "common/keyboard.h"
 #include "graphics/imageman.h"
diff --git a/gui/virtualKeyboardParser.h b/backends/common/virtualKeyboardParser.h
index 6ac8e57612..4325d8af31 100644
--- a/gui/virtualKeyboardParser.h
+++ b/backends/common/virtualKeyboardParser.h
@@ -27,7 +27,7 @@
 #define GUI_VIRTUAL_KEYBOARD_PARSER
 
 #include "common/xmlparser.h"
-#include "gui/virtualKeyboard.h"
+#include "backends/common/virtualKeyboard.h"
 
 namespace GUI {
 
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 601e292ad0..a3630b1d73 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -193,7 +193,6 @@ DefaultEventManager::DefaultEventManager(OSystem *boss) :
 	}
 
 	_vk = new GUI::VirtualKeyboard();
-	_vk->loadKeyboardPack("test");
 }
 
 DefaultEventManager::~DefaultEventManager() {
@@ -396,6 +395,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
 				if (_vk->isDisplaying()) {
 					_vk->hide();
 				} else {
+					if (!_vk->isLoaded()) _vk->loadKeyboardPack("test");
 					bool isPaused = (g_engine) ? g_engine->isPaused() : true;
 					if (!isPaused) g_engine->pauseEngine(true);
 					_vk->show();
diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h
index db054b4d26..c52535adfc 100644
--- a/backends/events/default/default-events.h
+++ b/backends/events/default/default-events.h
@@ -28,7 +28,7 @@
 
 #include "common/events.h"
 #include "common/savefile.h"
-#include "gui/virtualKeyboard.h"
+#include "backends/common/virtualKeyboard.h"
 
 /*
 At some point we will remove pollEvent from OSystem and change
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index f288cf0583..27a45ccd76 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -1049,6 +1049,62 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="common"
+				>
+				<File
+					RelativePath="..\..\backends\common\virtualKeyboard.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\backends\common\virtualKeyboard.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\common\virtualKeyboardParser.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\backends\common\virtualKeyboardParser.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="gui"
@@ -1246,22 +1302,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gui\virtualKeyboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\virtualKeyboard.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\virtualKeyboardParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gui\virtualKeyboardParser.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gui\widget.cpp"
 				>
 			</File>