summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarianne Arnold <pixelma@rockbox.org>2006-10-18 21:39:57 +0000
committerMarianne Arnold <pixelma@rockbox.org>2006-10-18 21:39:57 +0000
commitbfa4cb8c966da234c114c5535e3fc502be1c3fdc (patch)
treef2ec7666b8646987de2034edd74e3dfa9b80ffc6
parentd543bd486b67b8cf24dde0407a2325dd2258e499 (diff)
Solitaire: better button assignments for H10 and X5 (with working shortcuts)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11262 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/solitaire.c68
1 files changed, 38 insertions, 30 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 87f48d98e9..03a2fe3a6f 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -137,21 +137,25 @@ static struct plugin_api* rb;
# define HK_REM2STACK "RIGHT.."
#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
-# 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 BUTTON_SELECT
-# define SOL_DRAW BUTTON_PLAY
-# define SOL_REM2CUR (BUTTON_REC | BUTTON_LEFT)
-# define SOL_CUR2STACK (BUTTON_REC | BUTTON_UP)
-# define SOL_REM2STACK (BUTTON_REC | BUTTON_DOWN)
-# define HK_MOVE "MENU"
-# define HK_DRAW "PLAY"
-# define HK_REM2CUR "REC+LEFT"
-# define HK_CUR2STACK "REC+UP"
-# define HK_REM2STACK "REC+DOWN"
+# 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_REL)
+# define SOL_DRAW_PRE BUTTON_PLAY
+# define SOL_DRAW (BUTTON_PLAY | BUTTON_REL)
+# define SOL_REM2CUR_PRE BUTTON_PLAY
+# define SOL_REM2CUR (BUTTON_PLAY | BUTTON_REPEAT)
+# define SOL_CUR2STACK_PRE BUTTON_SELECT
+# define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT)
+# define SOL_REM2STACK BUTTON_REC
+# define HK_MOVE "SELECT"
+# define HK_DRAW "PLAY"
+# define HK_REM2CUR "PLAY.."
+# define HK_CUR2STACK "SELECT.."
+# define HK_REM2STACK "REC"
#elif (CONFIG_KEYPAD == GIGABEAT_PAD)
# define SOL_QUIT BUTTON_A
@@ -172,21 +176,25 @@ static struct plugin_api* rb;
# define HK_REM2STACK "POWER+RIGHT"
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-# define SOL_QUIT BUTTON_POWER
-# define SOL_UP BUTTON_SCROLL_UP
-# define SOL_DOWN BUTTON_SCROLL_DOWN
-# define SOL_LEFT BUTTON_LEFT
-# define SOL_RIGHT BUTTON_RIGHT
-# define SOL_MOVE BUTTON_REW
-# define SOL_DRAW BUTTON_PLAY
-# define SOL_REM2CUR (BUTTON_FF | BUTTON_LEFT)
-# define SOL_CUR2STACK (BUTTON_FF | BUTTON_SCROLL_UP)
-# define SOL_REM2STACK (BUTTON_FF | BUTTON_SCROLL_DOWN)
-# define HK_MOVE "REW"
-# define HK_DRAW "PLAY"
-# define HK_REM2CUR "REW+LEFT"
-# define HK_CUR2STACK "REW+UP.."
-# define HK_REM2STACK "REW+DOWN"
+# define SOL_QUIT BUTTON_POWER
+# define SOL_UP BUTTON_SCROLL_UP
+# define SOL_DOWN BUTTON_SCROLL_DOWN
+# define SOL_LEFT_PRE BUTTON_LEFT
+# define SOL_LEFT (BUTTON_LEFT | BUTTON_REL)
+# define SOL_RIGHT_PRE BUTTON_RIGHT
+# define SOL_RIGHT (BUTTON_RIGHT | BUTTON_REL)
+# define SOL_MOVE BUTTON_PLAY
+# define SOL_DRAW_PRE BUTTON_LEFT
+# define SOL_DRAW (BUTTON_LEFT | BUTTON_REPEAT)
+# define SOL_REM2CUR BUTTON_FF
+# define SOL_CUR2STACK BUTTON_REW
+# define SOL_REM2STACK_PRE BUTTON_RIGHT
+# define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_REPEAT)
+# define HK_MOVE "PLAY"
+# define HK_DRAW "LEFT.."
+# define HK_REM2CUR "FF"
+# define HK_CUR2STACK "REW"
+# define HK_REM2STACK "RIGHT.."
#else
# error "Unknown keypad"