From 82f5633bfbcc8058b7a5be4838cf8c08b2f72410 Mon Sep 17 00:00:00 2001
From: ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sat, 16 Aug 2008 23:49:17 +0000
Subject: [2034614] [2034537] Fixing numpad '5' and ctrl+numpad/arrow issues
 for (crazy) non-vi key users.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6829 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/cmd-keys.h | 11 +++++++++++
 crawl-ref/source/tilesdl.cc |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h
index b27c0b2a12..0a84333a4e 100644
--- a/crawl-ref/source/cmd-keys.h
+++ b/crawl-ref/source/cmd-keys.h
@@ -70,6 +70,7 @@
 {'X', CMD_DISPLAY_MAP},
 {'Z', CMD_ZAP_WAND},
 {'.', CMD_MOVE_NOWHERE},
+{CK_CLEAR, CMD_MOVE_NOWHERE},
 {'<', CMD_GO_UPSTAIRS},
 {'>', CMD_GO_DOWNSTAIRS},
 {'@', CMD_DISPLAY_CHARACTER_STATUS},
@@ -101,6 +102,8 @@
 {'0', CMD_REPEAT_CMD},
 {CK_INSERT, CMD_REPEAT_CMD},
 {'5', CMD_REST},
+{CK_SHIFT_CLEAR, CMD_REST},
+{CK_CTRL_CLEAR, CMD_REST},
 {CONTROL('B'), CMD_OPEN_DOOR_DOWN_LEFT},
 {CONTROL('H'), CMD_OPEN_DOOR_LEFT},
 {CONTROL('J'), CMD_OPEN_DOOR_DOWN},
@@ -109,6 +112,14 @@
 {CONTROL('N'), CMD_OPEN_DOOR_DOWN_RIGHT},
 {CONTROL('U'), CMD_OPEN_DOOR_UP_LEFT},
 {CONTROL('Y'), CMD_OPEN_DOOR_UP_RIGHT},
+{CK_CTRL_END, CMD_OPEN_DOOR_DOWN_LEFT},
+{CK_CTRL_LEFT, CMD_OPEN_DOOR_LEFT},
+{CK_CTRL_DOWN, CMD_OPEN_DOOR_DOWN},
+{CK_CTRL_UP, CMD_OPEN_DOOR_UP},
+{CK_CTRL_RIGHT, CMD_OPEN_DOOR_RIGHT},
+{CK_CTRL_PGDN, CMD_OPEN_DOOR_DOWN_RIGHT},
+{CK_CTRL_PGUP, CMD_OPEN_DOOR_UP_RIGHT},
+{CK_CTRL_HOME, CMD_OPEN_DOOR_UP_LEFT},
 {CONTROL('A'), CMD_TOGGLE_AUTOPICKUP},
 {CONTROL('C'), CMD_CLEAR_MAP},
 {CONTROL('E'), CMD_FORGET_STASH},
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 9a31fd29ba..1ad7036a98 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -361,8 +361,9 @@ static int _translate_keysym(SDL_keysym &keysym)
     case SDLK_DELETE:
         return CK_DELETE;
 
+    // Hack.  libw32c overloads clear with '5' too.
     case SDLK_KP5:
-        return '5';
+        return CK_CLEAR + offset;
 
     case SDLK_KP8:
     case SDLK_UP:
-- 
cgit v1.2.3-54-g00ecf