From 45141700914c0f3713704f09ae8e22c4eb4fc476 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Sun, 5 May 2013 20:27:26 -0400
Subject: [PATCH] Fix for 0005634: allow and properly map numpad in macros

This is only a partial fix for two larger problems.  First, there are a number
of places where vi keys are assumed for translation.  A similar approach to
that used here could be used.  Second, non-movement commands still do not work
properly, including those used from autofight (evoke, fire).
---
 crawl-ref/source/cio.cc                 | 24 ++++++++++++++++--------
 crawl-ref/source/dat/clua/autofight.lua |  6 +++---
 crawl-ref/source/enum.h                 | 18 +++++++++---------
 crawl-ref/source/l_crawl.cc             |  3 ++-
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc
index 076c8ee..f66d030 100644
--- a/crawl-ref/source/cio.cc
+++ b/crawl-ref/source/cio.cc
@@ -70,17 +70,25 @@ int unmangle_direction_keys(int keyin, KeymapContext keymap,
     }
 
     // [dshaligram] More lovely keypad mangling.
+    int move_base;
+    switch (keymap)
+    {
+	case KMC_LEVELMAP: move_base = CMD_MAP_MOVE_LEFT - CMD_MOVE_LEFT; break;
+	case KMC_TARGETTING: move_base = CMD_TARGET_LEFT - CMD_MOVE_LEFT; break;
+	default: move_base = 0;
+    }
+
     switch (keyin)
     {
 #ifdef UNIX
-    case '1': return 'b';
-    case '2': return 'j';
-    case '3': return 'n';
-    case '4': return 'h';
-    case '6': return 'l';
-    case '7': return 'y';
-    case '8': return 'k';
-    case '9': return 'u';
+    case '1': return command_to_key((enum command_type)(move_base + CMD_MOVE_DOWN_LEFT));
+    case '2': return command_to_key((enum command_type)(move_base + CMD_MOVE_DOWN));
+    case '3': return command_to_key((enum command_type)(move_base + CMD_MOVE_DOWN_RIGHT));
+    case '4': return command_to_key((enum command_type)(move_base + CMD_MOVE_LEFT));
+    case '6': return command_to_key((enum command_type)(move_base + CMD_MOVE_RIGHT));
+    case '7': return command_to_key((enum command_type)(move_base + CMD_MOVE_UP_LEFT));
+    case '8': return command_to_key((enum command_type)(move_base + CMD_MOVE_UP));
+    case '9': return command_to_key((enum command_type)(move_base + CMD_MOVE_UP_RIGHT));
 
  #ifndef USE_TILE_LOCAL
     default: return unixcurses_get_vi_key(keyin);
diff --git a/crawl-ref/source/dat/clua/autofight.lua b/crawl-ref/source/dat/clua/autofight.lua
index de89d93..db55aa5 100644
--- a/crawl-ref/source/dat/clua/autofight.lua
+++ b/crawl-ref/source/dat/clua/autofight.lua
@@ -20,9 +20,9 @@ AUTOFIGHT_THROW_NOMOVE = true
 
 local function delta_to_vi(dx, dy)
   local d2v = {
-    [-1] = { [-1] = 'y', [0] = 'h', [1] = 'b'},
-    [0]  = { [-1] = 'k',            [1] = 'j'},
-    [1]  = { [-1] = 'u', [0] = 'l', [1] = 'n'},
+    [-1] = { [-1] = '7', [0] = '4', [1] = '1'},
+    [0]  = { [-1] = '8',            [1] = '2'},
+    [1]  = { [-1] = '9', [0] = '6', [1] = '3'},
   }
   return d2v[dx][dy]
 end
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index cc3773c..868b878 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -823,24 +823,24 @@ enum command_type
     CMD_MAX_OVERMAP = CMD_MAP_EXIT_MAP,
 
     // targetting commands
-    CMD_TARGET_DOWN_LEFT,
-    CMD_MIN_TARGET = CMD_TARGET_DOWN_LEFT,
-    CMD_TARGET_DOWN,
-    CMD_TARGET_DOWN_RIGHT,
     CMD_TARGET_LEFT,
+    CMD_MIN_TARGET = CMD_TARGET_LEFT,
+    CMD_TARGET_DOWN,
+    CMD_TARGET_UP,
     CMD_TARGET_RIGHT,
     CMD_TARGET_UP_LEFT,
-    CMD_TARGET_UP,
+    CMD_TARGET_DOWN_LEFT,
     CMD_TARGET_UP_RIGHT,
+    CMD_TARGET_DOWN_RIGHT,
 
-    CMD_TARGET_DIR_DOWN_LEFT,
-    CMD_TARGET_DIR_DOWN,
-    CMD_TARGET_DIR_DOWN_RIGHT,
     CMD_TARGET_DIR_LEFT,
+    CMD_TARGET_DIR_DOWN,
+    CMD_TARGET_DIR_UP,
     CMD_TARGET_DIR_RIGHT,
     CMD_TARGET_DIR_UP_LEFT,
-    CMD_TARGET_DIR_UP,
+    CMD_TARGET_DIR_DOWN_LEFT,
     CMD_TARGET_DIR_UP_RIGHT,
+    CMD_TARGET_DIR_DOWN_RIGHT,
 
     CMD_TARGET_DESCRIBE,
     CMD_TARGET_PREV_TARGET,
diff --git a/crawl-ref/source/l_crawl.cc b/crawl-ref/source/l_crawl.cc
index 75d2587..a3ec030 100644
--- a/crawl-ref/source/l_crawl.cc
+++ b/crawl-ref/source/l_crawl.cc
@@ -364,7 +364,8 @@ static int crawl_process_keys(lua_State *ls)
         return 0;
     }
 
-    command_type cmd = key_to_command(keys[0], KMC_DEFAULT);
+    int key = unmangle_direction_keys(keys[0], KMC_DEFAULT, false, false);
+    command_type cmd = key_to_command(key, KMC_DEFAULT);
 
     if (cmd == CMD_NO_CMD)
     {
-- 
1.8.1.4