diff options
author | Max Horn | 2007-03-17 19:02:05 +0000 |
---|---|---|
committer | Max Horn | 2007-03-17 19:02:05 +0000 |
commit | ed54ea9155961d8ca5d5fb3c7777fc57a29f2751 (patch) | |
tree | 467b926af11cd4129ba003d04ba01de044c7a6df /gui/console.cpp | |
parent | f272d1957084098c5b53975ad3501074f6971af8 (diff) | |
download | scummvm-rg350-ed54ea9155961d8ca5d5fb3c7777fc57a29f2751.tar.gz scummvm-rg350-ed54ea9155961d8ca5d5fb3c7777fc57a29f2751.tar.bz2 scummvm-rg350-ed54ea9155961d8ca5d5fb3c7777fc57a29f2751.zip |
Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
Diffstat (limited to 'gui/console.cpp')
-rw-r--r-- | gui/console.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gui/console.cpp b/gui/console.cpp index e990fac2af..494721e242 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -27,6 +27,7 @@ #include "engines/engine.h" #include "base/version.h" +#include "common/events.h" #include "common/system.h" #include "graphics/font.h" @@ -347,7 +348,7 @@ void ConsoleDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { drawLine(pos2line(_currentPos)); break; case 256 + 24: // pageup - if (modifiers == OSystem::KBD_SHIFT) { + if (modifiers == Common::KBD_SHIFT) { _scrollLine -= _linesPerPage - 1; if (_scrollLine < _firstLineInBuffer + _linesPerPage - 1) _scrollLine = _firstLineInBuffer + _linesPerPage - 1; @@ -356,7 +357,7 @@ void ConsoleDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { } break; case 256 + 25: // pagedown - if (modifiers == OSystem::KBD_SHIFT) { + if (modifiers == Common::KBD_SHIFT) { _scrollLine += _linesPerPage - 1; if (_scrollLine > _promptEndPos / kCharsPerLine) { _scrollLine = _promptEndPos / kCharsPerLine; @@ -368,7 +369,7 @@ void ConsoleDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { } break; case 256 + 22: // home - if (modifiers == OSystem::KBD_SHIFT) { + if (modifiers == Common::KBD_SHIFT) { _scrollLine = _firstLineInBuffer + _linesPerPage - 1; updateScrollBuffer(); } else { @@ -377,7 +378,7 @@ void ConsoleDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { draw(); break; case 256 + 23: // end - if (modifiers == OSystem::KBD_SHIFT) { + if (modifiers == Common::KBD_SHIFT) { _scrollLine = _promptEndPos / kCharsPerLine; if (_scrollLine < _linesPerPage - 1) _scrollLine = _linesPerPage - 1; @@ -406,7 +407,7 @@ void ConsoleDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { default: if (ascii == '~' || ascii == '#') { slideUpAndClose(); - } else if (modifiers == OSystem::KBD_CTRL) { + } else if (modifiers == Common::KBD_CTRL) { specialKeys(keycode); } else if ((ascii >= 32 && ascii <= 127) || (ascii >= 160 && ascii <= 255)) { for (i = _promptEndPos - 1; i >= _currentPos; i--) |