Adapt most single-file plugins to the M3 keypad and screen. It's still preliminary, as many plugins now can't be left without the remote. The plugins need to be converted to use the action API (but not pluginlib actions). Plugins are not enabled yet. * Simplify the bitmap handling in the source of some plugins.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16737 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 26 insertions, 1 deletions

diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index fba2bf55a4..62f60c7eb4 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -275,11 +275,36 @@ static struct plugin_api* rb;
 #   define HK_CUR2STACK    "SELECT.."
 #   define HK_REM2STACK    "DISPLAY+RIGHT"
 
+#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
+#   define SOL_QUIT         BUTTON_RC_REC
+#   define SOL_UP           BUTTON_RC_VOL_UP
+#   define SOL_DOWN         BUTTON_RC_VOL_DOWN
+#   define SOL_LEFT         BUTTON_RC_REW
+#   define SOL_RIGHT        BUTTON_RC_FF
+#   define SOL_MOVE         BUTTON_RC_PLAY
+#   define SOL_DRAW_PRE     BUTTON_RC_MENU
+#   define SOL_DRAW         (BUTTON_RC_MENU | BUTTON_REL)
+#   define SOL_REM2CUR_PRE  BUTTON_RC_MENU
+#   define SOL_REM2CUR      (BUTTON_RC_MENU | BUTTON_REPEAT)
+#   define SOL_CUR2STACK_PRE BUTTON_RC_MODE
+#   define SOL_CUR2STACK    (BUTTON_RC_MODE | BUTTON_REL)
+#   define SOL_REM2STACK_PRE BUTTON_RC_MODE
+#   define SOL_REM2STACK    (BUTTON_RC_MODE | BUTTON_REPEAT)
+#   define HK_LR           "REW/FF"
+#   define HK_UD           "VOL UP/DOWN"
+#   define HK_MOVE         "PLAY"
+#   define HK_DRAW         "MENU"
+#   define HK_REM2CUR      "MENU.."
+#   define HK_CUR2STACK    "MODE"
+#   define HK_REM2STACK    "MODE.."
+
 #else
 #error No keymap defined!
 #endif
 
-#define HK_LR "LEFT/RIGHT"
+#ifndef HK_LR
+#   define HK_LR "LEFT/RIGHT"
+#endif
 #ifndef HK_UD
 #   define HK_UD "UP/DOWN"
 #endif