diff options
| -rw-r--r-- | backends/keymapper/hardware-input.cpp | 188 | ||||
| -rw-r--r-- | backends/keymapper/hardware-input.h | 28 | ||||
| -rw-r--r-- | backends/keymapper/keymapper.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/maemo/maemo.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/sdl/hardwarekeys.cpp | 181 | ||||
| -rw-r--r-- | backends/platform/sdl/module.mk | 1 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.h | 3 |
7 files changed, 194 insertions, 213 deletions
diff --git a/backends/keymapper/hardware-input.cpp b/backends/keymapper/hardware-input.cpp index 801c77f4aa..a09f0b54fc 100644 --- a/backends/keymapper/hardware-input.cpp +++ b/backends/keymapper/hardware-input.cpp @@ -28,26 +28,181 @@ namespace Common { -HardwareInputSet::HardwareInputSet(const KeyTableEntry *keys, const ModifierTableEntry *modifiers) { - addHardwareInputs(keys, modifiers); +static const KeyTableEntry defaultKeys[] = { + {"BACKSPACE", KEYCODE_BACKSPACE, ASCII_BACKSPACE, "Backspace", false}, + {"TAB", KEYCODE_TAB, ASCII_TAB, "Tab", false}, + {"CLEAR", KEYCODE_CLEAR, 0, "Clear", false}, + {"RETURN", KEYCODE_RETURN, ASCII_RETURN, "Return", false}, + {"PAUSE", KEYCODE_PAUSE, 0, "Pause", false}, + {"ESCAPE", KEYCODE_ESCAPE, ASCII_ESCAPE, "Esc", false}, + {"SPACE", KEYCODE_SPACE, ASCII_SPACE, "Space", false}, + {"EXCLAIM", KEYCODE_EXCLAIM, '!', "!", false}, + {"QUOTEDBL", KEYCODE_QUOTEDBL, '"', "\"", false}, + {"HASH", KEYCODE_HASH, '#', "#", false}, + {"DOLLAR", KEYCODE_DOLLAR, '$', "$", false}, + {"AMPERSAND", KEYCODE_AMPERSAND, '&', "&", false}, + {"QUOTE", KEYCODE_QUOTE, '\'', "'", false}, + {"LEFTPAREN", KEYCODE_LEFTPAREN, '(', "(", false}, + {"RIGHTPAREN", KEYCODE_RIGHTPAREN, ')', ")", false}, + {"ASTERISK", KEYCODE_ASTERISK, '*', "*", false}, + {"PLUS", KEYCODE_PLUS, '+', "+", false}, + {"COMMA", KEYCODE_COMMA, ',', ",", false}, + {"MINUS", KEYCODE_MINUS, '-', "-", false}, + {"PERIOD", KEYCODE_PERIOD, '.', ".", false}, + {"SLASH", KEYCODE_SLASH, '/', "/", false}, + {"0", KEYCODE_0, '0', "0", false}, + {"1", KEYCODE_1, '1', "1", false}, + {"2", KEYCODE_2, '2', "2", false}, + {"3", KEYCODE_3, '3', "3", false}, + {"4", KEYCODE_4, '4', "4", false}, + {"5", KEYCODE_5, '5', "5", false}, + {"6", KEYCODE_6, '6', "6", false}, + {"7", KEYCODE_7, '7', "7", false}, + {"8", KEYCODE_8, '8', "8", false}, + {"9", KEYCODE_9, '9', "9", false}, + {"COLON", KEYCODE_COLON, ':', ":", false}, + {"SEMICOLON", KEYCODE_SEMICOLON, ';', ";", false}, + {"LESS", KEYCODE_LESS, '<', "<", false}, + {"EQUALS", KEYCODE_EQUALS, '=', "=", false}, + {"GREATER", KEYCODE_GREATER, '>', ">", false}, + {"QUESTION", KEYCODE_QUESTION, '?', "?", false}, + {"AT", KEYCODE_AT, '@', "@", false}, + + {"LEFTBRACKET", KEYCODE_LEFTBRACKET, '[', "[", false}, + {"BACKSLASH", KEYCODE_BACKSLASH, '\\', "\\", false}, + {"RIGHTBRACKET", KEYCODE_RIGHTBRACKET, ']', "]", false}, + {"CARET", KEYCODE_CARET, '^', "^", false}, + {"UNDERSCORE", KEYCODE_UNDERSCORE, '_', "_", false}, + {"BACKQUOTE", KEYCODE_BACKQUOTE, '`', "`", false}, + {"a", KEYCODE_a, 'a', "a", true}, + {"b", KEYCODE_b, 'b', "b", true}, + {"c", KEYCODE_c, 'c', "c", true}, + {"d", KEYCODE_d, 'd', "d", true}, + {"e", KEYCODE_e, 'e', "e", true}, + {"f", KEYCODE_f, 'f', "f", true}, + {"g", KEYCODE_g, 'g', "g", true}, + {"h", KEYCODE_h, 'h', "h", true}, + {"i", KEYCODE_i, 'i', "i", true}, + {"j", KEYCODE_j, 'j', "j", true}, + {"k", KEYCODE_k, 'k', "k", true}, + {"l", KEYCODE_l, 'l', "l", true}, + {"m", KEYCODE_m, 'm', "m", true}, + {"n", KEYCODE_n, 'n', "n", true}, + {"o", KEYCODE_o, 'o', "o", true}, + {"p", KEYCODE_p, 'p', "p", true}, + {"q", KEYCODE_q, 'q', "q", true}, + {"r", KEYCODE_r, 'r', "r", true}, + {"s", KEYCODE_s, 's', "s", true}, + {"t", KEYCODE_t, 't', "t", true}, + {"u", KEYCODE_u, 'u', "u", true}, + {"v", KEYCODE_v, 'v', "v", true}, + {"w", KEYCODE_w, 'w', "w", true}, + {"x", KEYCODE_x, 'x', "x", true}, + {"y", KEYCODE_y, 'y', "y", true}, + {"z", KEYCODE_z, 'z', "z", true}, + {"DELETE", KEYCODE_DELETE, 0, "Del", false}, + + // Numeric keypad + {"KP0", KEYCODE_KP0, 0, "KP0", false}, + {"KP1", KEYCODE_KP1, 0, "KP1", false}, + {"KP2", KEYCODE_KP2, 0, "KP2", false}, + {"KP3", KEYCODE_KP3, 0, "KP3", false}, + {"KP4", KEYCODE_KP4, 0, "KP4", false}, + {"KP5", KEYCODE_KP5, 0, "KP5", false}, + {"KP6", KEYCODE_KP6, 0, "KP6", false}, + {"KP7", KEYCODE_KP7, 0, "KP7", false}, + {"KP8", KEYCODE_KP8, 0, "KP8", false}, + {"KP9", KEYCODE_KP9, 0, "KP9", false}, + {"KP_PERIOD", KEYCODE_KP_PERIOD, 0, "KP.", false}, + {"KP_DIVIDE", KEYCODE_KP_DIVIDE, 0, "KP/", false}, + {"KP_MULTIPLY", KEYCODE_KP_MULTIPLY, 0, "KP*", false}, + {"KP_MINUS", KEYCODE_KP_MINUS, 0, "KP-", false}, + {"KP_PLUS", KEYCODE_KP_PLUS, 0, "KP+", false}, + {"KP_ENTER", KEYCODE_KP_ENTER, 0, "KP Enter", false}, + {"KP_EQUALS", KEYCODE_KP_EQUALS, 0, "KP=", false}, + + // Arrows + Home/End pad + {"UP", KEYCODE_UP, 0, "Up", false}, + {"DOWN", KEYCODE_DOWN, 0, "Down", false}, + {"RIGHT", KEYCODE_RIGHT, 0, "Right", false}, + {"LEFT", KEYCODE_LEFT, 0, "Left", false}, + {"INSERT", KEYCODE_INSERT, 0, "Insert", false}, + {"HOME", KEYCODE_HOME, 0, "Home", false}, + {"END", KEYCODE_END, 0, "End", false}, + {"PAGEUP", KEYCODE_PAGEUP, 0, "PgUp", false}, + {"PAGEDOWN", KEYCODE_PAGEDOWN, 0, "PgDn", false}, + + // Function keys + {"F1", KEYCODE_F1, ASCII_F1, "F1", false}, + {"F2", KEYCODE_F2, ASCII_F2, "F2", false}, + {"F3", KEYCODE_F3, ASCII_F3, "F3", false}, + {"F4", KEYCODE_F4, ASCII_F4, "F4", false}, + {"F5", KEYCODE_F5, ASCII_F5, "F5", false}, + {"F6", KEYCODE_F6, ASCII_F6, "F6", false}, + {"F7", KEYCODE_F7, ASCII_F7, "F7", false}, + {"F8", KEYCODE_F8, ASCII_F8, "F8", false}, + {"F9", KEYCODE_F9, ASCII_F9, "F9", false}, + {"F10", KEYCODE_F10, ASCII_F10, "F10", false}, + {"F11", KEYCODE_F11, ASCII_F11, "F11", false}, + {"F12", KEYCODE_F12, ASCII_F12, "F12", false}, + {"F13", KEYCODE_F13, 0, "F13", false}, + {"F14", KEYCODE_F14, 0, "F14", false}, + {"F15", KEYCODE_F15, 0, "F15", false}, + + // Miscellaneous function keys + {"HELP", KEYCODE_HELP, 0, "Help", false}, + {"PRINT", KEYCODE_PRINT, 0, "Print", false}, + {"SYSREQ", KEYCODE_SYSREQ, 0, "SysRq", false}, + {"BREAK", KEYCODE_BREAK, 0, "Break", false}, + {"MENU", KEYCODE_MENU, 0, "Menu", false}, + // Power Macintosh power key + {"POWER", KEYCODE_POWER, 0, "Power", false}, + // Some european keyboards + {"EURO", KEYCODE_EURO, 0, "Euro", false}, + // Atari keyboard has Undo + {"UNDO", KEYCODE_UNDO, 0, "Undo", false}, + {0, KEYCODE_INVALID, 0, 0, false} +}; + +static const ModifierTableEntry defaultModifiers[] = { + { 0, "", "", false }, + { KBD_CTRL, "C+", "Ctrl+", false }, + { KBD_ALT, "A+", "Alt+", false }, + { KBD_SHIFT, "", "", true }, + { KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", false }, + { KBD_SHIFT | KBD_CTRL, "S+C+", "Shift+Ctrl+", true }, + { KBD_SHIFT | KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", true }, + { 0, 0, 0, false } +}; + +HardwareInputSet::HardwareInputSet(bool useDefault, const KeyTableEntry *keys, const ModifierTableEntry *modifiers) { + if (useDefault) + addHardwareInputs(defaultKeys, defaultModifiers); + if (keys) + addHardwareInputs(keys, modifiers ? modifiers : defaultModifiers); } HardwareInputSet::~HardwareInputSet() { List<const HardwareInput *>::const_iterator it; - for (it = _inputs.begin(); it != _inputs.end(); it++) + for (it = _inputs.begin(); it != _inputs.end(); ++it) delete *it; } void HardwareInputSet::addHardwareInput(const HardwareInput *input) { - checkForInput(input); + assert(input); + + debug(8, "Adding hardware input [%s][%s]", input->id.c_str(), input->description.c_str()); + + removeHardwareInput(input); + _inputs.push_back(input); } const HardwareInput *HardwareInputSet::findHardwareInput(String id) const { List<const HardwareInput *>::const_iterator it; - for (it = _inputs.begin(); it != _inputs.end(); it++) { + for (it = _inputs.begin(); it != _inputs.end(); ++it) { if ((*it)->id == id) return (*it); } @@ -57,7 +212,7 @@ const HardwareInput *HardwareInputSet::findHardwareInput(String id) const { const HardwareInput *HardwareInputSet::findHardwareInput(const KeyState& keystate) const { List<const HardwareInput *>::const_iterator it; - for (it = _inputs.begin(); it != _inputs.end(); it++) { + for (it = _inputs.begin(); it != _inputs.end(); ++it) { if ((*it)->key == keystate) return (*it); } @@ -92,14 +247,23 @@ void HardwareInputSet::addHardwareInputs(const KeyTableEntry keys[], const Modif } } -void HardwareInputSet::checkForInput(const HardwareInput *input) { +void HardwareInputSet::addHardwareInputs(const KeyTableEntry keys[]) { + addHardwareInputs(keys, defaultModifiers); +} + +void HardwareInputSet::removeHardwareInput(const HardwareInput *input) { + if (!input) + return; + List<const HardwareInput *>::iterator it; - for (it = _inputs.begin(); it != _inputs.end(); it++) { - if ((*it)->id == input->id) - error("Error adding HardwareInput '%s' - id of %s already in use!", input->description.c_str(), input->id.c_str()); - else if ((*it)->key == input->key) - error("Error adding HardwareInput '%s' - key already in use!", input->description.c_str()); + for (it = _inputs.begin(); it != _inputs.end(); ++it) { + const HardwareInput *entry = (*it); + if (entry->id == input->id || entry->key == input->key) { + debug(7, "Removing hardware input [%s] (%s) because it matches [%s] (%s)", entry->id.c_str(), entry->description.c_str(), input->id.c_str(), input->description.c_str()); + delete entry; + _inputs.erase(it); + } } } diff --git a/backends/keymapper/hardware-input.h b/backends/keymapper/hardware-input.h index eb165e7b8b..9396765bbe 100644 --- a/backends/keymapper/hardware-input.h +++ b/backends/keymapper/hardware-input.h @@ -85,12 +85,11 @@ public: /** * Add hardware input keys to the set out of key and modifier tables. - * @param keys table of available keys - * @param modifiers table of available modifiers + * @param useDefault auto-add the built-in default inputs + * @param keys table of available keys + * @param modifiers table of available modifiers */ - HardwareInputSet(const KeyTableEntry keys[], const ModifierTableEntry modifiers[]); - - HardwareInputSet() { } + HardwareInputSet(bool useDefault = false, const KeyTableEntry keys[] = 0, const ModifierTableEntry modifiers[] = 0); virtual ~HardwareInputSet(); @@ -100,13 +99,9 @@ public: const HardwareInput *findHardwareInput(const KeyState& keystate) const; - const List<const HardwareInput *> &getHardwareInputs() const { - return _inputs; - } + const List<const HardwareInput *> &getHardwareInputs() const { return _inputs; } - uint size() const { - return _inputs.size(); - } + uint size() const { return _inputs.size(); } /** * Add hardware inputs to the set out of key and modifier tables. @@ -115,9 +110,16 @@ public: */ void addHardwareInputs(const KeyTableEntry keys[], const ModifierTableEntry modifiers[]); -private: + /** + * Add hardware inputs to the set out of a key table. + * The default modifiers are applied to the key entries + * @param keys table of available keys + */ + void addHardwareInputs(const KeyTableEntry keys[]); - void checkForInput(const HardwareInput *input); + void removeHardwareInput(const HardwareInput *input); + +private: List<const HardwareInput *> _inputs; }; diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 719902ef20..bda4cd47da 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -69,8 +69,8 @@ void Keymapper::registerHardwareInputSet(HardwareInputSet *inputs) { error("Hardware input set already registered"); if (!inputs) { - warning("No hardware input are supplied"); - return; + warning("No hardware input were defined, using defaults"); + inputs = new HardwareInputSet(true); } _hardwareInputs = inputs; diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index 5e8b6e16a7..d1cdbc96c0 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -183,7 +183,7 @@ void OSystem_SDL_Maemo::setupIcon() { #ifdef ENABLE_KEYMAPPER Common::HardwareInputSet *OSystem_SDL_Maemo::getHardwareInputSet() { - return new Common::HardwareInputSet(Common::maemoKeys, Common::maemoModifiers); + return new Common::HardwareInputSet(false, Common::maemoKeys, Common::maemoModifiers); } Common::Keymap *OSystem_SDL_Maemo::getGlobalKeymap() { diff --git a/backends/platform/sdl/hardwarekeys.cpp b/backends/platform/sdl/hardwarekeys.cpp deleted file mode 100644 index 0b73bfa467..0000000000 --- a/backends/platform/sdl/hardwarekeys.cpp +++ /dev/null @@ -1,181 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "backends/platform/sdl/sdl.h" -#include "backends/keymapper/keymapper.h" -#include "common/keyboard.h" - -#ifdef ENABLE_KEYMAPPER - -using namespace Common; - -static const KeyTableEntry sdlKeys[] = { - {"BACKSPACE", KEYCODE_BACKSPACE, ASCII_BACKSPACE, "Backspace", false}, - {"TAB", KEYCODE_TAB, ASCII_TAB, "Tab", false}, - {"CLEAR", KEYCODE_CLEAR, 0, "Clear", false}, - {"RETURN", KEYCODE_RETURN, ASCII_RETURN, "Return", false}, - {"PAUSE", KEYCODE_PAUSE, 0, "Pause", false}, - {"ESCAPE", KEYCODE_ESCAPE, ASCII_ESCAPE, "Esc", false}, - {"SPACE", KEYCODE_SPACE, ASCII_SPACE, "Space", false}, - {"EXCLAIM", KEYCODE_EXCLAIM, '!', "!", false}, - {"QUOTEDBL", KEYCODE_QUOTEDBL, '"', "\"", false}, - {"HASH", KEYCODE_HASH, '#', "#", false}, - {"DOLLAR", KEYCODE_DOLLAR, '$', "$", false}, - {"AMPERSAND", KEYCODE_AMPERSAND, '&', "&", false}, - {"QUOTE", KEYCODE_QUOTE, '\'', "'", false}, - {"LEFTPAREN", KEYCODE_LEFTPAREN, '(', "(", false}, - {"RIGHTPAREN", KEYCODE_RIGHTPAREN, ')', ")", false}, - {"ASTERISK", KEYCODE_ASTERISK, '*', "*", false}, - {"PLUS", KEYCODE_PLUS, '+', "+", false}, - {"COMMA", KEYCODE_COMMA, ',', ",", false}, - {"MINUS", KEYCODE_MINUS, '-', "-", false}, - {"PERIOD", KEYCODE_PERIOD, '.', ".", false}, - {"SLASH", KEYCODE_SLASH, '/', "/", false}, - {"0", KEYCODE_0, '0', "0", false}, - {"1", KEYCODE_1, '1', "1", false}, - {"2", KEYCODE_2, '2', "2", false}, - {"3", KEYCODE_3, '3', "3", false}, - {"4", KEYCODE_4, '4', "4", false}, - {"5", KEYCODE_5, '5', "5", false}, - {"6", KEYCODE_6, '6', "6", false}, - {"7", KEYCODE_7, '7', "7", false}, - {"8", KEYCODE_8, '8', "8", false}, - {"9", KEYCODE_9, '9', "9", false}, - {"COLON", KEYCODE_COLON, ':', ":", false}, - {"SEMICOLON", KEYCODE_SEMICOLON, ';', ";", false}, - {"LESS", KEYCODE_LESS, '<', "<", false}, - {"EQUALS", KEYCODE_EQUALS, '=', "=", false}, - {"GREATER", KEYCODE_GREATER, '>', ">", false}, - {"QUESTION", KEYCODE_QUESTION, '?', "?", false}, - {"AT", KEYCODE_AT, '@', "@", false}, - - {"LEFTBRACKET", KEYCODE_LEFTBRACKET, '[', "[", false}, - {"BACKSLASH", KEYCODE_BACKSLASH, '\\', "\\", false}, - {"RIGHTBRACKET", KEYCODE_RIGHTBRACKET, ']', "]", false}, - {"CARET", KEYCODE_CARET, '^', "^", false}, - {"UNDERSCORE", KEYCODE_UNDERSCORE, '_', "_", false}, - {"BACKQUOTE", KEYCODE_BACKQUOTE, '`', "`", false}, - {"a", KEYCODE_a, 'a', "a", true}, - {"b", KEYCODE_b, 'b', "b", true}, - {"c", KEYCODE_c, 'c', "c", true}, - {"d", KEYCODE_d, 'd', "d", true}, - {"e", KEYCODE_e, 'e', "e", true}, - {"f", KEYCODE_f, 'f', "f", true}, - {"g", KEYCODE_g, 'g', "g", true}, - {"h", KEYCODE_h, 'h', "h", true}, - {"i", KEYCODE_i, 'i', "i", true}, - {"j", KEYCODE_j, 'j', "j", true}, - {"k", KEYCODE_k, 'k', "k", true}, - {"l", KEYCODE_l, 'l', "l", true}, - {"m", KEYCODE_m, 'm', "m", true}, - {"n", KEYCODE_n, 'n', "n", true}, - {"o", KEYCODE_o, 'o', "o", true}, - {"p", KEYCODE_p, 'p', "p", true}, - {"q", KEYCODE_q, 'q', "q", true}, - {"r", KEYCODE_r, 'r', "r", true}, - {"s", KEYCODE_s, 's', "s", true}, - {"t", KEYCODE_t, 't', "t", true}, - {"u", KEYCODE_u, 'u', "u", true}, - {"v", KEYCODE_v, 'v', "v", true}, - {"w", KEYCODE_w, 'w', "w", true}, - {"x", KEYCODE_x, 'x', "x", true}, - {"y", KEYCODE_y, 'y', "y", true}, - {"z", KEYCODE_z, 'z', "z", true}, - {"DELETE", KEYCODE_DELETE, 0, "Del", false}, - - // Numeric keypad - {"KP0", KEYCODE_KP0, 0, "KP0", false}, - {"KP1", KEYCODE_KP1, 0, "KP1", false}, - {"KP2", KEYCODE_KP2, 0, "KP2", false}, - {"KP3", KEYCODE_KP3, 0, "KP3", false}, - {"KP4", KEYCODE_KP4, 0, "KP4", false}, - {"KP5", KEYCODE_KP5, 0, "KP5", false}, - {"KP6", KEYCODE_KP6, 0, "KP6", false}, - {"KP7", KEYCODE_KP7, 0, "KP7", false}, - {"KP8", KEYCODE_KP8, 0, "KP8", false}, - {"KP9", KEYCODE_KP9, 0, "KP9", false}, - {"KP_PERIOD", KEYCODE_KP_PERIOD, 0, "KP.", false}, - {"KP_DIVIDE", KEYCODE_KP_DIVIDE, 0, "KP/", false}, - {"KP_MULTIPLY", KEYCODE_KP_MULTIPLY, 0, "KP*", false}, - {"KP_MINUS", KEYCODE_KP_MINUS, 0, "KP-", false}, - {"KP_PLUS", KEYCODE_KP_PLUS, 0, "KP+", false}, - {"KP_ENTER", KEYCODE_KP_ENTER, 0, "KP Enter", false}, - {"KP_EQUALS", KEYCODE_KP_EQUALS, 0, "KP=", false}, - - // Arrows + Home/End pad - {"UP", KEYCODE_UP, 0, "Up", false}, - {"DOWN", KEYCODE_DOWN, 0, "Down", false}, - {"RIGHT", KEYCODE_RIGHT, 0, "Right", false}, - {"LEFT", KEYCODE_LEFT, 0, "Left", false}, - {"INSERT", KEYCODE_INSERT, 0, "Insert", false}, - {"HOME", KEYCODE_HOME, 0, "Home", false}, - {"END", KEYCODE_END, 0, "End", false}, - {"PAGEUP", KEYCODE_PAGEUP, 0, "PgUp", false}, - {"PAGEDOWN", KEYCODE_PAGEDOWN, 0, "PgDn", false}, - - // Function keys - {"F1", KEYCODE_F1, ASCII_F1, "F1", false}, - {"F2", KEYCODE_F2, ASCII_F2, "F2", false}, - {"F3", KEYCODE_F3, ASCII_F3, "F3", false}, - {"F4", KEYCODE_F4, ASCII_F4, "F4", false}, - {"F5", KEYCODE_F5, ASCII_F5, "F5", false}, - {"F6", KEYCODE_F6, ASCII_F6, "F6", false}, - {"F7", KEYCODE_F7, ASCII_F7, "F7", false}, - {"F8", KEYCODE_F8, ASCII_F8, "F8", false}, - {"F9", KEYCODE_F9, ASCII_F9, "F9", false}, - {"F10", KEYCODE_F10, ASCII_F10, "F10", false}, - {"F11", KEYCODE_F11, ASCII_F11, "F11", false}, - {"F12", KEYCODE_F12, ASCII_F12, "F12", false}, - {"F13", KEYCODE_F13, 0, "F13", false}, - {"F14", KEYCODE_F14, 0, "F14", false}, - {"F15", KEYCODE_F15, 0, "F15", false}, - - // Miscellaneous function keys - {"HELP", KEYCODE_HELP, 0, "Help", false}, - {"PRINT", KEYCODE_PRINT, 0, "Print", false}, - {"SYSREQ", KEYCODE_SYSREQ, 0, "SysRq", false}, - {"BREAK", KEYCODE_BREAK, 0, "Break", false}, - {"MENU", KEYCODE_MENU, 0, "Menu", false}, - // Power Macintosh power key - {"POWER", KEYCODE_POWER, 0, "Power", false}, - // Some european keyboards - {"EURO", KEYCODE_EURO, 0, "Euro", false}, - // Atari keyboard has Undo - {"UNDO", KEYCODE_UNDO, 0, "Undo", false}, - {0, KEYCODE_INVALID, 0, 0, false} -}; - -static const ModifierTableEntry sdlModifiers[] = { - { 0, "", "", false }, - { KBD_CTRL, "C+", "Ctrl+", false }, - { KBD_ALT, "A+", "Alt+", false }, - { KBD_SHIFT, "", "", true }, - { KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", false }, - { KBD_SHIFT | KBD_CTRL, "S+C+", "Shift+Ctrl+", true }, - { KBD_SHIFT | KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", true }, - { 0, 0, 0, false } -}; - -Common::HardwareInputSet *OSystem_SDL::getHardwareInputSet() { - return new HardwareInputSet(sdlKeys, sdlModifiers); -} -#endif diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk index f1afe37349..98a8265301 100644 --- a/backends/platform/sdl/module.mk +++ b/backends/platform/sdl/module.mk @@ -1,7 +1,6 @@ MODULE := backends/platform/sdl MODULE_OBJS := \ - hardwarekeys.o \ main.o \ sdl.o 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 @@ -58,9 +58,6 @@ public: virtual void engineInit(); virtual void engineDone(); #endif -#ifdef ENABLE_KEYMAPPER - virtual Common::HardwareInputSet *getHardwareInputSet(); -#endif virtual void quit(); virtual void fatalError(); |