From 52da780fbc10200b91d92e7cd04932b101c7539b Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Thu, 9 Feb 2012 01:26:11 -0600 Subject: KEYMAPPER: Refactor HardwareKeySet generation --- backends/platform/sdl/sdl.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'backends/platform/sdl/sdl.h') diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 22d79dbfe7..6c84c5c26a 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -30,6 +30,11 @@ #include "backends/events/sdl/sdl-events.h" #include "backends/log/log.h" +namespace Common { +struct KeyTableEntry; +struct ModifierTableEntry; +} + /** * Base OSystem class for all SDL ports. */ -- cgit v1.2.3 From d811240a9d38098f5b1f77b7d8dbef7a947f9a67 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 13 Feb 2012 01:20:02 +0100 Subject: ALL: Enable Keymapper specific OSystem API only when the Keymapper is enabled. --- backends/platform/sdl/sdl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'backends/platform/sdl/sdl.h') diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 6c84c5c26a..1b0204a6e1 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -63,7 +63,9 @@ public: virtual void engineInit(); virtual void engineDone(); #endif +#ifdef ENABLE_KEYMAPPER virtual Common::HardwareKeySet *getHardwareKeySet(); +#endif virtual void quit(); virtual void fatalError(); -- cgit v1.2.3 From 57e3388197ed42aa9a43a9ba4e9ffa4bd8a3ae58 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 13 Feb 2012 01:25:25 +0100 Subject: SDL: Get rid of unneeded forwards. --- backends/platform/sdl/sdl.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'backends/platform/sdl/sdl.h') diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 1b0204a6e1..64e63b40a6 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -30,11 +30,6 @@ #include "backends/events/sdl/sdl-events.h" #include "backends/log/log.h" -namespace Common { -struct KeyTableEntry; -struct ModifierTableEntry; -} - /** * Base OSystem class for all SDL ports. */ -- cgit v1.2.3 From 6afac4e01eba5c297e99597dd2cb17c2e4732a7e Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Fri, 24 Feb 2012 13:23:55 -0600 Subject: KEYMAPPER: Rename HardwareKey to HardwareInput --- backends/platform/sdl/sdl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/sdl/sdl.h') diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 64e63b40a6..51a7b2f577 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -59,7 +59,7 @@ public: virtual void engineDone(); #endif #ifdef ENABLE_KEYMAPPER - virtual Common::HardwareKeySet *getHardwareKeySet(); + virtual Common::HardwareInputSet *getHardwareInputSet(); #endif virtual void quit(); virtual void fatalError(); -- cgit v1.2.3 From 477c1b9a87046f17c165e66f566d91d0906a8fcd Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Tue, 28 Feb 2012 06:38:07 -0600 Subject: KEYMAPPER: HardwareInputSet now has defaults Ports can add additional special keys. SDL no longer carries the static tables. Default behavior unchanged: HardwareInputSet() still gives an empty one. --- backends/platform/sdl/sdl.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'backends/platform/sdl/sdl.h') diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 51a7b2f577..f05207b482 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -57,9 +57,6 @@ public: #if defined(USE_TASKBAR) virtual void engineInit(); virtual void engineDone(); -#endif -#ifdef ENABLE_KEYMAPPER - virtual Common::HardwareInputSet *getHardwareInputSet(); #endif virtual void quit(); virtual void fatalError(); -- cgit v1.2.3