From 5ead207060a3e1f74ad6200fdf02934457394bc2 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 13 Sep 2008 18:26:53 +0000 Subject: Patch from James H to centralise some generally useful cursor- handling functionality into misc.c. [originally from svn r8176] --- samegame.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'samegame.c') diff --git a/samegame.c b/samegame.c index 8976ad4..2b77c26 100644 --- a/samegame.c +++ b/samegame.c @@ -1277,8 +1277,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, if (button == RIGHT_BUTTON || button == LEFT_BUTTON) { tx = FROMCOORD(x); ty= FROMCOORD(y); - } else if (button == CURSOR_UP || button == CURSOR_DOWN || - button == CURSOR_LEFT || button == CURSOR_RIGHT) { + } else if (IS_CURSOR_MOVE(button)) { int dx = 0, dy = 0; ui->displaysel = 1; dx = (button == CURSOR_LEFT) ? -1 : ((button == CURSOR_RIGHT) ? +1 : 0); @@ -1286,8 +1285,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, ui->xsel = (ui->xsel + state->params.w + dx) % state->params.w; ui->ysel = (ui->ysel + state->params.h + dy) % state->params.h; return ret; - } else if (button == CURSOR_SELECT || button == ' ' || button == '\r' || - button == '\n') { + } else if (IS_CURSOR_SELECT(button)) { ui->displaysel = 1; tx = ui->xsel; ty = ui->ysel; @@ -1299,7 +1297,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds, if (COL(state, tx, ty) == 0) return NULL; if (ISSEL(ui,tx,ty)) { - if (button == RIGHT_BUTTON) + if (button == RIGHT_BUTTON || button == CURSOR_SELECT2) sel_clear(ui, state); else ret = sel_movedesc(ui, state); -- cgit v1.1