From faa2cb99429214de745bbc3e64e48a7432db51ae Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Sun, 18 Dec 2022 21:13:15 +0100 Subject: plugins: Improve usability of iPod keymaps - Reduce need to press multiple buttons at the same time to quit a plugin - Have "Menu" be default way to quit plugins or to access plugin menu - Fall back to (Long) "Select" or Long "Menu" in cases where Menu button isn't available (e.g. in ImageViewer and many games) out of scope: boomshine, lua_scripts, Rockpaint, Doom, Duke3D, Pacbox, Quake, Sgt-Puzzles, Wolf3D, XWorld, Minesweeper, Pixel Painter, Spacerocks Change-Id: I6d4dc7174695fe4b8ee9cbaccb21bdbfe6af5c48 --- apps/plugins/bounce.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'apps/plugins/bounce.c') diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index e6f29817d6..a42a0af6ba 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -34,10 +34,6 @@ static const struct button_mapping *plugin_contexts[] = { pla_main_ctx }; /* We set button maping with PLA */ -#define BOUNCE_UP PLA_UP -#define BOUNCE_UP_REPEAT PLA_UP_REPEAT -#define BOUNCE_DOWN PLA_DOWN -#define BOUNCE_DOWN_REPEAT PLA_DOWN_REPEAT #ifdef HAVE_SCROLLWHEEL #define BOUNCE_LEFT PLA_SCROLL_BACK @@ -52,7 +48,22 @@ static const struct button_mapping *plugin_contexts[] = { pla_main_ctx }; #endif #define BOUNCE_QUIT PLA_EXIT + +#if (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ + || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == IPOD_4G_PAD) +#define BOUNCE_QUIT2 PLA_UP +#define BOUNCE_DOWN PLA_LEFT +#define BOUNCE_DOWN_REPEAT PLA_LEFT_REPEAT +#define BOUNCE_UP PLA_RIGHT +#define BOUNCE_UP_REPEAT PLA_RIGHT_REPEAT +#else #define BOUNCE_QUIT2 PLA_CANCEL +#define BOUNCE_DOWN PLA_DOWN +#define BOUNCE_DOWN_REPEAT PLA_DOWN_REPEAT +#define BOUNCE_UP PLA_UP +#define BOUNCE_UP_REPEAT PLA_UP_REPEAT +#endif #define BOUNCE_MODE PLA_SELECT #define LETTER_WIDTH 11 @@ -471,6 +482,10 @@ enum plugin_status plugin_start(const void* parameter) #if (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) || \ (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) "[Rew] to stop"; +#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ + || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == IPOD_4G_PAD) + "[Menu] to stop"; #else "[Off] to stop"; #endif -- cgit v1.2.3