fiddlerwoaroof/crawl - Change NS3KXJXQSN33UQSOBDK3WXXKA3KY5YOUJL67NBZKGQAJYDYZ2COQC

Do "keypress -> command_type" via keybindings. Solves bug 2018200,

where you couldn't do macros with the old 3.4 keymap since the 3.4 keys were done via macros and macros can't recursively invoke macros. Has the little snag that it doesn't exactly reproduce the 3.4 "fire ammo" command since 3.4 automatically goes to the inventory list but 4.0 doesn't.

TODO:

Get levelmap commands to use keybindings instead of hardcoded mappings.
Let function keys and alt keys be bound to commands.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6587 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on July 17, 2008

NS3KXJXQSN33UQSOBDK3WXXKA3KY5YOUJL67NBZKGQAJYDYZ2COQC

Dependencies

In channels

main

Change contents

File addition: cmd-name.pl (---x------)

[7.75590]

#!/usr/bin/perl -w
use strict;
my ($infile, $outfile);
if (-e "enum.h")
{
    $infile = "enum.h";
    $outfile = "cmd-name.h";
}
elsif (-e "../enum.h")
{
    $infile = "../enum.h";
    $outfile = "../cmd-name.h";
}
else {
    die "Can't find 'enum.h'";
}
unless (open(INFILE, "<$infile")) {
    die "Couldn't open '$infile' for reading: $!\n";
}
unless (open(OUTFILE, ">$outfile")) {
    die "Couldn't open '$outfile' for writing: $!\n";
}
# All set, now get to first command
while (<INFILE>) {
    last if (/^ *CMD_NO_CMD/);
}
unless (/^ *CMD_NO_CMD/) {
    die "Couldn't find CMD_NO_CMD in enum.h\n";
}
print OUTFILE "// Generated by util/cmd-name.pl\n\n";
while (<INFILE>) {
    # Pass through pre-processor directives
    if (/^#/) {
        print OUTFILE $_;
        next;
    }
    s|//.*||; # Strip comments
    s/=.*//;  # Strip enum asignments
    s/\s//g;  # Strip whitespace
    s/,$//;   # Strip comma
    next if (/^$/); # Skip blank lines
    my $cmd = $_;
    unless ($cmd =~ /^CMD_/) {
        die "'$cmd' doesn't start with CMD_\n";
    }
    # Don't include synthetic keys
    last if ($cmd eq "CMD_DISABLE_MORE");
    # Skip MIN or MAX enums, since they aren't commands
    next if ($cmd =~ /^CMD_(MIN|MAX)_/);
    print OUTFILE "{$cmd, \"$cmd\"},\n";
}
# End of array sentinel
print OUTFILE "\n";
print OUTFILE "{CMD_NO_CMD, NULL}\n";
close (INFILE);
close (OUTFILE);
exit (0);

Insertion in crawl-ref/source/macro.h at line 32 [9.2456702]

[8.274526]

[4.2656]

#ifdef USE_TILE
    KC_TILE,            // For context_for_command()
#endif

Insertion in crawl-ref/source/macro.h at line 92 [9.2456702]

[10.11362]

[9.2457493]

///////////////////////////////////////////////////////////////
// Keybinding stuff
void init_keybindings();
command_type name_to_command(std::string name);
std::string  command_to_name(command_type cmd);
command_type  key_to_command(int key, KeymapContext context);
int           command_to_key(command_type cmd);
KeymapContext context_for_command(command_type cmd);
void bind_command_to_key(command_type cmd, int key);

Insertion in crawl-ref/source/macro.cc at line 70 [9.2457534]
[2.390]
[8.275308]
```
#ifdef USE_TILE
    &Keymaps[KC_TILE],
#endif
```

Insertion in crawl-ref/source/macro.cc at line 85 [9.2457534]

[10.11450]

[8.275402]

typedef std::map<std::string, int> name_to_cmd_map;
typedef std::map<int, std::string> cmd_to_name_map;
struct command_name
{
    command_type cmd;
    const char*  name;
};
static command_name _command_name_list[] = {
#include "cmd-name.h"
};
static name_to_cmd_map _names_to_cmds;
static cmd_to_name_map _cmds_to_names;
struct default_binding
{
    int           key;
    command_type  cmd;
};
static default_binding _default_binding_list[] = {
#include "cmd-keys.h"
};
typedef std::map<int, int> key_to_cmd_map;
typedef std::map<int, int> cmd_to_key_map;
static key_to_cmd_map _keys_to_cmds[KC_CONTEXT_COUNT];
static cmd_to_key_map _cmds_to_keys[KC_CONTEXT_COUNT];

Insertion in crawl-ref/source/macro.cc at line 1029 [9.2457534]

[10.15958]

