[Scummvm-cvs-logs] SF.net SVN: scummvm:[34706] scummvm/branches/gsoc2008-vkeybd
kenny-d at users.sourceforge.net
kenny-d at users.sourceforge.net
Tue Sep 30 15:51:09 CEST 2008
Revision: 34706
http://scummvm.svn.sourceforge.net/scummvm/?rev=34706&view=rev
Author: kenny-d
Date: 2008-09-30 13:51:01 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
Added preprocessor flags 'ENABLE_VKEYBD' and 'ENABLE_KEYMAPPER' to control inclusion of vkeybd and keymapper in build.\n\nAlso added corresponding --enable-vkeybd and --enable-keymapper flags to configure scripts.
Modified Paths:
--------------
scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.cpp
scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.h
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.cpp
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.h
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/hardware-key.h
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.cpp
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.h
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.cpp
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.h
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.h
scummvm/branches/gsoc2008-vkeybd/backends/keymapper/types.h
scummvm/branches/gsoc2008-vkeybd/backends/platform/sdl/events.cpp
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.cpp
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.h
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/keycode-descriptions.h
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.cpp
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.h
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.cpp
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.h
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.h
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp
scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h
scummvm/branches/gsoc2008-vkeybd/common/events.h
scummvm/branches/gsoc2008-vkeybd/configure
scummvm/branches/gsoc2008-vkeybd/gui/newgui.cpp
Modified: scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -196,16 +196,22 @@
_hasPlaybackEvent = false;
}
+#ifdef ENABLE_VKEYBD
_vk = new Common::VirtualKeyboard();
+#endif
+#ifdef ENABLE_KEYMAPPER
_keymapper = new Common::Keymapper(this);
_remap = false;
-
- //init();
+#endif
}
DefaultEventManager::~DefaultEventManager() {
+#ifdef ENABLE_KEYMAPPER
delete _keymapper;
+#endif
+#ifdef ENABLE_VKEYBD
delete _vk;
+#endif
_boss->lockMutex(_timeMutex);
_boss->lockMutex(_recorderMutex);
_recordMode = kPassthrough;
@@ -265,11 +271,13 @@
}
void DefaultEventManager::init() {
+#ifdef ENABLE_VKEYBD
if (ConfMan.hasKey("vkeybd_pack_name")) {
_vk->loadKeyboardPack(ConfMan.get("vkeybd_pack_name"));
} else {
_vk->loadKeyboardPack("vkeybd");
}
+#endif
}
bool DefaultEventManager::playback(Common::Event &event) {
@@ -379,6 +387,7 @@
} else {
// poll for event from backend
result = _boss->pollEvent(event);
+#ifdef ENABLE_KEYMAPPER
if (result) {
// send key press events to keymapper
if (event.type == Common::EVENT_KEYDOWN) {
@@ -391,6 +400,7 @@
}
}
}
+#endif
}
if (_recordMode != kPassthrough) {
@@ -457,7 +467,9 @@
else if (_shouldRTL)
event.type = Common::EVENT_RTL;
}
- } else if (event.kbd.keycode == Common::KEYCODE_F7 && event.kbd.flags == 0) {
+ }
+#ifdef ENABLE_VKEYBD
+ else if (event.kbd.keycode == Common::KEYCODE_F7 && event.kbd.flags == 0) {
if (_vk->isDisplaying()) {
_vk->close(true);
} else {
@@ -467,7 +479,10 @@
if (!isPaused) g_engine->pauseEngine(false);
result = false;
}
- } else if (event.kbd.keycode == Common::KEYCODE_F8 && event.kbd.flags == 0) {
+ }
+#endif
+#ifdef ENABLE_KEYMAPPER
+ else if (event.kbd.keycode == Common::KEYCODE_F8 && event.kbd.flags == 0) {
if (!_remap) {
_remap = true;
Common::RemapDialog _remapDialog;
@@ -478,6 +493,7 @@
_remap = false;
}
}
+#endif
break;
case Common::EVENT_KEYUP:
Modified: scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/events/default/default-events.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -31,8 +31,12 @@
#include "common/savefile.h"
namespace Common {
+#ifdef ENABLE_KEYMAPPER
class Keymapper;
+#endif
+#ifdef ENABLE_VKEYBD
class VirtualKeyboard;
+#endif
}
/*
@@ -50,9 +54,14 @@
class DefaultEventManager : public Common::EventManager {
OSystem *_boss;
+#ifdef ENABLE_VKEYBD
Common::VirtualKeyboard *_vk;
+#endif
+
+#ifdef ENABLE_KEYMAPPER
Common::Keymapper *_keymapper;
bool _remap;
+#endif
Common::Queue<Common::Event> _artificialEventQueue;
@@ -132,7 +141,9 @@
virtual int shouldRTL() const { return _shouldRTL; }
virtual void resetRTL() { _shouldRTL = false; }
+#ifdef ENABLE_KEYMAPPER
virtual Common::Keymapper *getKeymapper() { return _keymapper; }
+#endif
};
#endif
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -24,6 +24,9 @@
*/
#include "backends/keymapper/action.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "backends/keymapper/keymap.h"
namespace Common {
@@ -51,3 +54,5 @@
}
} // end of namespace Common
+
+#endif // #ifdef ENABLE_KEYMAPPER
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/action.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,9 +23,13 @@
*
*/
-#ifndef COMMON_ACTION
-#define COMMON_ACTION
+#ifndef COMMON_ACTION_H
+#define COMMON_ACTION_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "backends/keymapper/types.h"
#include "common/events.h"
#include "common/func.h"
@@ -113,4 +117,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_KEYMAPPER
+
+#endif // #ifndef COMMON_ACTION_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/hardware-key.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/hardware-key.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/hardware-key.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,9 +23,13 @@
*
*/
-#ifndef COMMON_HARDWAREKEY
-#define COMMON_HARDWAREKEY
+#ifndef COMMON_HARDWARE_KEY_H
+#define COMMON_HARDWARE_KEY_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "backends/keymapper/types.h"
namespace Common {
@@ -125,4 +129,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_KEYMAPPER
+
+#endif // #ifndef COMMON_HARDWARE_KEY_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -24,6 +24,9 @@
*/
#include "backends/keymapper/keymap.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "backends/keymapper/hardware-key.h"
#define KEYMAP_KEY_PREFIX "keymap_"
@@ -297,3 +300,5 @@
}
} // end of namespace Common
+
+#endif // #ifdef ENABLE_KEYMAPPER
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymap.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,9 +23,13 @@
*
*/
-#ifndef COMMON_KEYMAP
-#define COMMON_KEYMAP
+#ifndef COMMON_KEYMAP_H
+#define COMMON_KEYMAP_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "common/config-manager.h"
#include "common/func.h"
#include "common/hashmap.h"
@@ -145,4 +149,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_KEYMAPPER
+
+#endif // #ifndef COMMON_KEYMAP_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -24,7 +24,11 @@
*/
#include "backends/keymapper/keymapper.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "common/config-manager.h"
+
namespace Common {
void Keymapper::Domain::addKeymap(Keymap *map) {
@@ -217,3 +221,5 @@
}
} // end of namespace Common
+
+#endif // #ifdef ENABLE_KEYMAPPER
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/keymapper.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,9 +23,13 @@
*
*/
-#ifndef COMMON_KEYMAPPER
-#define COMMON_KEYMAPPER
+#ifndef COMMON_KEYMAPPER_H
+#define COMMON_KEYMAPPER_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "common/events.h"
#include "common/list.h"
#include "common/hashmap.h"
@@ -201,4 +205,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_KEYMAPPER
+
+#endif // #ifndef COMMON_KEYMAPPER_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,6 +23,9 @@
*/
#include "backends/keymapper/remap-dialog.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "gui/eval.h"
#include "gui/newgui.h"
#include "gui/PopUpWidget.h"
@@ -327,3 +330,5 @@
} // end of namespace Common
+
+#endif // #ifdef ENABLE_KEYMAPPER
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -25,6 +25,10 @@
#ifndef REMAP_DIALOG_H
#define REMAP_DIALOG_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_KEYMAPPER
+
#include "backends/keymapper/keymapper.h"
#include "gui/dialog.h"
@@ -89,4 +93,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_KEYMAPPER
+
+#endif // #ifndef REMAP_DIALOG_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/types.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/types.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/types.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,9 +23,13 @@
*
*/
-#ifndef COMMON_TYPES
-#define COMMON_TYPES
+#ifndef COMMON_TYPES_H
+#define COMMON_TYPES_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_KEYMAPPER
+
namespace Common {
enum KeyType {
@@ -68,4 +72,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_KEYMAPPER
+
+#endif // #ifndef COMMON_TYPES_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/platform/sdl/events.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/platform/sdl/events.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/platform/sdl/events.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -524,6 +524,7 @@
}
void OSystem_SDL::setupKeymapper() {
+#ifdef ENABLE_KEYMAPPER
using namespace Common;
Keymapper *mapper = getEventManager()->getKeymapper();
@@ -578,5 +579,6 @@
mapper->addGlobalKeymap(guiMap);
mapper->pushKeymap("global");
+#endif
}
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -25,6 +25,8 @@
#include "backends/vkeybd/image-map.h"
+#ifdef ENABLE_VKEYBD
+
namespace Common {
ImageMap::~ImageMap() {
@@ -67,3 +69,5 @@
} // End of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/image-map.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -26,6 +26,10 @@
#ifndef COMMON_IMAGEMAP_H
#define COMMON_IMAGEMAP_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
#include "common/hashmap.h"
#include "common/hash-str.h"
#include "backends/vkeybd/polygon.h"
@@ -50,4 +54,6 @@
} // End of namespace Common
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_IMAGEMAP_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/keycode-descriptions.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/keycode-descriptions.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/keycode-descriptions.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -1,6 +1,8 @@
-#ifndef KEYCODE_DESCRIPTIONS
-#define KEYCODE_DESCRIPTIONS
+#ifndef KEYCODE_DESCRIPTIONS_H
+#define KEYCODE_DESCRIPTIONS_H
+#ifdef ENABLE_VKEYBD
+
static const char *keycodeDescTable[] = {
"",
"",
@@ -328,4 +330,6 @@
};
static const int keycodeDescTableSize = 322;
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef KEYCODE_DESCRIPTIONS_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -25,6 +25,8 @@
#include "backends/vkeybd/polygon.h"
+#ifdef ENABLE_VKEYBD
+
namespace Common {
bool Polygon::contains(int16 x, int16 y) const {
@@ -53,3 +55,5 @@
}
} // end of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/polygon.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -26,6 +26,10 @@
#ifndef COMMON_POLYGON_H
#define COMMON_POLYGON_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
#include "common/array.h"
#include "common/rect.h"
@@ -111,4 +115,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_POLYGON_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -24,6 +24,9 @@
*/
#include "backends/vkeybd/virtual-keyboard-gui.h"
+
+#ifdef ENABLE_VKEYBD
+
#include "graphics/cursorman.h"
#include "gui/newgui.h"
@@ -414,3 +417,5 @@
}
} // end of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-gui.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,9 +23,13 @@
*
*/
-#ifndef COMMON_VIRTUAL_KEYBOARD_GUI
-#define COMMON_VIRTUAL_KEYBOARD_GUI
+#ifndef COMMON_VIRTUAL_KEYBOARD_GUI_H
+#define COMMON_VIRTUAL_KEYBOARD_GUI_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
#include "backends/vkeybd/virtual-keyboard.h"
#include "common/rect.h"
#include "common/system.h"
@@ -150,4 +154,6 @@
} // end of namespace Common
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_VIRTUAL_KEYBOARD_GUI_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -25,6 +25,8 @@
#include "backends/vkeybd/virtual-keyboard-parser.h"
+#ifdef ENABLE_VKEYBD
+
#include "common/keyboard.h"
#include "graphics/imageman.h"
#include "common/util.h"
@@ -361,3 +363,5 @@
}
} // end of namespace GUI
+
+#endif // #ifdef ENABLE_VKEYBD
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -23,9 +23,13 @@
*
*/
-#ifndef COMMON_VIRTUAL_KEYBOARD_PARSER
-#define COMMON_VIRTUAL_KEYBOARD_PARSER
+#ifndef COMMON_VIRTUAL_KEYBOARD_PARSER_H
+#define COMMON_VIRTUAL_KEYBOARD_PARSER_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
#include "common/xmlparser.h"
#include "backends/vkeybd/virtual-keyboard.h"
@@ -264,4 +268,6 @@
} // end of namespace GUI
-#endif
+#endif // #ifdef ENABLE_VKEYBD
+
+#endif // #ifndef COMMON_VIRTUAL_KEYBOARD_PARSER_H
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -24,6 +24,9 @@
*/
#include "backends/vkeybd/virtual-keyboard.h"
+
+#ifdef ENABLE_VKEYBD
+
#include "backends/vkeybd/virtual-keyboard-gui.h"
#include "backends/vkeybd/virtual-keyboard-parser.h"
#include "backends/vkeybd/keycode-descriptions.h"
@@ -388,3 +391,6 @@
}
} // end of namespace Common
+
+#endif // #ifdef ENABLE_VKEYBD
+
Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -26,6 +26,10 @@
#ifndef COMMON_VIRTUAL_KEYBOARD_H
#define COMMON_VIRTUAL_KEYBOARD_H
+#include "common/scummsys.h"
+
+#ifdef ENABLE_VKEYBD
+
class OSystem;
#include "common/events.h"
@@ -246,8 +250,8 @@
};
-
} // End of namespace Common
+#endif // #ifdef ENABLE_VKEYBD
-#endif
+#endif // #ifndef COMMON_VIRTUAL_KEYBOARD_H
Modified: scummvm/branches/gsoc2008-vkeybd/common/events.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/common/events.h 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/common/events.h 2008-09-30 13:51:01 UTC (rev 34706)
@@ -200,8 +200,9 @@
// TODO: Consider removing OSystem::getScreenChangeID and
// replacing it by a generic getScreenChangeID method here
-
+#ifdef ENABLE_KEYMAPPER
virtual Common::Keymapper *getKeymapper() = 0;
+#endif
protected:
Modified: scummvm/branches/gsoc2008-vkeybd/configure
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/configure 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/configure 2008-09-30 13:51:01 UTC (rev 34706)
@@ -68,6 +68,9 @@
# default option behaviour yes/no
_build_hq_scalers=yes
_build_scalers=yes
+# default vkeybd/keymapper options
+_vkeybd=no
+_keymapper=no
# Add an engine: id name build subengines
add_engine() {
@@ -682,6 +685,10 @@
--default-dynamic) _plugins_default=dynamic ;;
--enable-mt32emu) _mt32emu=yes ;;
--disable-mt32emu) _mt32emu=no ;;
+ --enable-vkeybd) _vkeybd=yes ;;
+ --disable-vkeybd) _vkeybd=no ;;
+ --enable-keymapper) _keymapper=yes ;;
+ --disable-keymapper) _keymapper=no ;;
--with-fluidsynth-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
FLUIDSYNTH_CFLAGS="-I$arg/include"
@@ -1587,6 +1594,12 @@
add_to_config_mk_if_yes $_nasm 'HAVE_NASM = 1'
#
+# Enable vkeybd / keymapper
+#
+add_to_config_h_if_yes $_vkeybd '#define ENABLE_VKEYBD'
+add_to_config_h_if_yes $_keymapper '#define ENABLE_KEYMAPPER'
+
+#
# figure out installation directories
#
test -z "$_bindir" && _bindir="$_prefix/bin"
@@ -1689,10 +1702,19 @@
fi
if test "$_mt32emu" = yes ; then
- echo ", MT-32 emu"
+ echo_n ", MT-32 emu"
+fi
+
+if test "$_vkeybd" = yes ; then
+ echo_n ", virtual keyboard"
+fi
+
+if test "$_keymapper" = yes ; then
+ echo ", keymapper"
else
echo
fi
+
#
# Backend related stuff
#
Modified: scummvm/branches/gsoc2008-vkeybd/gui/newgui.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/gui/newgui.cpp 2008-09-30 13:19:14 UTC (rev 34705)
+++ scummvm/branches/gsoc2008-vkeybd/gui/newgui.cpp 2008-09-30 13:51:01 UTC (rev 34706)
@@ -237,7 +237,10 @@
}
Common::EventManager *eventMan = _system->getEventManager();
+
+#ifdef ENABLE_KEYMAPPER
eventMan->getKeymapper()->pushKeymap("gui");
+#endif
while (!_dialogStack.empty() && activeDialog == getTopDialog()) {
if (_needRedraw) {
redraw();
@@ -329,7 +332,9 @@
// Delay for a moment
_system->delayMillis(10);
}
+#ifdef ENABLE_KEYMAPPER
eventMan->getKeymapper()->popKeymap();
+#endif
// HACK: since we reopen all dialogs anyway on redraw
// we for now use Theme::closeAllDialogs here, until
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