libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Moved VK code into backends/vkeybd

Browse Source 
* Moved Keymapper code into backends/keymapper

svn-id: r33681
This commit is contained in:
Stephen Kennedy 2008-08-07 16:38:39 +00:00
parent 66e4e3ec1a
commit 2645ca48ad
25 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.common
View File

@ -28,11 +28,11 @@ MODULES += \
common \ common \
engines \ engines \
backends \ backends \
common \ graphics \
graphics # HACK/FIXME: this extra 'common' was added because of a circular dependency between common # HACK/FIXME: the extra 'common' and 'graphics' were added because of circular
# backends and common (the newly added Virtual Keyboard stuff depends on things # dependencies (the newly added Virtual Keyboard stuff depends on things from
# from common). This should be resolved in one way or another, perhaps by moving # common and graphics). This should be resolved in one way or another, perhaps
# the VK code out of backends? # by moving the VK code out of backends?
ifdef USE_MT32EMU ifdef USE_MT32EMU
MODULES += sound/softsynth/mt32 MODULES += sound/softsynth/mt32

4
backends/events/default/default-events.cpp
View File

@ -28,8 +28,8 @@
#include "common/system.h" #include "common/system.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "backends/events/default/default-events.h" #include "backends/events/default/default-events.h"
#include "backends/common/keymapper.h" #include "backends/keymapper/keymapper.h"
#include "backends/common/virtual-keyboard.h" #include "backends/vkeybd/virtual-keyboard.h"
#include "engines/engine.h" #include "engines/engine.h"
#include "gui/message.h" #include "gui/message.h"

4
backends/common/action.cpp → backends/keymapper/action.cpp
View File

