From 17676672e0483a6c10caf0f5aead9c59fbd48e99 Mon Sep 17 00:00:00 2001 From: Daniel Ankers Date: Wed, 3 Jan 2007 23:53:22 +0000 Subject: Improved Sansa keymappings for Pacbox, Solitaire and Star. From FS#6466 by Piotr Jafiszow git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11892 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pacbox/pacbox.h | 17 +++++++++-------- apps/plugins/solitaire.c | 27 ++++++++++++--------------- apps/plugins/star.c | 11 +++++------ docs/CREDITS | 1 + 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 863f9b246b..e20acf93ce 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -89,14 +89,15 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD -#define PACMAN_UP BUTTON_UP -#define PACMAN_DOWN BUTTON_DOWN -#define PACMAN_LEFT BUTTON_LEFT -#define PACMAN_RIGHT BUTTON_RIGHT -#define PACMAN_1UP BUTTON_SELECT -#define PACMAN_2UP BUTTON_POWER -#define PACMAN_COIN BUTTON_REC -#define PACMAN_MENU (BUTTON_SELECT|BUTTON_REPEAT) +#define PACMAN_UP BUTTON_RIGHT +#define PACMAN_DOWN BUTTON_LEFT +#define PACMAN_LEFT BUTTON_UP +#define PACMAN_RIGHT BUTTON_DOWN +#define PACMAN_1UP BUTTON_SELECT +#define PACMAN_2UP BUTTON_REC +#define PACMAN_COIN_PRE BUTTON_SELECT +#define PACMAN_COIN (BUTTON_SELECT | BUTTON_DOWN) +#define PACMAN_MENU BUTTON_POWER #elif CONFIG_KEYPAD == IRIVER_H10_PAD diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 7acd92b775..45e18834f3 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -179,22 +179,19 @@ static struct plugin_api* rb; # define SOL_QUIT BUTTON_POWER # define SOL_UP BUTTON_UP # define SOL_DOWN BUTTON_DOWN -# define SOL_LEFT BUTTON_LEFT -# define SOL_RIGHT BUTTON_RIGHT -# define SOL_MOVE_PRE BUTTON_SELECT -# define SOL_MOVE (BUTTON_SELECT | BUTTON_UP) -# define SOL_DRAW_PRE BUTTON_UP -# define SOL_DRAW (BUTTON_UP | BUTTON_LEFT) -# define SOL_REM2CUR_PRE BUTTON_UP -# define SOL_REM2CUR (BUTTON_UP | BUTTON_RIGHT) -# define SOL_CUR2STACK_PRE BUTTON_SELECT -# define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_RIGHT) -# define SOL_REM2STACK BUTTON_REC +# define SOL_LEFT BUTTON_SCROLL_UP +# define SOL_RIGHT BUTTON_SCROLL_DOWN +# define SOL_MOVE BUTTON_SELECT +# define SOL_DRAW BUTTON_REC +# define SOL_REM2CUR BUTTON_LEFT +# define SOL_CUR2STACK_PRE BUTTON_REC +# define SOL_CUR2STACK (BUTTON_REC | BUTTON_RIGHT) +# define SOL_REM2STACK BUTTON_RIGHT # define HK_MOVE "SELECT" -# define HK_DRAW "PLAY" -# define HK_REM2CUR "PLAY.." -# define HK_CUR2STACK "SELECT.." -# define HK_REM2STACK "REC" +# define HK_DRAW "REC" +# define HK_REM2CUR "LEFT" +# define HK_CUR2STACK "DOUBLE SELECT" +# define HK_REM2STACK "RIGHT" #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) # define SOL_QUIT BUTTON_POWER diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 2f5814d8c8..60debc5000 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -140,12 +140,11 @@ PLUGIN_HEADER #define STAR_QUIT BUTTON_POWER #define STAR_UP BUTTON_UP #define STAR_DOWN BUTTON_DOWN -#define STAR_TOGGLE_CONTROL_PRE BUTTON_SELECT -#define STAR_TOGGLE_CONTROL (BUTTON_SELECT | BUTTON_REL) -#define STAR_LEVEL_UP BUTTON_SCROLL_UP -#define STAR_LEVEL_DOWN BUTTON_SCROLL_DOWN -#define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_RIGHT) -#define STAR_MENU_RUN BUTTON_REC +#define STAR_TOGGLE_CONTROL BUTTON_SELECT +#define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) +#define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) +#define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) +#define STAR_MENU_RUN BUTTON_SELECT #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) diff --git a/docs/CREDITS b/docs/CREDITS index 14f0264955..1ca7c1a5e4 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -262,3 +262,4 @@ Steve Gotthardt Greg White Mattieu Favréaux Malcolm Tyrrell +Piotr Jafiszow -- cgit v1.2.3