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

1 files changed, 18 insertions, 2 deletions

diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c
index 1a1505ff96..cb8e4ddf72 100644
--- a/apps/plugins/demystify.c
+++ b/apps/plugins/demystify.c
@@ -37,26 +37,42 @@
 #define MIN_POLYGONS 1
 
 /* Key assignement */
-#define DEMYSTIFY_QUIT                      PLA_CANCEL
 
 #ifdef HAVE_SCROLLWHEEL
 
+#if (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
+    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
+    || (CONFIG_KEYPAD == IPOD_4G_PAD)
+#define DEMYSTIFY_QUIT                      PLA_UP
+#else
+#define DEMYSTIFY_QUIT                      PLA_CANCEL
+#endif
+
 #define DEMYSTIFY_INCREASE_SPEED            PLA_SCROLL_FWD
 #define DEMYSTIFY_DECREASE_SPEED            PLA_SCROLL_BACK
 #define DEMYSTIFY_INCREASE_SPEED_REPEAT     PLA_SCROLL_FWD_REPEAT
 #define DEMYSTIFY_DECREASE_SPEED_REPEAT     PLA_SCROLL_BACK_REPEAT
+
+#define DEMYSTIFY_ADD_POLYGON               PLA_RIGHT
+#define DEMYSTIFY_REMOVE_POLYGON            PLA_LEFT
+#define DEMYSTIFY_ADD_POLYGON_REPEAT        PLA_RIGHT_REPEAT
+#define DEMYSTIFY_REMOVE_POLYGON_REPEAT     PLA_LEFT_REPEAT
+
 #else
+
+#define DEMYSTIFY_QUIT                      PLA_CANCEL
+
 #define DEMYSTIFY_INCREASE_SPEED            PLA_RIGHT
 #define DEMYSTIFY_DECREASE_SPEED            PLA_LEFT
 #define DEMYSTIFY_INCREASE_SPEED_REPEAT     PLA_RIGHT_REPEAT
 #define DEMYSTIFY_DECREASE_SPEED_REPEAT     PLA_LEFT_REPEAT
-#endif
 
 #define DEMYSTIFY_ADD_POLYGON               PLA_UP
 #define DEMYSTIFY_REMOVE_POLYGON            PLA_DOWN
 #define DEMYSTIFY_ADD_POLYGON_REPEAT        PLA_UP_REPEAT
 #define DEMYSTIFY_REMOVE_POLYGON_REPEAT     PLA_DOWN_REPEAT
 
+#endif
 const struct button_mapping *plugin_contexts[]
 = {pla_main_ctx,
 #if defined(HAVE_REMOTE_LCD)