From e8a4d396fe08cde375c9193a4dbb8847f663e774 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 22 Jun 2007 20:51:37 +0000 Subject: Get rid of FOTAQ's own KeyCode enum in favor of Common::KeyCode (attention: the F12 quickload hotkey used to be incorrectly mapped to F6, this change 'fixes' that) svn-id: r27623 --- engines/queen/input.cpp | 32 +++++++++++++++----------------- engines/queen/input.h | 29 +++-------------------------- 2 files changed, 18 insertions(+), 43 deletions(-) (limited to 'engines/queen') diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 5154b04dbe..7775988766 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -55,7 +55,7 @@ Input::Input(Common::Language language, OSystem *system) : _system(system), _eventMan(system->getEventManager()), _fastMode(false), _keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false), _cutawayQuit(false), _dialogueRunning(false), _talkQuit(false), - _quickSave(false), _quickLoad(false), _debugger(false), _inKey(0), + _quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INALID), _mouseButton(0), _idleTime(0) { switch (language) { @@ -135,34 +135,34 @@ void Input::delay(uint amount) { } while (_system->getMillis() < end); } -int Input::checkKeys() { +void Input::checkKeys() { if (_inKey) debug(6, "[Input::checkKeys] _inKey = %i", _inKey); switch (_inKey) { - case KEY_SPACE: + case Common::KEYCODE_SPACE: _keyVerb = VERB_SKIP_TEXT; break; - case KEY_COMMA: + case Common::KEYCODE_COMMA: _keyVerb = VERB_SCROLL_UP; break; - case KEY_DOT: + case Common::KEYCODE_PERIOD: _keyVerb = VERB_SCROLL_DOWN; break; - case KEY_DIGIT_1: + case Common::KEYCODE_1: _keyVerb = VERB_DIGIT_1; break; - case KEY_DIGIT_2: + case Common::KEYCODE_2: _keyVerb = VERB_DIGIT_2; break; - case KEY_DIGIT_3: + case Common::KEYCODE_3: _keyVerb = VERB_DIGIT_3; break; - case KEY_DIGIT_4: + case Common::KEYCODE_4: _keyVerb = VERB_DIGIT_4; break; - case KEY_ESCAPE: // skip cutaway / dialogue + case Common::KEYCODE_ESCAPE: // skip cutaway / dialogue if (_canQuit) { if (_cutawayRunning) { debug(6, "[Input::checkKeys] Setting _cutawayQuit to true"); @@ -172,8 +172,8 @@ int Input::checkKeys() { _talkQuit = true; } break; - case KEY_F1: // use Journal - case KEY_F5: + case Common::KEYCODE_F1: // use Journal + case Common::KEYCODE_F5: if (_cutawayRunning) { if (_canQuit) { _keyVerb = VERB_USE_JOURNAL; @@ -185,10 +185,10 @@ int Input::checkKeys() { _talkQuit = true; } break; - case KEY_F11: // quicksave + case Common::KEYCODE_F11: // quicksave _quickSave = true; break; - case KEY_F12: // quickload + case Common::KEYCODE_F12: // quickload _quickLoad = true; break; default: @@ -201,9 +201,7 @@ int Input::checkKeys() { break; } - int inKey = _inKey; - _inKey = 0; // reset - return inKey; + _inKey = Common::KEYCODE_INALID; // reset } Common::Point Input::getMousePos() const { diff --git a/engines/queen/input.h b/engines/queen/input.h index 9afb7472b1..86092aeed6 100644 --- a/engines/queen/input.h +++ b/engines/queen/input.h @@ -28,14 +28,11 @@ #include "common/util.h" #include "common/rect.h" +#include "common/events.h" #include "queen/defs.h" class OSystem; -namespace Common { - class EventManager; -} - namespace Queen { class Input { @@ -57,7 +54,7 @@ public: void delay(uint amount); //! convert input to verb - int checkKeys(); + void checkKeys(); //! use instead of KEYVERB=0 void clearKeyVerb() { _keyVerb = VERB_NONE; } @@ -97,26 +94,6 @@ public: private: - enum KeyCode { - KEY_SPACE = ' ', - KEY_COMMA = ',', - KEY_DOT = '.', - - KEY_DIGIT_1 = '1', - KEY_DIGIT_2 = '2', - KEY_DIGIT_3 = '3', - KEY_DIGIT_4 = '4', - - KEY_ESCAPE = 27, - KEY_RETURN = 13, - KEY_BACKSPACE = 8, - - KEY_F1 = 282, - KEY_F11 = KEY_F1 + 10, - KEY_F5 = KEY_F1 + 4, - KEY_F12 - }; - //! used to get keyboard and mouse events OSystem *_system; @@ -153,7 +130,7 @@ private: bool _debugger; //! set by delay(); - int _inKey; + Common::KeyCode _inKey; //! set by delay(); int _mouseButton; -- cgit v1.2.3 From 54d668ac13f57d8acf5d8e627a5daeaa8166ecb3 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 22 Jun 2007 21:10:57 +0000 Subject: Changed more code to use Common::KEYCODE_ enum svn-id: r27624 --- engines/queen/journal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/queen') diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index 3db7ce82f0..18674db4a3 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -515,7 +515,7 @@ void Journal::initTextField(const char *desc) { void Journal::updateTextField(uint16 ascii, int keycode) { bool dirty = false; switch (keycode) { - case 8: // backspace + case Common::KEYCODE_BACKSPACE: if (_textField.textCharsCount > 0) { --_textField.textCharsCount; _textField.text[_textField.textCharsCount] = '\0'; -- cgit v1.2.3 From 2fa0a5c457e0aea4edffb49aa80a04a59b6e9994 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 22 Jun 2007 21:16:07 +0000 Subject: Cleaning up after myself (I blame it on, err, uhh... the Vogons?) svn-id: r27625 --- engines/queen/input.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/queen') diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 7775988766..10a8664c0e 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -55,7 +55,7 @@ Input::Input(Common::Language language, OSystem *system) : _system(system), _eventMan(system->getEventManager()), _fastMode(false), _keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false), _cutawayQuit(false), _dialogueRunning(false), _talkQuit(false), - _quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INALID), + _quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID), _mouseButton(0), _idleTime(0) { switch (language) { @@ -201,7 +201,7 @@ void Input::checkKeys() { break; } - _inKey = Common::KEYCODE_INALID; // reset + _inKey = Common::KEYCODE_INVALID; // reset } Common::Point Input::getMousePos() const { -- cgit v1.2.3 From d21b8c43d05b99ac5ad6b340fabbe2a52b49e533 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 22 Jun 2007 21:38:34 +0000 Subject: Converted some more code to make use of Common::KEYCODE_ / Common::ASCII_ svn-id: r27628 --- engines/queen/journal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/queen') diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index 18674db4a3..c75b03a5c0 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -522,8 +522,8 @@ void Journal::updateTextField(uint16 ascii, int keycode) { dirty = true; } break; - case '\n': - case '\r': + case Common::KEYCODE_RETURN: + case Common::KEYCODE_KP_ENTER: if (_textField.text[0]) { closeTextField(); int currentSlot = _currentSavePage * 10 + _currentSaveSlot; -- cgit v1.2.3