summaryrefslogtreecommitdiff
path: root/src/console_gui.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2013-03-17 13:05:45 +0000
committerfrosch <frosch@openttd.org>2013-03-17 13:05:45 +0000
commitc2c50b0c507d427caa32f71eda009bba95fac684 (patch)
treef21279587550f7711729c87c56ab67369e6c3799 /src/console_gui.cpp
parent1ddf5a0786a59431c3092673fd65a7a8aca755a3 (diff)
downloadopenttd-c2c50b0c507d427caa32f71eda009bba95fac684.tar.xz
(svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes.
Diffstat (limited to 'src/console_gui.cpp')
-rw-r--r--src/console_gui.cpp35
1 files changed, 1 insertions, 34 deletions
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index e97e458ff..ca0a01853 100644
--- a/src/console_gui.cpp
+++ b/src/console_gui.cpp
@@ -290,46 +290,13 @@ struct IConsoleWindow : Window
MarkWholeScreenDirty();
break;
-#ifdef WITH_COCOA
- case (WKC_META | 'V'):
-#endif
- case (WKC_CTRL | 'V'):
- if (_iconsole_cmdline.InsertClipboard()) {
- IConsoleResetHistoryPos();
- this->SetDirty();
- }
- break;
-
case (WKC_CTRL | 'L'):
IConsoleCmdExec("clear");
break;
-#ifdef WITH_COCOA
- case (WKC_META | 'U'):
-#endif
- case (WKC_CTRL | 'U'):
- _iconsole_cmdline.DeleteAll();
- this->SetDirty();
- break;
-
- case WKC_BACKSPACE: case WKC_DELETE:
- if (_iconsole_cmdline.DeleteChar(keycode)) {
- IConsoleResetHistoryPos();
- this->SetDirty();
- }
- break;
-
- case WKC_LEFT: case WKC_RIGHT: case WKC_END: case WKC_HOME:
- if (_iconsole_cmdline.MovePos(keycode)) {
- IConsoleResetHistoryPos();
- this->SetDirty();
- }
- break;
-
default:
- if (IsValidChar(key, CS_ALPHANUMERAL)) {
+ if (_iconsole_cmdline.HandleKeyPress(key, keycode) != HKPR_NOT_HANDLED) {
IConsoleWindow::scroll = 0;
- _iconsole_cmdline.InsertChar(key);
IConsoleResetHistoryPos();
this->SetDirty();
} else {