diff options
| -rw-r--r-- | crawl-ref/source/cio.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/cmd-keys.h | 34 | ||||
| -rw-r--r-- | crawl-ref/source/libgui.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 17 | ||||
| -rw-r--r-- | crawl-ref/source/tilesdl.h | 1 |
5 files changed, 49 insertions, 13 deletions
diff --git a/crawl-ref/source/cio.h b/crawl-ref/source/cio.h index fdc6254dca..27f31570aa 100644 --- a/crawl-ref/source/cio.h +++ b/crawl-ref/source/cio.h @@ -194,8 +194,6 @@ enum KEYS CK_MOUSE_B3, CK_MOUSE_B4, CK_MOUSE_B5, - CK_MOUSE_B1ITEM, - CK_MOUSE_B2ITEM, CK_MOUSE_CLICK }; diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h index abe9c486ff..041daef752 100644 --- a/crawl-ref/source/cmd-keys.h +++ b/crawl-ref/source/cmd-keys.h @@ -9,6 +9,14 @@ {'n', CMD_MOVE_DOWN_RIGHT}, {'u', CMD_MOVE_UP_RIGHT}, {'y', CMD_MOVE_UP_LEFT}, +{CK_END, CMD_MOVE_DOWN_LEFT}, +{CK_LEFT, CMD_MOVE_LEFT}, +{CK_DOWN, CMD_MOVE_DOWN}, +{CK_UP, CMD_MOVE_UP}, +{CK_RIGHT, CMD_MOVE_RIGHT}, +{CK_PGDN, CMD_MOVE_DOWN_RIGHT}, +{CK_PGUP, CMD_MOVE_UP_RIGHT}, +{CK_HOME, CMD_MOVE_UP_LEFT}, {'a', CMD_USE_ABILITY}, {'c', CMD_BUTCHER}, {'d', CMD_DROP}, @@ -35,6 +43,14 @@ {'N', CMD_RUN_DOWN_RIGHT}, {'U', CMD_RUN_UP_RIGHT}, {'Y', CMD_RUN_UP_LEFT}, +{CK_SHIFT_END, CMD_RUN_DOWN_LEFT}, +{CK_SHIFT_LEFT, CMD_RUN_LEFT}, +{CK_SHIFT_DOWN, CMD_RUN_DOWN}, +{CK_SHIFT_UP, CMD_RUN_UP}, +{CK_SHIFT_RIGHT, CMD_RUN_RIGHT}, +{CK_SHIFT_PGDN, CMD_RUN_DOWN_RIGHT}, +{CK_SHIFT_PGUP, CMD_RUN_UP_RIGHT}, +{CK_SHIFT_HOME, CMD_RUN_UP_LEFT}, {'A', CMD_DISPLAY_MUTATIONS}, {'C', CMD_CLOSE_DOOR}, {'E', CMD_EXPERIENCE_CHECK}, @@ -82,6 +98,7 @@ {'\'', CMD_WEAPON_SWAP}, {'`', CMD_PREV_CMD_AGAIN}, {'0', CMD_REPEAT_CMD}, +{CK_INSERT, CMD_REPEAT_CMD}, {'5', CMD_REST}, {CONTROL('B'), CMD_OPEN_DOOR_DOWN_LEFT}, {CONTROL('H'), CMD_OPEN_DOOR_LEFT}, @@ -145,6 +162,14 @@ {'n', CMD_TARGET_DOWN_RIGHT}, {'u', CMD_TARGET_UP_RIGHT}, {'y', CMD_TARGET_UP_LEFT}, +{CK_END, CMD_TARGET_DOWN_LEFT}, +{CK_LEFT, CMD_TARGET_LEFT}, +{CK_DOWN, CMD_TARGET_DOWN}, +{CK_UP, CMD_TARGET_UP}, +{CK_RIGHT, CMD_TARGET_RIGHT}, +{CK_PGDN, CMD_TARGET_DOWN_RIGHT}, +{CK_PGUP, CMD_TARGET_UP_RIGHT}, +{CK_HOME, CMD_TARGET_UP_LEFT}, {'B', CMD_TARGET_DIR_DOWN_LEFT}, {'H', CMD_TARGET_DIR_LEFT}, {'J', CMD_TARGET_DIR_DOWN}, @@ -153,10 +178,17 @@ {'N', CMD_TARGET_DIR_DOWN_RIGHT}, {'U', CMD_TARGET_DIR_UP_RIGHT}, {'Y', CMD_TARGET_DIR_UP_LEFT}, +{CK_SHIFT_END, CMD_TARGET_DIR_DOWN_LEFT}, +{CK_SHIFT_LEFT, CMD_TARGET_DIR_LEFT}, +{CK_SHIFT_DOWN, CMD_TARGET_DIR_DOWN}, +{CK_SHIFT_UP, CMD_TARGET_DIR_UP}, +{CK_SHIFT_RIGHT, CMD_TARGET_DIR_RIGHT}, +{CK_SHIFT_PGDN, CMD_TARGET_DIR_DOWN_RIGHT}, +{CK_SHIFT_PGUP, CMD_TARGET_DIR_UP_RIGHT}, +{CK_SHIFT_HOME, CMD_TARGET_DIR_UP_LEFT}, {CK_MOUSE_MOVE, CMD_MOUSE_MOVE}, {CK_MOUSE_CLICK, CMD_MOUSE_CLICK}, - {CK_MOUSE_MOVE, CMD_TARGET_MOUSE_MOVE}, {CK_MOUSE_CLICK, CMD_TARGET_MOUSE_SELECT}, diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc index 0d6d2b2b8e..d0e3414578 100644 --- a/crawl-ref/source/libgui.cc +++ b/crawl-ref/source/libgui.cc @@ -310,14 +310,14 @@ void window(int x1, int y1, int x2, int y2) { } -int getch() +int getch_ck() { - return (tiles.getch()); + return (tiles.getch_ck()); } -int getch_ck() +int getch() { - return (tiles.getch_ck()); + return getch_ck(); } void clrscr() diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 4cc1f9c12a..c9826cd327 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -366,24 +366,36 @@ static int _translate_keysym(SDL_keysym &keysym) case SDLK_DELETE: return CK_DELETE; + case SDLK_KP5: + return '5'; + + case SDLK_KP8: case SDLK_UP: return CK_UP + offset; + case SDLK_KP2: case SDLK_DOWN: return CK_DOWN + offset; + case SDLK_KP4: case SDLK_LEFT: return CK_LEFT + offset; + case SDLK_KP6: case SDLK_RIGHT: return CK_RIGHT + offset; + case SDLK_KP0: case SDLK_INSERT: return CK_INSERT + offset; + case SDLK_KP7: case SDLK_HOME: return CK_HOME + offset; + case SDLK_KP1: case SDLK_END: return CK_END + offset; case SDLK_CLEAR: return CK_CLEAR + offset; + case SDLK_KP9: case SDLK_PAGEUP: return CK_PGUP + offset; + case SDLK_KP3: case SDLK_PAGEDOWN: return CK_PGDN + offset; default: @@ -394,11 +406,6 @@ static int _translate_keysym(SDL_keysym &keysym) return is_ascii ? keysym.unicode & 0x7F : 0; } -int TilesFramework::getch() -{ - // TODO enne - is there really a difference between these two functions?? - return getch_ck(); -} int TilesFramework::handle_mouse(MouseEvent &event) { diff --git a/crawl-ref/source/tilesdl.h b/crawl-ref/source/tilesdl.h index 0d43c16990..5bfe1e998e 100644 --- a/crawl-ref/source/tilesdl.h +++ b/crawl-ref/source/tilesdl.h @@ -90,7 +90,6 @@ public: void shutdown(); void load_dungeon(unsigned int *tileb, int gx, int gy); void load_dungeon(int gx, int gy); - int getch(); int getch_ck(); void resize(); void clrscr(); |