devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make clix more usable on touchscreen targets

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21837 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-07-13 12:16:06 +00:00
parent b5b9cb031d
commit c039d39a56
1 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

53
apps/plugins/clix.c
View file

@ -139,31 +139,20 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == COWOND2_PAD #elif CONFIG_KEYPAD == COWOND2_PAD
#define CLIX_BUTTON_QUIT BUTTON_POWER #define CLIX_BUTTON_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \ #elif (CONFIG_KEYPAD == ONDAVX747_PAD)
(CONFIG_KEYPAD == MROBE500_PAD) #define CLIX_BUTTON_QUIT BUTTON_POWER
#define CLIX_BUTTON_CLICK BUTTON_MENU
#elif (CONFIG_KEYPAD == MROBE500_PAD)
#define CLIX_BUTTON_QUIT BUTTON_POWER #define CLIX_BUTTON_QUIT BUTTON_POWER
#else #else
#error "no keymap" #error "no keymap"
#endif #endif
#ifdef HAVE_TOUCHSCREEN
#ifndef CLIX_BUTTON_LEFT
#define CLIX_BUTTON_LEFT BUTTON_MIDLEFT
#endif
#ifndef CLIX_BUTTON_RIGHT
#define CLIX_BUTTON_RIGHT BUTTON_MIDRIGHT
#endif
#ifndef CLIX_BUTTON_CLICK #ifndef CLIX_BUTTON_CLICK
#define CLIX_BUTTON_CLICK BUTTON_CENTER #define CLIX_BUTTON_CLICK BUTTON_CENTER
#endif #endif
#ifndef CLIX_BUTTON_UP
#define CLIX_BUTTON_UP BUTTON_TOPMIDDLE
#endif
#ifndef CLIX_BUTTON_DOWN
#define CLIX_BUTTON_DOWN BUTTON_BOTTOMMIDDLE
#endif
#endif
#define HIGHSCORE_FILE PLUGIN_GAMES_DIR "/clix.score" #define HIGHSCORE_FILE PLUGIN_GAMES_DIR "/clix.score"
#define NUM_SCORES 5 #define NUM_SCORES 5
@ -717,8 +706,36 @@ static int clix_handle_game(struct clix_game_state_t* state)
rb->button_get_w_tmo(end - *rb->current_tick); rb->button_get_w_tmo(end - *rb->current_tick);
button = rb->button_status(); button = rb->button_status();
rb->button_clear_queue(); rb->button_clear_queue();
#ifdef HAVE_TOUCHSCREEN
if(button & BUTTON_TOUCHSCREEN)
{
int x = rb->button_get_data() >> 16;
int y = rb->button_get_data() & 0xffff;
x -= XOFS;
y -= YOFS;
if(x >= 0 && y >= 0)
{
x /= CELL_SIZE + 1;
y /= CELL_SIZE + 1;
if(x < BOARD_WIDTH && y < BOARD_HEIGHT
&& state->board[XYPOS(x, y)] != CC_BLACK)
{
if(state->x == x && state->y == y)
button = CLIX_BUTTON_CLICK;
else
{
state->x = x;
state->y = y;
}
}
}
}
#endif
switch( button) switch( button)
{ {
#ifndef HAVE_TOUCHSCREEN
#ifdef CLIX_BUTTON_SCROLL_BACK #ifdef CLIX_BUTTON_SCROLL_BACK
case CLIX_BUTTON_SCROLL_BACK: case CLIX_BUTTON_SCROLL_BACK:
#endif #endif
@ -761,6 +778,7 @@ static int clix_handle_game(struct clix_game_state_t* state)
clix_move_cursor(state, true); clix_move_cursor(state, true);
break; break;
#endif
case CLIX_BUTTON_CLICK: case CLIX_BUTTON_CLICK:
{ {
if (state->selected_count > 1) { if (state->selected_count > 1) {
@ -840,6 +858,9 @@ enum plugin_status plugin_start(const void* parameter)
rb->lcd_set_foreground(LCD_WHITE); rb->lcd_set_foreground(LCD_WHITE);
rb->lcd_set_background(LCD_BLACK); rb->lcd_set_background(LCD_BLACK);
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
#ifdef HAVE_TOUCHSCREEN
rb->touchscreen_set_mode(TOUCHSCREEN_POINT);
#endif
highscore_load(HIGHSCORE_FILE, highest, NUM_SCORES); highscore_load(HIGHSCORE_FILE, highest, NUM_SCORES);