Touchscreen: Change WPS key mappings

- Pressing top-right switches back and forth from WPS to last browsed directory
- Pressing top-left switches from WPS to Main Menu, and vice-versa
- Pressing center pauses
- Long pressing center stops


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

2 files changed, 8 insertions, 8 deletions

diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index a2547d0..dc554e0 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -71,8 +71,8 @@ static const struct button_mapping button_context_standard[]  = {
 
 static const struct button_mapping button_context_wps[]  = {
 
-    { ACTION_WPS_PLAY,          BUTTON_TOPRIGHT|BUTTON_REL,         BUTTON_TOPRIGHT },
-    { ACTION_WPS_STOP,          BUTTON_TOPRIGHT|BUTTON_REPEAT,      BUTTON_TOPRIGHT },
+    { ACTION_WPS_PLAY,          BUTTON_CENTER|BUTTON_REL,           BUTTON_CENTER },
+    { ACTION_WPS_STOP,          BUTTON_CENTER|BUTTON_REPEAT,        BUTTON_CENTER },
 
     { ACTION_WPS_SKIPPREV,      BUTTON_MIDLEFT|BUTTON_REL,          BUTTON_MIDLEFT },
     { ACTION_WPS_SEEKBACK,      BUTTON_MIDLEFT|BUTTON_REPEAT,       BUTTON_NONE },
@@ -87,8 +87,8 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLDOWN,       BUTTON_BOTTOMMIDDLE,                BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT,  BUTTON_NONE },
 
-    { ACTION_WPS_BROWSE,        BUTTON_CENTER|BUTTON_REL,           BUTTON_CENTER },
-    { ACTION_WPS_CONTEXT,       BUTTON_CENTER|BUTTON_REPEAT,        BUTTON_CENTER },
+    { ACTION_WPS_BROWSE,        BUTTON_TOPRIGHT|BUTTON_REL,         BUTTON_TOPRIGHT },
+    { ACTION_WPS_CONTEXT,       BUTTON_TOPRIGHT|BUTTON_REPEAT,      BUTTON_TOPRIGHT },
 
     { ACTION_WPS_MENU,          BUTTON_TOPLEFT|BUTTON_REL,          BUTTON_TOPLEFT },
     { ACTION_WPS_QUICKSCREEN,   BUTTON_BOTTOMLEFT|BUTTON_REL,       BUTTON_BOTTOMLEFT },
diff --git a/manual/platform/keymap-touchscreen.tex b/manual/platform/keymap-touchscreen.tex
index 332febb..5c21582 100644
--- a/manual/platform/keymap-touchscreen.tex
+++ b/manual/platform/keymap-touchscreen.tex
@@ -25,20 +25,20 @@
 \newcommand{\TouchActionStdUsbCharge}{}
 
 %Button actions, wps context
-\newcommand{\TouchActionWpsPlay}{\TouchTopRight}
+\newcommand{\TouchActionWpsPlay}{\TouchCenter}
 \newcommand{\TouchActionWpsSkipNext}{\TouchMidRight}
 \newcommand{\TouchActionWpsSeekFwd}{Long \TouchMidRight}
 \newcommand{\TouchActionWpsSkipPrev}{\TouchMidLeft}
 \newcommand{\TouchActionWpsSeekBack}{Long \TouchMidLeft}
 
-\newcommand{\TouchActionWpsStop}{Long \TouchTopRight}
+\newcommand{\TouchActionWpsStop}{Long \TouchCenter}
 \newcommand{\TouchActionWpsVolDown}{\TouchBottomMiddle}
 \newcommand{\TouchActionWpsVolUp}{\TouchTopMiddle}
 
 \newcommand{\TouchActionWpsQuickScreen}{\TouchBottomLeft}
 \newcommand{\TouchActionWpsMenu}{\TouchTopLeft}
-\newcommand{\TouchActionWpsContext}{Long \TouchCenter}
-\newcommand{\TouchActionWpsBrowse}{\TouchCenter}
+\newcommand{\TouchActionWpsContext}{Long \TouchTopRight}
+\newcommand{\TouchActionWpsBrowse}{\TouchTopRight}
 \newcommand{\TouchActionWpsPitchScreen}{Long \TouchBottomLeft}
 \newcommand{\TouchActionWpsIdThreeScreen}{\TouchBottomRight}