maride/tty-solitaire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encapsulated behaviour into cursor_direction().

Browse Source
This commit is contained in:
Murilo Pereira 2011-06-06 22:06:10 -03:00
parent 977c80b91e
commit 6588525e8e
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cursor.c
View File

@ -3,6 +3,7 @@
#include <malloc.h> #include <malloc.h>
#include <errno.h> #include <errno.h>
#include <ncurses.h> #include <ncurses.h>
#include <assert.h>
#include "cursor.h" #include "cursor.h"
#include "game.h" #include "game.h"
@ -90,3 +91,24 @@ void cursor_move(struct cursor *cursor, enum movement movement) {
break; break;
} }
} }
enum movement cursor_direction(int key) {
switch (key) {
case 'h':
case KEY_LEFT:
return(LEFT);
case 'j':
case KEY_DOWN:
return(DOWN);
case 'k':
case KEY_UP:
return(UP);
case 'l':
case KEY_RIGHT:
return(RIGHT);
default:
endwin();
game_end();
assert(false && "invalid cursor direction");
}
}

1
src/cursor.h
View File

@ -41,5 +41,6 @@ void cursor_free(struct cursor *);
void cursor_mark(struct cursor *); void cursor_mark(struct cursor *);
void cursor_unmark(struct cursor *); void cursor_unmark(struct cursor *);
void cursor_move(struct cursor *, enum movement); void cursor_move(struct cursor *, enum movement);
enum movement cursor_direction(int);
#endif #endif

40
src/keyboard.c
View File

@ -105,27 +105,15 @@ static void handle_card_movement(struct cursor *cursor) {
while (1) { while (1) {
switch (option = getch()) { switch (option = getch()) {
case 'h': case 'h':
case KEY_LEFT:
erase_cursor(cursor);
cursor_move(cursor, LEFT);
draw_cursor(cursor);
break;
case 'j': case 'j':
case KEY_DOWN:
erase_cursor(cursor);
cursor_move(cursor, DOWN);
draw_cursor(cursor);
break;
case 'k': case 'k':
case KEY_UP:
erase_cursor(cursor);
cursor_move(cursor, UP);
draw_cursor(cursor);
break;
case 'l': case 'l':
case KEY_LEFT:
case KEY_DOWN:
case KEY_UP:
case KEY_RIGHT: case KEY_RIGHT:
erase_cursor(cursor); erase_cursor(cursor);
cursor_move(cursor, RIGHT); cursor_move(cursor, cursor_direction(option));
draw_cursor(cursor); draw_cursor(cursor);
break; break;
case 'm': case 'm':
@ -227,27 +215,15 @@ static void handle_card_movement(struct cursor *cursor) {
void handle_keyboard_event(int key) { void handle_keyboard_event(int key) {
switch (key) { switch (key) {
case 'h': case 'h':
case KEY_LEFT:
erase_cursor(cursor);
cursor_move(cursor, LEFT);
draw_cursor(cursor);
break;
case 'j': case 'j':
case KEY_DOWN:
erase_cursor(cursor);
cursor_move(cursor, DOWN);
draw_cursor(cursor);
break;
case 'k': case 'k':
case KEY_UP:
erase_cursor(cursor);
cursor_move(cursor, UP);
draw_cursor(cursor);
break;
case 'l': case 'l':
case KEY_LEFT:
case KEY_DOWN:
case KEY_UP:
case KEY_RIGHT: case KEY_RIGHT:
erase_cursor(cursor); erase_cursor(cursor);
cursor_move(cursor, RIGHT); cursor_move(cursor, cursor_direction(key));
draw_cursor(cursor); draw_cursor(cursor);
break; break;
case KEY_SPACEBAR: case KEY_SPACEBAR: