diff options
-rw-r--r-- | crawl-ref/source/cmd-keys.h | 11 | ||||
-rw-r--r-- | crawl-ref/source/tilesdl.cc | 3 |
2 files changed, 13 insertions, 1 deletions
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: |