@ -23,8 +23,8 @@
* *
*/ */
#include "backends/common/action.h" #include "backends/keymapper/action.h"
#include "backends/common/keymap.h" #include "backends/keymapper/keymap.h"
namespace Common { namespace Common {

0
backends/common/action.h → backends/keymapper/action.h
View File

2
backends/common/hardware-key.h → backends/keymapper/hardware-key.h
View File

@ -26,7 +26,7 @@
#ifndef COMMON_HARDWAREKEY #ifndef COMMON_HARDWAREKEY
#define COMMON_HARDWAREKEY #define COMMON_HARDWAREKEY
#include "backends/common/action.h" #include "backends/keymapper/action.h"
namespace Common { namespace Common {

2
backends/common/keymap-manager.cpp → backends/keymapper/keymap-manager.cpp
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "backends/common/keymap-manager.h" #include "backends/keymapper/keymap-manager.h"
#include "common/algorithm.h" #include "common/algorithm.h"
namespace Common { namespace Common {

4
backends/common/keymap-manager.h → backends/keymapper/keymap-manager.h
View File

@ -26,8 +26,8 @@
#ifndef COMMON_KEYMAP_MANAGER #ifndef COMMON_KEYMAP_MANAGER
#define COMMON_KEYMAP_MANAGER #define COMMON_KEYMAP_MANAGER
#include "backends/common/hardware-key.h" #include "backends/keymapper/hardware-key.h"
#include "backends/common/keymap.h" #include "backends/keymapper/keymap.h"
#include "common/hash-str.h" #include "common/hash-str.h"
#include "common/hashmap.h" #include "common/hashmap.h"

4
backends/common/keymap.cpp → backends/keymapper/keymap.cpp
View File

@ -23,8 +23,8 @@
* *
*/ */
#include "backends/common/keymap.h" #include "backends/keymapper/keymap.h"
#include "backends/common/hardware-key.h" #include "backends/keymapper/hardware-key.h"
namespace Common { namespace Common {

2
backends/common/keymap.h → backends/keymapper/keymap.h
View File

@ -31,7 +31,7 @@
#include "common/hashmap.h" #include "common/hashmap.h"
#include "common/keyboard.h" #include "common/keyboard.h"
#include "common/list.h" #include "common/list.h"
#include "backends/common/action.h" #include "backends/keymapper/action.h"
namespace Common { namespace Common {

2
backends/common/keymapper.cpp → backends/keymapper/keymapper.cpp
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "backends/common/keymapper.h" #include "backends/keymapper/keymapper.h"
#include "common/config-manager.h" #include "common/config-manager.h"
namespace Common { namespace Common {

6
backends/common/keymapper.h → backends/keymapper/keymapper.h
View File

@ -29,9 +29,9 @@
#include "common/events.h" #include "common/events.h"
#include "common/list.h" #include "common/list.h"
#include "common/stack.h" #include "common/stack.h"
#include "backends/common/hardware-key.h" #include "backends/keymapper/hardware-key.h"
#include "backends/common/keymap.h" #include "backends/keymapper/keymap.h"
#include "backends/common/keymap-manager.h" #include "backends/keymapper/keymap-manager.h"
namespace Common { namespace Common {

16
backends/module.mk
View File

@ -28,13 +28,15 @@ MODULE_OBJS := \
saves/default/default-saves.o \ saves/default/default-saves.o \
saves/compressed/compressed-saves.o \ saves/compressed/compressed-saves.o \
timer/default/default-timer.o \ timer/default/default-timer.o \
common/virtual-keyboard.o \ keymapper/action.o \
common/virtual-keyboard-gui.o \ keymapper/keymap.o \
common/virtual-keyboard-parser.o \ keymapper/keymap-manager.o \
common/keymap.o \ keymapper/keymapper.o \
common/keymap-manager.o \ vkeybd/image-map.o \
common/keymapper.o \ vkeybd/polygon.o \
common/action.o \ vkeybd/virtual-keyboard.o \
vkeybd/virtual-keyboard-gui.o \
vkeybd/virtual-keyboard-parser.o
# Include common rules # Include common rules
include $(srcdir)/rules.mk include $(srcdir)/rules.mk

2
backends/platform/sdl/events.cpp
View File

@ -24,7 +24,7 @@
*/ */
#include "backends/platform/sdl/sdl.h" #include "backends/platform/sdl/sdl.h"
#include "backends/common/keymapper.h" #include "backends/keymapper/keymapper.h"
#include "common/util.h" #include "common/util.h"
#include "common/events.h" #include "common/events.h"

2
common/image-map.cpp → backends/vkeybd/image-map.cpp
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "common/image-map.h" #include "backends/vkeybd/image-map.h"
namespace Common { namespace Common {

2
common/image-map.h → backends/vkeybd/image-map.h
View File

@ -28,7 +28,7 @@
#include "common/hashmap.h" #include "common/hashmap.h"
#include "common/hash-str.h" #include "common/hash-str.h"
#include "common/polygon.h" #include "backends/vkeybd/polygon.h"
namespace Common { namespace Common {

2
common/polygon.cpp → backends/vkeybd/polygon.cpp
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "common/polygon.h" #include "backends/vkeybd/polygon.h"
namespace Common { namespace Common {

0
common/polygon.h → backends/vkeybd/polygon.h
View File

6
backends/common/virtual-keyboard-gui.cpp → backends/vkeybd/virtual-keyboard-gui.cpp
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "backends/common/virtual-keyboard-gui.h" #include "backends/vkeybd/virtual-keyboard-gui.h"
#include "graphics/cursorman.h" #include "graphics/cursorman.h"
#include "gui/newgui.h" #include "gui/newgui.h"
@ -39,11 +39,9 @@ VirtualKeyboardGUI::VirtualKeyboardGUI(VirtualKeyboard *kbd) {
memset(_cursor, 0xFF, sizeof(_cursor)); memset(_cursor, 0xFF, sizeof(_cursor));
_displaying = _needRedraw = _drag = false; _displaying = _needRedraw = _drag = _drawCaret = _displayEnabled = false;
_firstRun = true; _firstRun = true;
_displayEnabled = false;
_cursorAnimateTimer = 0; _cursorAnimateTimer = 0;
} }

2
backends/common/virtual-keyboard-gui.h → backends/vkeybd/virtual-keyboard-gui.h
View File

@ -26,7 +26,7 @@
#ifndef COMMON_VIRTUAL_KEYBOARD_GUI #ifndef COMMON_VIRTUAL_KEYBOARD_GUI
#define COMMON_VIRTUAL_KEYBOARD_GUI #define COMMON_VIRTUAL_KEYBOARD_GUI
#include "backends/common/virtual-keyboard.h" #include "backends/vkeybd/virtual-keyboard.h"
#include "common/rect.h" #include "common/rect.h"
#include "common/system.h" #include "common/system.h"
#include "graphics/fontman.h" #include "graphics/fontman.h"

2
backends/common/virtual-keyboard-parser.cpp → backends/vkeybd/virtual-keyboard-parser.cpp
View File

@ -23,7 +23,7 @@
* *
*/ */
#include "backends/common/virtual-keyboard-parser.h" #include "backends/vkeybd/virtual-keyboard-parser.h"
#include "common/keyboard.h" #include "common/keyboard.h"
#include "graphics/imageman.h" #include "graphics/imageman.h"

2
backends/common/virtual-keyboard-parser.h → backends/vkeybd/virtual-keyboard-parser.h
View File

@ -27,7 +27,7 @@
#define COMMON_VIRTUAL_KEYBOARD_PARSER #define COMMON_VIRTUAL_KEYBOARD_PARSER
#include "common/xmlparser.h" #include "common/xmlparser.h"
#include "backends/common/virtual-keyboard.h" #include "backends/vkeybd/virtual-keyboard.h"
/** /**
TODO - information about optional attributes and their default values TODO - information about optional attributes and their default values

6
backends/common/virtual-keyboard.cpp → backends/vkeybd/virtual-keyboard.cpp
View File

@ -23,9 +23,9 @@
* *
*/ */
#include "backends/common/virtual-keyboard.h" #include "backends/vkeybd/virtual-keyboard.h"
#include "backends/common/virtual-keyboard-gui.h" #include "backends/vkeybd/virtual-keyboard-gui.h"
#include "backends/common/virtual-keyboard-parser.h" #include "backends/vkeybd/virtual-keyboard-parser.h"
#include "graphics/imageman.h" #include "graphics/imageman.h"
namespace Common { namespace Common {

2
backends/common/virtual-keyboard.h → backends/vkeybd/virtual-keyboard.h
View File

@ -31,7 +31,7 @@ class OSystem;
#include "common/events.h" #include "common/events.h"
#include "common/hashmap.h" #include "common/hashmap.h"
#include "common/hash-str.h" #include "common/hash-str.h"
#include "common/image-map.h" #include "backends/vkeybd/image-map.h"
#include "common/keyboard.h" #include "common/keyboard.h"
#include "common/list.h" #include "common/list.h"
#include "common/str.h" #include "common/str.h"

2
common/module.mk
View File

@ -6,12 +6,10 @@ MODULE_OBJS := \
config-manager.o \ config-manager.o \
file.o \ file.o \
fs.o \ fs.o \
image-map.o \
hashmap.o \ hashmap.o \
memorypool.o \ memorypool.o \
md5.o \ md5.o \
mutex.o \ mutex.o \
polygon.o \
str.o \ str.o \
stream.o \ stream.o \
util.o \ util.o \

68
dists/msvc8/scummvm.vcproj
View File

@ -334,14 +334,6 @@
RelativePath="..\..\common\iff_container.h" RelativePath="..\..\common\iff_container.h"
> >
</File> </File>
<File
RelativePath="..\..\common\image-map.cpp"
>
</File>
<File
RelativePath="..\..\common\image-map.h"
>
</File>
<File <File
RelativePath="..\..\common\keyboard.h" RelativePath="..\..\common\keyboard.h"
> >
@ -386,14 +378,6 @@
RelativePath="..\..\common\pack-start.h" RelativePath="..\..\common\pack-start.h"
> >
</File> </File>
<File
RelativePath="..\..\common\polygon.cpp"
>
</File>
<File
RelativePath="..\..\common\polygon.h"
>
</File>
<File <File
RelativePath="..\..\common\ptr.h" RelativePath="..\..\common\ptr.h"
> >
@ -1050,66 +1034,86 @@
</Filter> </Filter>
</Filter> </Filter>
<Filter <Filter
Name="common" Name="vkeybd"
> >
<File <File
RelativePath="..\..\backends\common\action.cpp" RelativePath="..\..\backends\vkeybd\image-map.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\action.h" RelativePath="..\..\backends\vkeybd\image-map.h"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\hardware-key.h" RelativePath="..\..\backends\vkeybd\polygon.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\keymap-manager.cpp" RelativePath="..\..\backends\vkeybd\polygon.h"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\keymap-manager.h" RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\keymap.cpp" RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\keymap.h" RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\keymapper.cpp" RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\keymapper.h" RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\virtual-keyboard-gui.cpp" RelativePath="..\..\backends\vkeybd\virtual-keyboard.h"
>
</File>
</Filter>
<Filter
Name="keymapper"
>
<File
RelativePath="..\..\backends\keymapper\action.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\virtual-keyboard-gui.h" RelativePath="..\..\backends\keymapper\action.h"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\virtual-keyboard-parser.cpp" RelativePath="..\..\backends\keymapper\hardware-key.h"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\virtual-keyboard-parser.h" RelativePath="..\..\backends\keymapper\keymap-manager.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\virtual-keyboard.cpp" RelativePath="..\..\backends\keymapper\keymap-manager.h"
> >
</File> </File>
<File <File
RelativePath="..\..\backends\common\virtual-keyboard.h" RelativePath="..\..\backends\keymapper\keymap.cpp"
>
</File>
<File
RelativePath="..\..\backends\keymapper\keymap.h"
>
</File>
<File
RelativePath="..\..\backends\keymapper\keymapper.cpp"
>
</File>
<File
RelativePath="..\..\backends\keymapper\keymapper.h"
> >
</File> </File>
</Filter> </Filter>