[11.4276]

}
///////////////////////////////////////////////////////////////
// Keybinding stuff
#define VALID_BIND_COMMAND(cmd) (cmd > CMD_NO_CMD && cmd < CMD_MIN_SYNTHETIC)
void init_keybindings()
{
    int i;
    for (i = 0; _command_name_list[i].cmd != CMD_NO_CMD
             && _command_name_list[i].name != NULL; i++)
    {
        command_name &data = _command_name_list[i];
        ASSERT(VALID_BIND_COMMAND(data.cmd));
        ASSERT(_names_to_cmds.find(data.name) == _names_to_cmds.end());
        ASSERT(_cmds_to_names.find(data.cmd)  == _cmds_to_names.end());
        _names_to_cmds[data.name] = data.cmd;
        _cmds_to_names[data.cmd]  = data.name;
    }
    ASSERT(i >= 130);
    for (i = 0; _default_binding_list[i].cmd != CMD_NO_CMD
             && _default_binding_list[i].key != '\0'; i++)
    {
        default_binding &data = _default_binding_list[i];
        ASSERT(VALID_BIND_COMMAND(data.cmd));
        KeymapContext context = context_for_command(data.cmd);
        ASSERT(context < KC_CONTEXT_COUNT);
        key_to_cmd_map &key_map = _keys_to_cmds[context];
        cmd_to_key_map &cmd_map = _cmds_to_keys[context];
        // Only one command per key, but it's okay to have several
        // keys map to the same command.
        ASSERT(key_map.find(data.key) == key_map.end());
        key_map[data.key] = data.cmd;
        cmd_map[data.cmd] = data.key;
    }
    ASSERT(i >= 130);
}
command_type name_to_command(std::string name)
{
    name_to_cmd_map::iterator it = _names_to_cmds.find(name);
    if (it == _names_to_cmds.end())
        return (CMD_NO_CMD);
    return static_cast<command_type>(it->second);

Insertion in crawl-ref/source/macro.cc at line 1088 [9.2457534]

[11.4278]


std::string command_to_name(command_type cmd)
{
    cmd_to_name_map::iterator it = _cmds_to_names.find(cmd);
    if (it == _cmds_to_names.end())
        return ("CMD_NO_CMD");
    return (it->second);
}
command_type key_to_command(int key, KeymapContext context)
{
    key_to_cmd_map           &key_map = _keys_to_cmds[context];
    key_to_cmd_map::iterator it       = key_map.find(key);
    if (it == key_map.end())
        return CMD_NO_CMD;
    command_type cmd = static_cast<command_type>(it->second);
    ASSERT(context_for_command(cmd) == context);
    return cmd;
}
int command_to_key(command_type cmd)
{
    KeymapContext context = context_for_command(cmd);
    if (context == KC_NONE)
        return ('\0');
    cmd_to_key_map           &cmd_map = _cmds_to_keys[context];
    cmd_to_key_map::iterator it       = cmd_map.find(cmd);
    if (it == cmd_map.end())
        return ('\0');
    return (it->second);
}
KeymapContext context_for_command(command_type cmd)
{
#ifdef USE_TILE
    if (cmd >= CMD_MIN_TILE && cmd <= CMD_MAX_TILE)
        return KC_TILE;
#endif
    if (cmd > CMD_NO_CMD && cmd <= CMD_MAX_NORMAL)
        return KC_DEFAULT;
    if (cmd >= CMD_MIN_OVERMAP && cmd <= CMD_MAX_OVERMAP)
        return KC_LEVELMAP;
    if (cmd >= CMD_MIN_TARGET && cmd <= CMD_MAX_TARGET)
        return KC_TARGETING;
    return KC_NONE;
}
void bind_command_to_key(command_type cmd, int key)
{
    KeymapContext context      = context_for_command(cmd);
    std::string   command_name = command_to_name(cmd);
    if (context == KC_NONE || command_name == "CMD_NO_CMD"
        || !VALID_BIND_COMMAND(cmd))
    {
        if (command_name == "CMD_NO_CMD")
        {
            mprf(MSGCH_ERROR, "Cannot bind command #%d to a key.",
                 (int) cmd);
            return;
        }
        mprf(MSGCH_ERROR, "Cannot bind command '%s' to a key.",
             command_name.c_str());
        return;
    }
    if (is_userfunction(key))
    {
        mpr("Cannot bind user function keys to a command.", MSGCH_ERROR);
        return;
    }
    if (is_synthetic_key(key))
    {
        mpr("Cannot bind synthetic keys to a command.", MSGCH_ERROR);
        return;
    }
    // We're good.
    key_to_cmd_map &key_map = _keys_to_cmds[context];
    cmd_to_key_map &cmd_map = _cmds_to_keys[context];
    key_map[key] = cmd;
    cmd_map[cmd] = key;
}

Insertion in crawl-ref/source/initfile.cc at line 39 [9.2957258]
[8.391049]
[12.92408]
```
#include "macro.h"
```

Insertion in crawl-ref/source/initfile.cc at line 1698 [9.2957258]

[13.939]

[14.5206]

    }
}
// Not a method of the game_options class since keybindings aren't
// stored in that class.
static void _bindkey(std::string field)
{
    const size_t start_bracket = field.find_first_of('[');
    const size_t end_bracket   = field.find_last_of(']');
    if (start_bracket == std::string::npos
	    || end_bracket == std::string::npos
        || start_bracket > end_bracket)
    {
        mprf(MSGCH_ERROR, "Bad bindkey bracketing in '%s'",
             field.c_str());
        return;
    }
    const std::string key_str = field.substr(start_bracket + 1,
                                             end_bracket - start_bracket - 1);
    int key;
    // TODO: Function keys.
    if (key_str.length() == 0)
    {
        mprf(MSGCH_ERROR, "No key in bindkey directive '%s'",
             field.c_str());
        return;
    }
    else if (key_str.length() == 1)
    {
        key = key_str[0];
    }
    else if (key_str.length() == 2)
    {
        if(key_str[0] != '^')
        {
            mprf(MSGCH_ERROR, "Invalid key '%s' in bindkey directive '%s'",
                 key_str.c_str(), field.c_str());
            return;
        }
        key = CONTROL(key_str[1]);
    }
    else
    {
        mprf(MSGCH_ERROR, "Invalid key '%s' in bindkey directive '%s'",
             key_str.c_str(), field.c_str());
        return;
    }
    const size_t start_name = field.find_first_not_of(' ', end_bracket + 1);
    if (start_name == std::string::npos)
    {
        mprf(MSGCH_ERROR, "No command name for bindkey directive '%s'",
             field.c_str());
        return;
    }
    const std::string  name = field.substr(start_name);
    const command_type cmd  = name_to_command(name);
    if (cmd == CMD_NO_CMD)
    {
       mprf(MSGCH_ERROR, "No command named '%s'", name.c_str());
       return;

Insertion in crawl-ref/source/initfile.cc at line 1765 [9.2957258]
[14.5212]
[14.5212]
```
    bind_command_to_key(cmd, key);
```
Replacement in crawl-ref/source/initfile.cc at line 1895 [9.2957258]
B:BD[15.2710] → [15.2710:2739]
```
        && key != "include")
```
[15.2710]
[8.405496]
```
        && key != "include" && key != "bindkey")
```
Insertion in crawl-ref/source/initfile.cc at line 2951 [9.2957258]
[16.5854134]
[8.426572]
```
    else if(key == "bindkey")
    {
        _bindkey(field);
    }
```

Insertion in crawl-ref/source/enum.h at line 516 [9.3287960]

[17.22497]

[7.906435]


    // Repeat previous command
    CMD_PREV_CMD_AGAIN,
    // Repeat next command a given number of times
    CMD_REPEAT_CMD,
    CMD_MAX_NORMAL = CMD_REPEAT_CMD,

Insertion in crawl-ref/source/enum.h at line 527 [9.3287960]
[7.906486]
[7.906486]
```
    CMD_MIN_OVERMAP = CMD_MAP_CLEAR_MAP,
```
Insertion in crawl-ref/source/enum.h at line 569 [9.3287960]
[7.907315]
[7.907315]
```
    CMD_MAX_OVERMAP = CMD_MAP_EXIT_MAP,
```
Insertion in crawl-ref/source/enum.h at line 574 [9.3287960]
[7.907371]
[7.907371]
```
    CMD_MIN_TARGET = CMD_TARGET_DOWN_LEFT,
```
Insertion in crawl-ref/source/enum.h at line 624 [9.3287960]
[18.175]
[7.908000]
```
    CMD_MAX_TARGET = CMD_TARGET_HELP,
```
Insertion in crawl-ref/source/enum.h at line 628 [9.3287960]
[16.5933208]
[16.5933208]
```
    CMD_MIN_TILE = CMD_TARGET_MOUSE_MOVE,
```
Insertion in crawl-ref/source/enum.h at line 631 [9.3287960]
[16.5933283]
[16.5933320]
```
    CMD_MAX_TILE = CMD_EDIT_PLAYER_TILE,
```
Insertion in crawl-ref/source/enum.h at line 636 [9.3287960]
[11.4582]
[11.4582]
```
    CMD_MIN_SYNTHETIC = CMD_DISABLE_MORE,
```
Deletion in crawl-ref/source/enum.h at line 642 [9.3287960]
B:BD[10.17169] → [10.17169:17296]
∅:D[10.17296] → [7.908081:908082]
B:BD[7.908081] → [7.908081:908082]
```
    // Repeat previous command
    CMD_PREV_CMD_AGAIN,
    // Repeat next command a given number of times
    CMD_REPEAT_CMD,
```
Replacement in crawl-ref/source/enum.h at line 644 [9.3287960]
B:BD[10.17386] → [10.17386:17406]
```
    CMD_REPEAT_KEYS
```
[10.17386]
[9.3304899]
```
    CMD_REPEAT_KEYS,
    // Must always be last
    CMD_MAX_CMD
```
Deletion in crawl-ref/source/directn.cc at line 2711 [9.3697945]
B:BD[19.9840] → [19.9840:9865]
∅:D[19.9865] → [20.6698:6704]
B:BD[20.6698] → [20.6698:6704]
B:BD[20.6704] → [21.9099:9157]
∅:D[21.9157] → [16.5934880:5934897]
B:BD[20.6757] → [16.5934880:5934897]
B:BD[16.5934897] → [21.9158:9213]
∅:D[21.9213] → [16.5934951:5935015]
B:BD[16.5934951] → [16.5934951:5935015]
B:BD[16.5935015] → [22.8444:8445]
∅:D[22.8445] → [20.6766:6780]
∅:D[16.5935017] → [20.6766:6780]
B:BD[20.6766] → [20.6766:6780]
B:BD[20.6780] → [21.9214:9269]
B:BD[21.9269] → [23.11411:11466]
∅:D[23.11466] → [21.9269:9372]
B:BD[21.9269] → [21.9269:9372]
B:BD[21.9372] → [24.2967:3013]
B:BD[24.3013] → [25.11575:11625]
∅:D[24.3013] → [20.6834:6841]
∅:D[21.9372] → [20.6834:6841]
∅:D[26.10949] → [20.6834:6841]
∅:D[25.11625] → [20.6834:6841]
∅:D[27.35302] → [20.6834:6841]
B:BD[20.6834] → [20.6834:6841]
B:BD[20.6841] → [21.9373:9530]
B:BD[21.9530] → [28.5149:5203]
∅:D[28.5203] → [20.6995:7062]
∅:D[21.9530] → [20.6995:7062]
B:BD[20.6995] → [20.6995:7062]
```
#endif
    switch (key)
    {
    case ESCAPE:
    case 'x':  return CMD_TARGET_CANCEL;
#ifdef USE_TILE
    case CK_MOUSE_MOVE:  return CMD_TARGET_MOUSE_MOVE;
    case CK_MOUSE_CLICK: return CMD_TARGET_MOUSE_SELECT;
#endif
#ifdef WIZARD
    case 'F':  return CMD_TARGET_WIZARD_MAKE_FRIENDLY;
    case 'P':  return CMD_TARGET_WIZARD_BLESS_MONSTER;
    case 's':  return CMD_TARGET_WIZARD_MAKE_SHOUT;
    case 'g':  return CMD_TARGET_WIZARD_GIVE_ITEM;
    case 'm':  return CMD_TARGET_WIZARD_MOVE;
    case 'w':  return CMD_TARGET_WIZARD_PATHFIND;
#endif
    case 'v':  return CMD_TARGET_DESCRIBE;
    case '?':  return CMD_TARGET_HELP;
    case ' ':  return just_looking? CMD_TARGET_CANCEL : CMD_TARGET_SELECT;
    case CONTROL('P'): return CMD_TARGET_SHOW_PROMPT;
#ifdef WIZARD
    case CONTROL('C'): return CMD_TARGET_CYCLE_BEAM;
```

Deletion in crawl-ref/source/directn.cc at line 2712 [9.3697945]

B:BD[20.7069] → [21.9531:9575]

B:BD[21.9575] → [29.4653:4694]

∅:D[29.4694] → [20.7112:7153]

∅:D[21.9575] → [20.7112:7153]

B:BD[20.7112] → [20.7112:7153]

B:BD[21.9617] → [21.9617:9658]

B:BD[21.9658] → [29.4695:4745]

∅:D[29.4745] → [20.7282:7283]

∅:D[21.9708] → [20.7282:7283]

B:BD[20.7282] → [20.7282:7283]

B:BD[20.7283] → [21.9709:9955]

∅:D[21.9955] → [20.7521:7582]

B:BD[20.7521] → [20.7521:7582]

B:BD[20.7582] → [19.9866:9921]

∅:D[19.9921] → [21.9956:10128]

B:BD[20.7582] → [21.9956:10128]

∅:D[21.10128] → [30.3527:3528]

B:BD[30.3527] → [30.3527:3528]

B:BD[30.3528] → [21.10129:10365]

∅:D[21.10365] → [20.7920:7921]

B:BD[20.7920] → [20.7920:7921]

B:BD[20.7921] → [21.10366:10695]

    case ':':  return CMD_TARGET_HIDE_BEAM;
    case '!':  return CMD_TARGET_SELECT;
    case '\r': return CMD_TARGET_SELECT;
    case '5':  return CMD_TARGET_SELECT;
    case '.':  return CMD_TARGET_SELECT_ENDPOINT;
    case '\\':
    case '\t': return CMD_TARGET_FIND_PORTAL;
    case '^':  return CMD_TARGET_FIND_TRAP;
    case '_':  return CMD_TARGET_FIND_ALTAR;
    case '<':  return CMD_TARGET_FIND_UPSTAIR;
    case '>':  return CMD_TARGET_FIND_DOWNSTAIR;
    case CONTROL('F'): return CMD_TARGET_CYCLE_TARGET_MODE;
    case CONTROL('L'): return CMD_TARGET_TOGGLE_MLIST;
    case 'p':  return CMD_TARGET_PREV_TARGET;
    case 'f':  return CMD_TARGET_MAYBE_PREV_TARGET;
    case 't':  return CMD_TARGET_MAYBE_PREV_TARGET; // for the 0.3.4 keys
    case '-':  return CMD_TARGET_CYCLE_BACK;
    case '+':
    case '=':  return CMD_TARGET_CYCLE_FORWARD;
    case ';':
    case '/':  return CMD_TARGET_OBJ_CYCLE_BACK;
    case '*':
    case '\'': return CMD_TARGET_OBJ_CYCLE_FORWARD;
    case 'b':  return CMD_TARGET_DOWN_LEFT;
    case 'h':  return CMD_TARGET_LEFT;
    case 'j':  return CMD_TARGET_DOWN;
    case 'k':  return CMD_TARGET_UP;
    case 'l':  return CMD_TARGET_RIGHT;
    case 'n':  return CMD_TARGET_DOWN_RIGHT;
    case 'u':  return CMD_TARGET_UP_RIGHT;
    case 'y':  return CMD_TARGET_UP_LEFT;

Replacement in crawl-ref/source/directn.cc at line 2713 [9.3697945]

B:BD[20.8243] → [21.10696:11057]

    case 'B':  return CMD_TARGET_DIR_DOWN_LEFT;
    case 'H':  return CMD_TARGET_DIR_LEFT;
    case 'J':  return CMD_TARGET_DIR_DOWN;
    case 'K':  return CMD_TARGET_DIR_UP;
    case 'L':  return CMD_TARGET_DIR_RIGHT;
    case 'N':  return CMD_TARGET_DIR_DOWN_RIGHT;
    case 'U':  return CMD_TARGET_DIR_UP_RIGHT;
    case 'Y':  return CMD_TARGET_DIR_UP_LEFT;

[20.8243]

[20.8596]

    command_type cmd = key_to_command(key, KC_TARGETING);
    // XXX: hack
    if (cmd == CMD_TARGET_SELECT && key == ' ' && just_looking)
        cmd = CMD_TARGET_CANCEL;

Replacement in crawl-ref/source/directn.cc at line 2718 [9.3697945]
B:BD[20.8597] → [21.11058:11092]
∅:D[21.11092] → [22.8446:8452]
B:BD[20.8629] → [22.8446:8452]
```
    default:   return CMD_NO_CMD;
    }
```
[20.8597]
[20.8639]
```
    return cmd;
```

File addition: cmd-name.h (----------)

[31.24]

// Generated by util/cmd-name.pl
{CMD_MOVE_NOWHERE, "CMD_MOVE_NOWHERE"},
{CMD_MOVE_LEFT, "CMD_MOVE_LEFT"},
{CMD_MOVE_DOWN, "CMD_MOVE_DOWN"},
{CMD_MOVE_UP, "CMD_MOVE_UP"},
{CMD_MOVE_RIGHT, "CMD_MOVE_RIGHT"},
{CMD_MOVE_UP_LEFT, "CMD_MOVE_UP_LEFT"},
{CMD_MOVE_DOWN_LEFT, "CMD_MOVE_DOWN_LEFT"},
{CMD_MOVE_UP_RIGHT, "CMD_MOVE_UP_RIGHT"},
{CMD_MOVE_DOWN_RIGHT, "CMD_MOVE_DOWN_RIGHT"},
{CMD_RUN_LEFT, "CMD_RUN_LEFT"},
{CMD_RUN_DOWN, "CMD_RUN_DOWN"},
{CMD_RUN_UP, "CMD_RUN_UP"},
{CMD_RUN_RIGHT, "CMD_RUN_RIGHT"},
{CMD_RUN_UP_LEFT, "CMD_RUN_UP_LEFT"},
{CMD_RUN_DOWN_LEFT, "CMD_RUN_DOWN_LEFT"},
{CMD_RUN_UP_RIGHT, "CMD_RUN_UP_RIGHT"},
{CMD_RUN_DOWN_RIGHT, "CMD_RUN_DOWN_RIGHT"},
{CMD_OPEN_DOOR_LEFT, "CMD_OPEN_DOOR_LEFT"},
{CMD_OPEN_DOOR_DOWN, "CMD_OPEN_DOOR_DOWN"},
{CMD_OPEN_DOOR_UP, "CMD_OPEN_DOOR_UP"},
{CMD_OPEN_DOOR_RIGHT, "CMD_OPEN_DOOR_RIGHT"},
{CMD_OPEN_DOOR_UP_LEFT, "CMD_OPEN_DOOR_UP_LEFT"},
{CMD_OPEN_DOOR_DOWN_LEFT, "CMD_OPEN_DOOR_DOWN_LEFT"},
{CMD_OPEN_DOOR_UP_RIGHT, "CMD_OPEN_DOOR_UP_RIGHT"},
{CMD_OPEN_DOOR_DOWN_RIGHT, "CMD_OPEN_DOOR_DOWN_RIGHT"},
{CMD_OPEN_DOOR, "CMD_OPEN_DOOR"},
{CMD_CLOSE_DOOR, "CMD_CLOSE_DOOR"},
{CMD_REST, "CMD_REST"},
{CMD_GO_UPSTAIRS, "CMD_GO_UPSTAIRS"},
{CMD_GO_DOWNSTAIRS, "CMD_GO_DOWNSTAIRS"},
{CMD_TOGGLE_AUTOPICKUP, "CMD_TOGGLE_AUTOPICKUP"},
{CMD_TOGGLE_FRIENDLY_PICKUP, "CMD_TOGGLE_FRIENDLY_PICKUP"},
{CMD_PICKUP, "CMD_PICKUP"},
{CMD_DROP, "CMD_DROP"},
{CMD_BUTCHER, "CMD_BUTCHER"},
{CMD_INSPECT_FLOOR, "CMD_INSPECT_FLOOR"},
{CMD_FULL_VIEW, "CMD_FULL_VIEW"},
{CMD_EXAMINE_OBJECT, "CMD_EXAMINE_OBJECT"},
{CMD_EVOKE, "CMD_EVOKE"},
{CMD_WIELD_WEAPON, "CMD_WIELD_WEAPON"},
{CMD_WEAPON_SWAP, "CMD_WEAPON_SWAP"},
{CMD_FIRE, "CMD_FIRE"},
{CMD_QUIVER_ITEM, "CMD_QUIVER_ITEM"},
{CMD_THROW_ITEM_NO_QUIVER, "CMD_THROW_ITEM_NO_QUIVER"},
{CMD_WEAR_ARMOUR, "CMD_WEAR_ARMOUR"},
{CMD_REMOVE_ARMOUR, "CMD_REMOVE_ARMOUR"},
{CMD_WEAR_JEWELLERY, "CMD_WEAR_JEWELLERY"},
{CMD_REMOVE_JEWELLERY, "CMD_REMOVE_JEWELLERY"},
{CMD_CYCLE_QUIVER_FORWARD, "CMD_CYCLE_QUIVER_FORWARD"},
{CMD_LIST_WEAPONS, "CMD_LIST_WEAPONS"},
{CMD_LIST_ARMOUR, "CMD_LIST_ARMOUR"},
{CMD_LIST_JEWELLERY, "CMD_LIST_JEWELLERY"},
{CMD_LIST_EQUIPMENT, "CMD_LIST_EQUIPMENT"},
{CMD_ZAP_WAND, "CMD_ZAP_WAND"},
{CMD_CAST_SPELL, "CMD_CAST_SPELL"},
{CMD_MEMORISE_SPELL, "CMD_MEMORISE_SPELL"},
{CMD_USE_ABILITY, "CMD_USE_ABILITY"},
{CMD_PRAY, "CMD_PRAY"},
{CMD_EAT, "CMD_EAT"},
{CMD_QUAFF, "CMD_QUAFF"},
{CMD_READ, "CMD_READ"},
{CMD_LOOK_AROUND, "CMD_LOOK_AROUND"},
{CMD_SEARCH, "CMD_SEARCH"},
{CMD_SHOUT, "CMD_SHOUT"},
{CMD_DISARM_TRAP, "CMD_DISARM_TRAP"},
{CMD_CHARACTER_DUMP, "CMD_CHARACTER_DUMP"},
{CMD_DISPLAY_COMMANDS, "CMD_DISPLAY_COMMANDS"},
{CMD_DISPLAY_INVENTORY, "CMD_DISPLAY_INVENTORY"},
{CMD_DISPLAY_KNOWN_OBJECTS, "CMD_DISPLAY_KNOWN_OBJECTS"},
{CMD_DISPLAY_MUTATIONS, "CMD_DISPLAY_MUTATIONS"},
{CMD_DISPLAY_SKILLS, "CMD_DISPLAY_SKILLS"},
{CMD_DISPLAY_MAP, "CMD_DISPLAY_MAP"},
{CMD_DISPLAY_OVERMAP, "CMD_DISPLAY_OVERMAP"},
{CMD_DISPLAY_RELIGION, "CMD_DISPLAY_RELIGION"},
{CMD_DISPLAY_CHARACTER_STATUS, "CMD_DISPLAY_CHARACTER_STATUS"},
{CMD_DISPLAY_SPELLS, "CMD_DISPLAY_SPELLS"},
{CMD_EXPERIENCE_CHECK, "CMD_EXPERIENCE_CHECK"},
{CMD_ADJUST_INVENTORY, "CMD_ADJUST_INVENTORY"},
{CMD_REPLAY_MESSAGES, "CMD_REPLAY_MESSAGES"},
{CMD_REDRAW_SCREEN, "CMD_REDRAW_SCREEN"},
{CMD_MACRO_ADD, "CMD_MACRO_ADD"},
{CMD_SAVE_GAME, "CMD_SAVE_GAME"},
{CMD_SAVE_GAME_NOW, "CMD_SAVE_GAME_NOW"},
{CMD_SUSPEND_GAME, "CMD_SUSPEND_GAME"},
{CMD_QUIT, "CMD_QUIT"},
{CMD_WIZARD, "CMD_WIZARD"},
{CMD_DESTROY_ITEM, "CMD_DESTROY_ITEM"},
{CMD_MARK_STASH, "CMD_MARK_STASH"},
{CMD_FORGET_STASH, "CMD_FORGET_STASH"},
{CMD_SEARCH_STASHES, "CMD_SEARCH_STASHES"},
{CMD_EXPLORE, "CMD_EXPLORE"},
{CMD_INTERLEVEL_TRAVEL, "CMD_INTERLEVEL_TRAVEL"},
{CMD_FIX_WAYPOINT, "CMD_FIX_WAYPOINT"},
{CMD_CLEAR_MAP, "CMD_CLEAR_MAP"},
{CMD_INSCRIBE_ITEM, "CMD_INSCRIBE_ITEM"},
{CMD_MAKE_NOTE, "CMD_MAKE_NOTE"},
{CMD_RESISTS_SCREEN, "CMD_RESISTS_SCREEN"},
{CMD_READ_MESSAGES, "CMD_READ_MESSAGES"},
{CMD_MOUSE_MOVE, "CMD_MOUSE_MOVE"},
{CMD_MOUSE_CLICK, "CMD_MOUSE_CLICK"},
{CMD_ANNOTATE_LEVEL, "CMD_ANNOTATE_LEVEL"},
{CMD_PREV_CMD_AGAIN, "CMD_PREV_CMD_AGAIN"},
{CMD_REPEAT_CMD, "CMD_REPEAT_CMD"},
{CMD_MAP_CLEAR_MAP, "CMD_MAP_CLEAR_MAP"},
{CMD_MAP_ADD_WAYPOINT, "CMD_MAP_ADD_WAYPOINT"},
{CMD_MAP_EXCLUDE_AREA, "CMD_MAP_EXCLUDE_AREA"},
{CMD_MAP_CLEAR_EXCLUDES, "CMD_MAP_CLEAR_EXCLUDES"},
{CMD_MAP_MOVE_LEFT, "CMD_MAP_MOVE_LEFT"},
{CMD_MAP_MOVE_DOWN, "CMD_MAP_MOVE_DOWN"},
{CMD_MAP_MOVE_UP, "CMD_MAP_MOVE_UP"},
{CMD_MAP_MOVE_RIGHT, "CMD_MAP_MOVE_RIGHT"},
{CMD_MAP_MOVE_UP_LEFT, "CMD_MAP_MOVE_UP_LEFT"},
{CMD_MAP_MOVE_DOWN_LEFT, "CMD_MAP_MOVE_DOWN_LEFT"},
{CMD_MAP_MOVE_UP_RIGHT, "CMD_MAP_MOVE_UP_RIGHT"},
{CMD_MAP_MOVE_DOWN_RIGHT, "CMD_MAP_MOVE_DOWN_RIGHT"},
{CMD_MAP_JUMP_LEFT, "CMD_MAP_JUMP_LEFT"},
{CMD_MAP_JUMP_DOWN, "CMD_MAP_JUMP_DOWN"},
{CMD_MAP_JUMP_UP, "CMD_MAP_JUMP_UP"},
{CMD_MAP_JUMP_RIGHT, "CMD_MAP_JUMP_RIGHT"},
{CMD_MAP_JUMP_UP_LEFT, "CMD_MAP_JUMP_UP_LEFT"},
{CMD_MAP_JUMP_DOWN_LEFT, "CMD_MAP_JUMP_DOWN_LEFT"},
{CMD_MAP_JUMP_UP_RIGHT, "CMD_MAP_JUMP_UP_RIGHT"},
{CMD_MAP_JUMP_DOWN_RIGHT, "CMD_MAP_JUMP_DOWN_RIGHT"},
{CMD_MAP_SCROLL_DOWN, "CMD_MAP_SCROLL_DOWN"},
{CMD_MAP_SCROLL_UP, "CMD_MAP_SCROLL_UP"},
{CMD_MAP_FIND_UPSTAIR, "CMD_MAP_FIND_UPSTAIR"},
{CMD_MAP_FIND_DOWNSTAIR, "CMD_MAP_FIND_DOWNSTAIR"},
{CMD_MAP_FIND_YOU, "CMD_MAP_FIND_YOU"},
{CMD_MAP_FIND_PORTAL, "CMD_MAP_FIND_PORTAL"},
{CMD_MAP_FIND_TRAP, "CMD_MAP_FIND_TRAP"},
{CMD_MAP_FIND_ALTAR, "CMD_MAP_FIND_ALTAR"},
{CMD_MAP_FIND_EXCLUDED, "CMD_MAP_FIND_EXCLUDED"},
{CMD_MAP_FIND_F, "CMD_MAP_FIND_F"},
{CMD_MAP_FIND_WAYPOINT, "CMD_MAP_FIND_WAYPOINT"},
{CMD_MAP_FIND_STASH, "CMD_MAP_FIND_STASH"},
{CMD_MAP_GOTO_TARGET, "CMD_MAP_GOTO_TARGET"},
{CMD_MAP_WIZARD_TELEPORT, "CMD_MAP_WIZARD_TELEPORT"},
{CMD_MAP_EXIT_MAP, "CMD_MAP_EXIT_MAP"},
{CMD_TARGET_DOWN_LEFT, "CMD_TARGET_DOWN_LEFT"},
{CMD_TARGET_DOWN, "CMD_TARGET_DOWN"},
{CMD_TARGET_DOWN_RIGHT, "CMD_TARGET_DOWN_RIGHT"},
{CMD_TARGET_LEFT, "CMD_TARGET_LEFT"},
{CMD_TARGET_RIGHT, "CMD_TARGET_RIGHT"},
{CMD_TARGET_UP_LEFT, "CMD_TARGET_UP_LEFT"},
{CMD_TARGET_UP, "CMD_TARGET_UP"},
{CMD_TARGET_UP_RIGHT, "CMD_TARGET_UP_RIGHT"},
{CMD_TARGET_DIR_DOWN_LEFT, "CMD_TARGET_DIR_DOWN_LEFT"},
{CMD_TARGET_DIR_DOWN, "CMD_TARGET_DIR_DOWN"},
{CMD_TARGET_DIR_DOWN_RIGHT, "CMD_TARGET_DIR_DOWN_RIGHT"},
{CMD_TARGET_DIR_LEFT, "CMD_TARGET_DIR_LEFT"},
{CMD_TARGET_DIR_RIGHT, "CMD_TARGET_DIR_RIGHT"},
{CMD_TARGET_DIR_UP_LEFT, "CMD_TARGET_DIR_UP_LEFT"},
{CMD_TARGET_DIR_UP, "CMD_TARGET_DIR_UP"},
{CMD_TARGET_DIR_UP_RIGHT, "CMD_TARGET_DIR_UP_RIGHT"},
{CMD_TARGET_CYCLE_TARGET_MODE, "CMD_TARGET_CYCLE_TARGET_MODE"},
{CMD_TARGET_PREV_TARGET, "CMD_TARGET_PREV_TARGET"},
{CMD_TARGET_MAYBE_PREV_TARGET, "CMD_TARGET_MAYBE_PREV_TARGET"},
{CMD_TARGET_SELECT, "CMD_TARGET_SELECT"},
{CMD_TARGET_SELECT_ENDPOINT, "CMD_TARGET_SELECT_ENDPOINT"},
{CMD_TARGET_OBJ_CYCLE_BACK, "CMD_TARGET_OBJ_CYCLE_BACK"},
{CMD_TARGET_OBJ_CYCLE_FORWARD, "CMD_TARGET_OBJ_CYCLE_FORWARD"},
{CMD_TARGET_CYCLE_FORWARD, "CMD_TARGET_CYCLE_FORWARD"},
{CMD_TARGET_CYCLE_BACK, "CMD_TARGET_CYCLE_BACK"},
{CMD_TARGET_CYCLE_BEAM, "CMD_TARGET_CYCLE_BEAM"},
{CMD_TARGET_CYCLE_MLIST, "CMD_TARGET_CYCLE_MLIST"},
{CMD_TARGET_CYCLE_MLIST_END, "CMD_TARGET_CYCLE_MLIST_END"},
{CMD_TARGET_TOGGLE_MLIST, "CMD_TARGET_TOGGLE_MLIST"},
{CMD_TARGET_HIDE_BEAM, "CMD_TARGET_HIDE_BEAM"},
{CMD_TARGET_CENTER, "CMD_TARGET_CENTER"},
{CMD_TARGET_CANCEL, "CMD_TARGET_CANCEL"},
{CMD_TARGET_SHOW_PROMPT, "CMD_TARGET_SHOW_PROMPT"},
{CMD_TARGET_OLD_SPACE, "CMD_TARGET_OLD_SPACE"},
{CMD_TARGET_FIND_TRAP, "CMD_TARGET_FIND_TRAP"},
{CMD_TARGET_FIND_PORTAL, "CMD_TARGET_FIND_PORTAL"},
{CMD_TARGET_FIND_ALTAR, "CMD_TARGET_FIND_ALTAR"},
{CMD_TARGET_FIND_UPSTAIR, "CMD_TARGET_FIND_UPSTAIR"},
{CMD_TARGET_FIND_DOWNSTAIR, "CMD_TARGET_FIND_DOWNSTAIR"},
{CMD_TARGET_FIND_YOU, "CMD_TARGET_FIND_YOU"},
{CMD_TARGET_DESCRIBE, "CMD_TARGET_DESCRIBE"},
{CMD_TARGET_WIZARD_MAKE_FRIENDLY, "CMD_TARGET_WIZARD_MAKE_FRIENDLY"},
{CMD_TARGET_WIZARD_BLESS_MONSTER, "CMD_TARGET_WIZARD_BLESS_MONSTER"},
{CMD_TARGET_WIZARD_MAKE_SHOUT, "CMD_TARGET_WIZARD_MAKE_SHOUT"},
{CMD_TARGET_WIZARD_GIVE_ITEM, "CMD_TARGET_WIZARD_GIVE_ITEM"},
{CMD_TARGET_WIZARD_MOVE, "CMD_TARGET_WIZARD_MOVE"},
{CMD_TARGET_WIZARD_PATHFIND, "CMD_TARGET_WIZARD_PATHFIND"},
{CMD_TARGET_HELP, "CMD_TARGET_HELP"},
#ifdef USE_TILE
{CMD_TARGET_MOUSE_MOVE, "CMD_TARGET_MOUSE_MOVE"},
{CMD_TARGET_MOUSE_SELECT, "CMD_TARGET_MOUSE_SELECT"},
{CMD_EDIT_PLAYER_TILE, "CMD_EDIT_PLAYER_TILE"},
#endif
{CMD_NO_CMD, NULL}

File addition: cmd-keys.h (----------)

[31.24]

#ifdef USE_TILE
{'-', CMD_EDIT_PLAYER_TILE},
#endif
{'b', CMD_MOVE_DOWN_LEFT},
{'h', CMD_MOVE_LEFT},
{'j', CMD_MOVE_DOWN},
{'k', CMD_MOVE_UP},
{'l', CMD_MOVE_RIGHT},
{'n', CMD_MOVE_DOWN_RIGHT},
{'u', CMD_MOVE_UP_RIGHT},
{'y', CMD_MOVE_UP_LEFT},
{'a', CMD_USE_ABILITY},
{'c', CMD_BUTCHER},
{'d', CMD_DROP},
{'e', CMD_EAT},
{'f', CMD_FIRE},
{'g', CMD_PICKUP},
{'i', CMD_DISPLAY_INVENTORY},
{'m', CMD_DISPLAY_SKILLS},
{'o', CMD_EXPLORE},
{'p', CMD_PRAY},
{'q', CMD_QUAFF},
{'r', CMD_READ},
{'s', CMD_SEARCH},
{'t', CMD_SHOUT},
{'v', CMD_EVOKE},
{'w', CMD_WIELD_WEAPON},
{'x', CMD_LOOK_AROUND},
{'z', CMD_CAST_SPELL},
{'B', CMD_RUN_DOWN_LEFT},
{'H', CMD_RUN_LEFT},
{'J', CMD_RUN_DOWN},
{'K', CMD_RUN_UP},
{'L', CMD_RUN_RIGHT},
{'N', CMD_RUN_DOWN_RIGHT},
{'U', CMD_RUN_UP_RIGHT},
{'Y', CMD_RUN_UP_LEFT},
{'A', CMD_DISPLAY_MUTATIONS},
{'C', CMD_CLOSE_DOOR},
{'E', CMD_EXPERIENCE_CHECK},
{'F', CMD_THROW_ITEM_NO_QUIVER},
{'G', CMD_INTERLEVEL_TRAVEL},
{CONTROL('G'), CMD_INTERLEVEL_TRAVEL},
{'I', CMD_DISPLAY_SPELLS},
{'M', CMD_MEMORISE_SPELL},
{'O', CMD_OPEN_DOOR},
{'P', CMD_WEAR_JEWELLERY},
{'Q', CMD_QUIVER_ITEM},
{'R', CMD_REMOVE_JEWELLERY},
{'S', CMD_SAVE_GAME},
{'T', CMD_REMOVE_ARMOUR},
{'V', CMD_FULL_VIEW},
{'W', CMD_WEAR_ARMOUR},
{'X', CMD_DISPLAY_MAP},
{'Z', CMD_ZAP_WAND},
{'.', CMD_MOVE_NOWHERE},
{'<', CMD_GO_UPSTAIRS},
{'>', CMD_GO_DOWNSTAIRS},
{'@', CMD_DISPLAY_CHARACTER_STATUS},
{'%', CMD_RESISTS_SCREEN},
{',', CMD_PICKUP},
{':', CMD_MAKE_NOTE},
{'_', CMD_READ_MESSAGES},
{';', CMD_INSPECT_FLOOR},
{'^', CMD_DISPLAY_RELIGION},
{'#', CMD_CHARACTER_DUMP},
{'=', CMD_ADJUST_INVENTORY},
{'?', CMD_DISPLAY_COMMANDS},
{'!', CMD_ANNOTATE_LEVEL},
{CONTROL('D'), CMD_MACRO_ADD},
{'~', CMD_MACRO_ADD},
#ifdef WIZARD
{'&', CMD_WIZARD},
#endif
{'"', CMD_LIST_JEWELLERY},
{'{', CMD_INSCRIBE_ITEM},
{'[', CMD_LIST_ARMOUR},
{']', CMD_LIST_EQUIPMENT},
{'(', CMD_CYCLE_QUIVER_FORWARD},
{')', CMD_LIST_WEAPONS},
{'\\', CMD_DISPLAY_KNOWN_OBJECTS},
{'\'', CMD_WEAPON_SWAP},
{'`', CMD_PREV_CMD_AGAIN},
{'0', CMD_REPEAT_CMD},
{'5', CMD_REST},
{CONTROL('B'), CMD_OPEN_DOOR_DOWN_LEFT},
{CONTROL('H'), CMD_OPEN_DOOR_LEFT},
{CONTROL('J'), CMD_OPEN_DOOR_DOWN},
{CONTROL('K'), CMD_OPEN_DOOR_UP},
{CONTROL('L'), CMD_OPEN_DOOR_RIGHT},
{CONTROL('N'), CMD_OPEN_DOOR_DOWN_RIGHT},
{CONTROL('U'), CMD_OPEN_DOOR_UP_LEFT},
{CONTROL('Y'), CMD_OPEN_DOOR_UP_RIGHT},
{CONTROL('A'), CMD_TOGGLE_AUTOPICKUP},
{CONTROL('C'), CMD_CLEAR_MAP},
{CONTROL('E'), CMD_FORGET_STASH},
{CONTROL('F'), CMD_SEARCH_STASHES},
{CONTROL('O'), CMD_DISPLAY_OVERMAP},
{CONTROL('P'), CMD_REPLAY_MESSAGES},
{CONTROL('Q'), CMD_QUIT},
{CONTROL('R'), CMD_REDRAW_SCREEN},
{CONTROL('S'), CMD_MARK_STASH},
{CONTROL('T'), CMD_TOGGLE_FRIENDLY_PICKUP},
{CONTROL('W'), CMD_FIX_WAYPOINT},
{CONTROL('X'), CMD_SAVE_GAME_NOW},
{CONTROL('Z'), CMD_SUSPEND_GAME},
{'x', CMD_TARGET_CANCEL},
{ESCAPE, CMD_TARGET_CANCEL},
#ifdef WIZARD
{'F', CMD_TARGET_WIZARD_MAKE_FRIENDLY},
{'P', CMD_TARGET_WIZARD_BLESS_MONSTER},
{'s', CMD_TARGET_WIZARD_MAKE_SHOUT},
{'g', CMD_TARGET_WIZARD_GIVE_ITEM},
{'m', CMD_TARGET_WIZARD_MOVE},
{'w', CMD_TARGET_WIZARD_PATHFIND},
#endif
{'v', CMD_TARGET_DESCRIBE},
{'?', CMD_TARGET_HELP},
{' ', CMD_TARGET_SELECT}, // XXX hack: can also be CMD_TARGET_CANCEL
{CONTROL('P'), CMD_TARGET_SHOW_PROMPT},
{CONTROL('C'), CMD_TARGET_CYCLE_BEAM},
{':', CMD_TARGET_HIDE_BEAM},
{'!', CMD_TARGET_SELECT},
{'\r', CMD_TARGET_SELECT},
{'5', CMD_TARGET_SELECT},
{'.', CMD_TARGET_SELECT_ENDPOINT},
{'\t', CMD_TARGET_FIND_PORTAL},
{'^', CMD_TARGET_FIND_TRAP},
{'_', CMD_TARGET_FIND_ALTAR},
{'<', CMD_TARGET_FIND_UPSTAIR},
{'>', CMD_TARGET_FIND_DOWNSTAIR},
{CONTROL('F'), CMD_TARGET_CYCLE_TARGET_MODE},
{CONTROL('L'), CMD_TARGET_TOGGLE_MLIST},
{'p', CMD_TARGET_PREV_TARGET},
{'f', CMD_TARGET_MAYBE_PREV_TARGET},
{'t', CMD_TARGET_MAYBE_PREV_TARGET},
{'-', CMD_TARGET_CYCLE_BACK},
{'=', CMD_TARGET_CYCLE_FORWARD},
{'/', CMD_TARGET_OBJ_CYCLE_BACK},
{'\'', CMD_TARGET_OBJ_CYCLE_FORWARD},
{'b', CMD_TARGET_DOWN_LEFT},
{'h', CMD_TARGET_LEFT},
{'j', CMD_TARGET_DOWN},
{'k', CMD_TARGET_UP},
{'l', CMD_TARGET_RIGHT},
{'n', CMD_TARGET_DOWN_RIGHT},
{'u', CMD_TARGET_UP_RIGHT},
{'y', CMD_TARGET_UP_LEFT},
{'B', CMD_TARGET_DIR_DOWN_LEFT},
{'H', CMD_TARGET_DIR_LEFT},
{'J', CMD_TARGET_DIR_DOWN},
{'K', CMD_TARGET_DIR_UP},
{'L', CMD_TARGET_DIR_RIGHT},
{'N', CMD_TARGET_DIR_DOWN_RIGHT},
{'U', CMD_TARGET_DIR_UP_RIGHT},
{'Y', CMD_TARGET_DIR_UP_LEFT},
{CK_MOUSE_MOVE,  CMD_MOUSE_MOVE},
{CK_MOUSE_CLICK, CMD_MOUSE_CLICK},
#ifdef USE_TILE
{CK_MOUSE_MOVE,  CMD_TARGET_MOUSE_MOVE},
{CK_MOUSE_CLICK, CMD_TARGET_MOUSE_SELECT},
#endif
{'\0', CMD_NO_CMD}

Insertion in crawl-ref/source/acr.cc at line 220 [9.4397395]
[32.38378]
[6.225593]
```
    // Hardcoded initial keybindings.
    init_keybindings();
```
Replacement in crawl-ref/source/acr.cc at line 3399 [9.4397395]
B:BD[7.1272432] → [32.39199:39244]
```
// For now, this is an extremely yucky hack.
```
[7.1272432]
[33.27114]
```
// We handle the synthetic keys, key_to_command() handles the
// real ones.
```
Deletion in crawl-ref/source/acr.cc at line 3406 [9.4397395]
B:BD[16.5938659] → [33.27175:27230]
```
    case '-':             return CMD_EDIT_PLAYER_TILE;
```

Deletion in crawl-ref/source/acr.cc at line 3412 [9.4397395]

∅:D[11.5070] → [7.1272554:1272898]

∅:D[10.31315] → [7.1272554:1272898]

∅:D[34.91847] → [7.1272554:1272898]

B:BD[7.1272554] → [7.1272554:1272898]

B:BD[7.1272898] → [35.16216:16250]

∅:D[35.16250] → [7.1272935:1273145]

B:BD[7.1272935] → [7.1272935:1273145]

B:BD[7.1273145] → [35.16251:16285]

∅:D[35.16285] → [7.1273181:1273308]

B:BD[7.1273181] → [7.1273181:1273308]

B:BD[7.1273308] → [35.16286:16350]

∅:D[35.16350] → [7.1273381:1273458]

B:BD[7.1273381] → [7.1273381:1273458]

B:BD[7.1273458] → [35.16351:16388]

∅:D[35.16388] → [7.1273493:1273791]

B:BD[7.1273493] → [7.1273493:1273791]

    case 'b': return CMD_MOVE_DOWN_LEFT;
    case 'h': return CMD_MOVE_LEFT;
    case 'j': return CMD_MOVE_DOWN;
    case 'k': return CMD_MOVE_UP;
    case 'l': return CMD_MOVE_RIGHT;
    case 'n': return CMD_MOVE_DOWN_RIGHT;
    case 'u': return CMD_MOVE_UP_RIGHT;
    case 'y': return CMD_MOVE_UP_LEFT;
    case 'a': return CMD_USE_ABILITY;
    case 'c': return CMD_BUTCHER;
    case 'd': return CMD_DROP;
    case 'e': return CMD_EAT;
    case 'f': return CMD_FIRE;
    case 'g': return CMD_PICKUP;
    case 'i': return CMD_DISPLAY_INVENTORY;
    case 'm': return CMD_DISPLAY_SKILLS;
    case 'o': return CMD_EXPLORE;
    case 'p': return CMD_PRAY;
    case 'q': return CMD_QUAFF;
    case 'r': return CMD_READ;
    case 's': return CMD_SEARCH;
    case 't': return CMD_SHOUT;
    case 'v': return CMD_EVOKE;
    case 'w': return CMD_WIELD_WEAPON;
    case 'x': return CMD_LOOK_AROUND;
    case 'z': return CMD_CAST_SPELL;
    case 'B': return CMD_RUN_DOWN_LEFT;
    case 'H': return CMD_RUN_LEFT;
    case 'J': return CMD_RUN_DOWN;
    case 'K': return CMD_RUN_UP;
    case 'L': return CMD_RUN_RIGHT;
    case 'N': return CMD_RUN_DOWN_RIGHT;
    case 'U': return CMD_RUN_UP_RIGHT;
    case 'Y': return CMD_RUN_UP_LEFT;

Replacement in crawl-ref/source/acr.cc at line 3413 [9.4397395]

B:BD[7.1273792] → [7.1273792:1273836]

B:BD[7.1273836] → [35.16389:16426]

B:BD[35.16426] → [36.7739:7772]

∅:D[36.7772] → [35.16426:16469]

B:BD[35.16426] → [35.16426:16469]

B:BD[35.16469] → [37.9911:9958]

B:BD[37.9958] → [5.3209:3232]

∅:D[5.3232] → [38.4359:4403]

B:BD[37.9958] → [38.4359:4403]

∅:D[39.2855] → [40.1063:1104]

∅:D[41.3070] → [40.1063:1104]

∅:D[38.4403] → [40.1063:1104]

B:BD[7.1274011] → [40.1063:1104]

∅:D[40.1104] → [7.1274044:1274085]

B:BD[7.1274044] → [7.1274044:1274085]

B:BD[7.1274085] → [35.16470:16506]

∅:D[35.16506] → [7.1274127:1274168]

B:BD[7.1274127] → [7.1274127:1274168]

B:BD[7.1274168] → [42.3126:3164]

∅:D[42.3164] → [7.1274199:1274318]

B:BD[7.1274199] → [7.1274199:1274318]

B:BD[7.1274318] → [38.4404:4440]

∅:D[38.4440] → [7.1274356:1274432]

∅:D[43.10610] → [7.1274356:1274432]

B:BD[7.1274356] → [7.1274356:1274432]

B:BD[7.1274432] → [35.16507:16542]

∅:D[35.16542] → [7.1274469:1274748]

B:BD[7.1274469] → [7.1274469:1274748]

B:BD[7.1274748] → [44.14054:14094]

∅:D[45.2641] → [7.1274748:1274788]

∅:D[44.14094] → [7.1274748:1274788]

∅:D[46.16987] → [7.1274748:1274788]

B:BD[7.1274748] → [7.1274748:1274788]

B:BD[7.1274820] → [7.1274820:1274990]

B:BD[7.1274990] → [35.16543:16584]

B:BD[35.16584] → [3.2733:2756]

∅:D[3.2756] → [7.1274990:1275178]

∅:D[47.2859] → [7.1274990:1275178]

∅:D[35.16584] → [7.1274990:1275178]

B:BD[7.1274990] → [7.1274990:1275178]

B:BD[7.1275178] → [48.3980:4021]

B:BD[48.4021] → [49.5127:5174]

∅:D[48.4021] → [7.1275216:1275255]

∅:D[49.5174] → [7.1275216:1275255]

B:BD[7.1275216] → [7.1275216:1275255]

B:BD[7.1275294] → [7.1275294:1275382]

B:BD[7.1275382] → [10.31316:31357]

∅:D[10.31357] → [7.1275382:1275383]

B:BD[7.1275382] → [7.1275382:1275383]

B:BD[7.1275383] → [10.31358:31395]

∅:D[10.31395] → [50.2426:2457]

B:BD[7.1275416] → [50.2426:2457]

∅:D[50.2457] → [7.1276106:1276623]

B:BD[7.1276106] → [7.1276106:1276623]

B:BD[7.1276665] → [7.1276665:1276763]

∅:D[41.3124] → [39.2856:2921]

∅:D[42.3210] → [39.2856:2921]

B:BD[7.1276763] → [39.2856:2921]

∅:D[39.2921] → [36.7881:7948]

B:BD[36.7881] → [36.7881:7948]

∅:D[36.7948] → [35.16585:16636]

B:BD[7.1276900] → [35.16585:16636]

∅:D[35.16636] → [7.1276943:1276994]

B:BD[7.1276943] → [7.1276943:1276994]

B:BD[7.1276994] → [42.3211:3251]

∅:D[42.3251] → [7.1277036:1277131]

∅:D[16.5938939] → [7.1277036:1277131]

B:BD[7.1277036] → [7.1277036:1277131]

B:BD[7.1277131] → [51.9500:9558]

B:BD[42.3320] → [42.3320:3362]

∅:D[42.3369] → [7.1277235:1277380]

B:BD[7.1277235] → [7.1277235:1277380]

B:BD[7.1277380] → [52.29202:29300]

∅:D[52.29300] → [7.1277380:1277412]

B:BD[7.1277380] → [7.1277380:1277412]

    case 'A': return CMD_DISPLAY_MUTATIONS;
    case 'C': return CMD_CLOSE_DOOR;
    case 'D': return CMD_NO_CMD;
    case 'E': return CMD_EXPERIENCE_CHECK;
    case 'F': return CMD_THROW_ITEM_NO_QUIVER;
    case CONTROL('G'):
    case 'G': return CMD_INTERLEVEL_TRAVEL;
    case 'I': return CMD_DISPLAY_SPELLS;
    case 'M': return CMD_MEMORISE_SPELL;
    case 'O': return CMD_OPEN_DOOR;
    case 'P': return CMD_WEAR_JEWELLERY;
    case 'Q': return CMD_QUIVER_ITEM;
    case 'R': return CMD_REMOVE_JEWELLERY;
    case 'S': return CMD_SAVE_GAME;
    case 'T': return CMD_REMOVE_ARMOUR;
    case 'V': return CMD_FULL_VIEW;
    case 'W': return CMD_WEAR_ARMOUR;
    case 'X': return CMD_DISPLAY_MAP;
    case 'Z': return CMD_ZAP_WAND;
    case '.': return CMD_MOVE_NOWHERE;
    case '<': return CMD_GO_UPSTAIRS;
    case '>': return CMD_GO_DOWNSTAIRS;
    case '@': return CMD_DISPLAY_CHARACTER_STATUS;
    case '%': return CMD_RESISTS_SCREEN;
    case ',': return CMD_PICKUP;
    case ':': return CMD_MAKE_NOTE;
    case '_': return CMD_READ_MESSAGES;
    case ';': return CMD_INSPECT_FLOOR;
    case '^': return CMD_DISPLAY_RELIGION;
    case '#': return CMD_CHARACTER_DUMP;
    case '=': return CMD_ADJUST_INVENTORY;
    case '?': return CMD_DISPLAY_COMMANDS;
    case '!': return CMD_ANNOTATE_LEVEL;
    case CONTROL('D'):
    case '~': return CMD_MACRO_ADD;
    case '&': return CMD_WIZARD;
    case '"': return CMD_LIST_JEWELLERY;
    case '{': return CMD_INSCRIBE_ITEM;
    case '[': return CMD_LIST_ARMOUR;
    case ']': return CMD_LIST_EQUIPMENT;
    case '(': return CMD_CYCLE_QUIVER_FORWARD;
    case ')': return CMD_LIST_WEAPONS;
    case '\\': return CMD_DISPLAY_KNOWN_OBJECTS;
    case '\'': return CMD_WEAPON_SWAP;
    case '`': return CMD_PREV_CMD_AGAIN;
    case '0': return CMD_REPEAT_CMD;
    case '5': return CMD_REST;
    case CONTROL('B'): return CMD_OPEN_DOOR_DOWN_LEFT;
    case CONTROL('H'): return CMD_OPEN_DOOR_LEFT;
    case CONTROL('J'): return CMD_OPEN_DOOR_DOWN;
    case CONTROL('K'): return CMD_OPEN_DOOR_UP;
    case CONTROL('L'): return CMD_OPEN_DOOR_RIGHT;
    case CONTROL('N'): return CMD_OPEN_DOOR_DOWN_RIGHT;
    case CONTROL('U'): return CMD_OPEN_DOOR_UP_LEFT;
    case CONTROL('Y'): return CMD_OPEN_DOOR_UP_RIGHT;
    case CONTROL('A'): return CMD_TOGGLE_AUTOPICKUP;
    case CONTROL('C'): return CMD_CLEAR_MAP;
    case CONTROL('E'): return CMD_FORGET_STASH;
    case CONTROL('F'): return CMD_SEARCH_STASHES;
    case CONTROL('I'): return CMD_NO_CMD; // Tab on most systems
    case CONTROL('M'): return CMD_NO_CMD; // Enter on most systems
    case CONTROL('O'): return CMD_DISPLAY_OVERMAP;
    case CONTROL('P'): return CMD_REPLAY_MESSAGES;
    case CONTROL('Q'): return CMD_QUIT;
    case CONTROL('R'): return CMD_REDRAW_SCREEN;
    case CONTROL('S'): return CMD_MARK_STASH;
    case CONTROL('T'): return CMD_TOGGLE_FRIENDLY_PICKUP;
    case CONTROL('V'): return CMD_NO_CMD;
    case CONTROL('W'): return CMD_FIX_WAYPOINT;
    case CONTROL('X'): return CMD_SAVE_GAME_NOW;
    case CONTROL('Z'): return CMD_SUSPEND_GAME;
    case CK_MOUSE_MOVE:  return CMD_MOUSE_MOVE;
    case CK_MOUSE_CLICK: return CMD_MOUSE_CLICK;
    default: return CMD_NO_CMD;

[7.1273792]

[7.1277613]

    default:
        return key_to_command(key, KC_DEFAULT);

Replacement in crawl-ref/settings/init.txt at line 13 [9.4830895]
∅:D[15.3057] → [53.2835:2884]
B:BD[53.2835] → [53.2835:2884]
```
# additional_macro_file   = 034_command_keys.txt
```
[15.3057]
[54.4528]
```
# inlcude                 = 034_command_keys.txt
```

Replacement in crawl-ref/settings/034_command_keys.txt at line 1 [55.3285]

B:BD[55.3285] → [55.3286:3359]

# This file contains macros for using 0.3.4 command keys instead of the

[55.3285]

[55.3359]

# This file keybinds for using 0.3.4 command keys instead of the

Replacement in crawl-ref/settings/034_command_keys.txt at line 5 [55.3285]
B:BD[55.3446] → [55.3446:3498]
```
# : crawl.read_options('docs/034_command_keys.txt')
```
[55.3446]
[55.3498]
```
# include = 034_keybindings.txt
```

Replacement in crawl-ref/settings/034_command_keys.txt at line 8 [55.3285]

B:BD[55.3569] → [55.3569:3641]

∅:D[56.2847] → [55.3641:3850]

B:BD[55.3641] → [55.3641:3850]

# get the same functionality by pressing the item slot in the inventor.
# annotate level (Ctrl-I)
M:\{9}
A:!
# auto-explore (Ctrl-O)
M:\{15}
A:o
# shout/tell allies
M:!
A:t
# experience information
M:C
A:E
# evoke
M:E
A:v
# dungeon overview
M:O
A:\{15}
# cast spell
M:Z
A:z

[55.3569]

[55.3850]

# get the same functionality by pressing the item slot while looking at
# you inventory.

Replacement in crawl-ref/settings/034_command_keys.txt at line 11 [55.3285]

B:BD[55.3851] → [55.3851:3950]

# close door
M:c
A:C
# open door
M:o
A:O
# throw
M:t
A:fi
# zap wand
M:z
A:Z
# butcher
M:D
A:c

[55.3851]

bindkey = [^I] CMD_ANNOTATE_LEVEL
bindkey = [^O] CMD_EXPLORE
bindkey = [!]  CMD_SHOUT
bindkey = [C]  CMD_EXPERIENCE_CHECK
bindkey = [E]  CMD_EVOKE
bindkey = [O]  CMD_DISPLAY_OVERMAP
bindkey = [Z]  CMD_CAST_SPELL
bindkey = [z]  CMD_ZAP_WAND
bindkey = [c]  CMD_CLOSE_DOOR
bindkey = [o]  CMD_OPEN_DOOR
bindkey = [D]  CMD_BUTCHER
bindkey = [t]  CMD_FIRE

Replacement in crawl-ref/docs/options_guide.txt at line 85 [58.63392]

B:BD[57.3493] → [57.3493:3549]

                macro_meta_entry, additional_macro_file

[57.3493]

[16.5939611]

                macro_meta_entry, additional_macro_file, bindkey

Insertion in crawl-ref/docs/options_guide.txt at line 1474 [58.63392]

[57.4135]

[59.35512]


bindkey = [^D] CMD_BUTCHER
        Change which key invokes which command at a lower level of
        operation than macros.  Useful in that macros cannot (yet)
        invoke each other, but a macro can invoke a command whose
        key has changed.

Replacement in crawl-ref/docs/034_changes.txt at line 71 [61.2781]
B:BD[60.7629] → [60.7629:7679]
```
   additional_macro_file   = 034_command_keys.txt
```
[60.7629]
[60.7679]
```
   include                 = 034_command_keys.txt
```

Do "keypress -> command_type" via keybindings. Solves bug 2018200,

Dependencies

In channels

Change contents

File addition: cmd-name.pl (---x------)

Insertion in crawl-ref/source/macro.h at line 32 [9.2456702]

Insertion in crawl-ref/source/macro.h at line 92 [9.2456702]

Insertion in crawl-ref/source/macro.cc at line 70 [9.2457534]

Insertion in crawl-ref/source/macro.cc at line 85 [9.2457534]

Insertion in crawl-ref/source/macro.cc at line 1029 [9.2457534]

Insertion in crawl-ref/source/macro.cc at line 1088 [9.2457534]

Insertion in crawl-ref/source/initfile.cc at line 39 [9.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1698 [9.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1765 [9.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1895 [9.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2951 [9.2957258]

Insertion in crawl-ref/source/enum.h at line 516 [9.3287960]

Insertion in crawl-ref/source/enum.h at line 527 [9.3287960]

Insertion in crawl-ref/source/enum.h at line 569 [9.3287960]

Insertion in crawl-ref/source/enum.h at line 574 [9.3287960]

Insertion in crawl-ref/source/enum.h at line 624 [9.3287960]

Insertion in crawl-ref/source/enum.h at line 628 [9.3287960]

Insertion in crawl-ref/source/enum.h at line 631 [9.3287960]

Insertion in crawl-ref/source/enum.h at line 636 [9.3287960]

Deletion in crawl-ref/source/enum.h at line 642 [9.3287960]

Replacement in crawl-ref/source/enum.h at line 644 [9.3287960]

Deletion in crawl-ref/source/directn.cc at line 2711 [9.3697945]

Deletion in crawl-ref/source/directn.cc at line 2712 [9.3697945]

Replacement in crawl-ref/source/directn.cc at line 2713 [9.3697945]

Replacement in crawl-ref/source/directn.cc at line 2718 [9.3697945]

File addition: cmd-name.h (----------)

File addition: cmd-keys.h (----------)

Insertion in crawl-ref/source/acr.cc at line 220 [9.4397395]

Replacement in crawl-ref/source/acr.cc at line 3399 [9.4397395]

Deletion in crawl-ref/source/acr.cc at line 3406 [9.4397395]