Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make clix playable on ipod by fixing keymap (so up doesn't quit), button repeat logic (so holding down select doesn't repeatedly fire select events), and not clearing button queue so repeat/release events get detected

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21951 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Hooper 2009-07-18 12:33:13 +00:00
parent 17b8805b49
commit e5472c91cc
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/plugins/clix.c
View file

@ -65,10 +65,14 @@ PLUGIN_HEADER
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
(CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD)
#define CLIX_BUTTON_QUIT BUTTON_MENU
#define CLIX_BUTTON_UP BUTTON_SCROLL_BACK
#define CLIX_BUTTON_DOWN BUTTON_SCROLL_FWD
#define CLIX_BUTTON_CLICK BUTTON_SELECT
#define CLIX_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU)
#define CLIX_BUTTON_UP BUTTON_MENU
#define CLIX_BUTTON_DOWN BUTTON_PLAY
#define CLIX_BUTTON_SCROLL_FWD BUTTON_SCROLL_FWD
#define CLIX_BUTTON_SCROLL_BACK BUTTON_SCROLL_BACK
#define CLIX_BUTTON_CLICK (BUTTON_SELECT | BUTTON_REL)
#define CLIX_BUTTON_CLICK_PRE BUTTON_SELECT
#define CLIX_BUTTON_CLICK_PRE2 (BUTTON_SELECT | BUTTON_REPEAT)
#define CLIX_BUTTON_RIGHT BUTTON_RIGHT
#define CLIX_BUTTON_LEFT BUTTON_LEFT
@ -695,6 +699,8 @@ static int clix_handle_game(struct clix_game_state_t* state)
int end;
int oldx, oldy;
int lastbutton = BUTTON_NONE;
while(true)
{
if (blink_tick < *rb->current_tick) {
@ -710,9 +716,7 @@ static int clix_handle_game(struct clix_game_state_t* state)
oldx = state->x;
oldy = state->y;
rb->button_get_w_tmo(end - *rb->current_tick);
button = rb->button_status();
rb->button_clear_queue();
button = rb->button_get_w_tmo(end - *rb->current_tick);
#ifdef HAVE_TOUCHSCREEN
if(button & BUTTON_TOUCHSCREEN)
{
@ -745,6 +749,7 @@ static int clix_handle_game(struct clix_game_state_t* state)
#ifndef HAVE_TOUCHSCREEN
#ifdef CLIX_BUTTON_SCROLL_BACK
case CLIX_BUTTON_SCROLL_BACK:
case CLIX_BUTTON_SCROLL_BACK|BUTTON_REPEAT:
#endif
case CLIX_BUTTON_UP:
if( state->y == 0 ||
@ -767,6 +772,7 @@ static int clix_handle_game(struct clix_game_state_t* state)
break;
#ifdef CLIX_BUTTON_SCROLL_FWD
case CLIX_BUTTON_SCROLL_FWD:
case CLIX_BUTTON_SCROLL_FWD|BUTTON_REPEAT:
#endif
case CLIX_BUTTON_DOWN:
if( state->y == (BOARD_HEIGHT - 1))
@ -788,6 +794,15 @@ static int clix_handle_game(struct clix_game_state_t* state)
#endif
case CLIX_BUTTON_CLICK:
{
#ifdef CLIX_BUTTON_CLICK_PRE
#ifdef CLIX_BUTTON_CLICK_PRE2
if (lastbutton != CLIX_BUTTON_CLICK_PRE
&& lastbutton != CLIX_BUTTON_CLICK_PRE2)
#else
if (lastbutton != CLIX_BUTTON_CLICK_PRE)
#endif
break;
#endif
if (state->selected_count > 1) {
switch( clix_clear_selected( state))
{
@ -843,6 +858,9 @@ static int clix_handle_game(struct clix_game_state_t* state)
break;
}
if(button != BUTTON_NONE)
lastbutton = button;
if( (oldx != state->x || oldy != state->y) &&
state->board_selected[ XYPOS( oldx, oldy)] !=
state->board_selected[ XYPOS( state->x, state->y)]