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, 8 insertions, 1 deletions

diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index 1b2f6d465a..6e96aae10c 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -52,6 +52,14 @@
 /* this set the context to use with PLA */
 static const struct button_mapping *plugin_contexts[] = { pla_main_ctx };
 
+#if (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
+    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
+    || (CONFIG_KEYPAD == IPOD_4G_PAD)
+#define MATRIX_EXIT2               PLA_UP
+#else
+#define MATRIX_EXIT2               PLA_CANCEL
+#endif
+
 #ifdef HAVE_SCROLLWHEEL
 #define MATRIX_SLEEP_MORE          PLA_SCROLL_BACK
 #define MATRIX_SLEEP_MORE_REPEAT   PLA_SCROLL_BACK_REPEAT
@@ -65,7 +73,6 @@ static const struct button_mapping *plugin_contexts[] = { pla_main_ctx };
 #endif /* HAVE_SCROLLWHEEL */
 #define MATRIX_PAUSE               PLA_SELECT
 #define MATRIX_EXIT                PLA_EXIT
-#define MATRIX_EXIT2               PLA_CANCEL
 
 #define SLEEP HZ/50