len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove SCROLL_WHEEL and use HAVE_SCROLLWHEEL instead. This also activates the little protection against accidental rotations (by pressing buttons on or near the wheel) on e200 and fuze, which is good. Also add a secondary button for right rotation for e200 and fuze, and use home button on the fuze.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20113 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-02-26 20:52:16 +00:00
parent bb45f0ea6c
commit 19f3d60cc0
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/plugins/rockblox.c
View file

@ -41,8 +41,6 @@ PLUGIN_HEADER
#define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY)
#define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL)
#define SCROLL_WHEEL
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD) (CONFIG_KEYPAD == IRIVER_H300_PAD)
@ -116,6 +114,7 @@ PLUGIN_HEADER
#define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP
#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
#define ROCKBLOX_DOWN BUTTON_DOWN #define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_LEFT BUTTON_LEFT
@ -127,14 +126,13 @@ PLUGIN_HEADER
#define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_OFF BUTTON_POWER
#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP
#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
#define ROCKBLOX_DOWN BUTTON_DOWN #define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_RIGHT BUTTON_RIGHT
#define ROCKBLOX_DROP BUTTON_SELECT #define ROCKBLOX_DROP BUTTON_SELECT
/* TODO: #define ROCKBLOX_RESTART BUTTON_HOME
#define ROCKBLOX_RESTART BUTTON_HOME */
#define ROCKBLOX_RESTART BUTTON_SELECT|BUTTON_DOWN
#elif CONFIG_KEYPAD == SANSA_C200_PAD #elif CONFIG_KEYPAD == SANSA_C200_PAD
@ -584,7 +582,7 @@ static bool gameover = false;
static int lines = 0, level = 0, score = 0, cx, cy, cf, co, nf; static int lines = 0, level = 0, score = 0, cx, cy, cf, co, nf;
static short board[BOARD_HEIGHT][BOARD_WIDTH]; /* 20 rows of 10 blocks */ static short board[BOARD_HEIGHT][BOARD_WIDTH]; /* 20 rows of 10 blocks */
#ifdef SCROLL_WHEEL #ifdef HAVE_SCROLLWHEEL
int wheel_events = 0, last_wheel_event = 0; int wheel_events = 0, last_wheel_event = 0;
bool wheel_enabled = false; bool wheel_enabled = false;
#endif #endif
@ -1110,7 +1108,7 @@ static int rockblox_loop (void)
#endif #endif
case ROCKBLOX_ROTATE_RIGHT: case ROCKBLOX_ROTATE_RIGHT:
case ROCKBLOX_ROTATE_RIGHT | BUTTON_REPEAT: case ROCKBLOX_ROTATE_RIGHT | BUTTON_REPEAT:
#ifdef SCROLL_WHEEL #ifdef HAVE_SCROLLWHEEL
/* if the wheel is disabled, add an event to the stack. */ /* if the wheel is disabled, add an event to the stack. */
if(wheel_enabled == false) if(wheel_enabled == false)
wheel_events++; wheel_events++;
@ -1123,7 +1121,7 @@ static int rockblox_loop (void)
case ROCKBLOX_ROTATE_LEFT: case ROCKBLOX_ROTATE_LEFT:
case ROCKBLOX_ROTATE_LEFT | BUTTON_REPEAT: case ROCKBLOX_ROTATE_LEFT | BUTTON_REPEAT:
#ifdef SCROLL_WHEEL #ifdef HAVE_SCROLLWHEEL
if(wheel_enabled == false) if(wheel_enabled == false)
wheel_events++; wheel_events++;
@ -1179,7 +1177,7 @@ static int rockblox_loop (void)
if (button != BUTTON_NONE) if (button != BUTTON_NONE)
lastbutton = button; lastbutton = button;
#ifdef SCROLL_WHEEL #ifdef HAVE_SCROLLWHEEL
/* check if we should enable the scroll wheel, if events /* check if we should enable the scroll wheel, if events
* begin to stack up... */ * begin to stack up... */
if(wheel_enabled == false) if(wheel_enabled == false)