D2: Keymap improvements for pitchscreen, quickscreen and context menu. (note: quickscreen left action does not currently work)

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

2 files changed, 30 insertions, 5 deletions

diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
index 3afee098d9..006003538c 100644
--- a/apps/keymaps/keymap-cowond2.c
+++ b/apps/keymaps/keymap-cowond2.c
@@ -43,12 +43,10 @@ static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_NEXTREPEAT,  BUTTON_PLUS|BUTTON_REPEAT,  BUTTON_NONE },
 
     { ACTION_STD_OK,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
-    { ACTION_STD_CANCEL,      BUTTON_POWER,               BUTTON_NONE },    
-    { ACTION_STD_MENU,        BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
-    
-   // { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_CONTEXT,     BUTTON_PLUS|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_CANCEL,      BUTTON_POWER,               BUTTON_NONE },
     
+    { ACTION_STD_QUICKSCREEN, BUTTON_PLUS|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_CONTEXT,     BUTTON_MENU|BUTTON_REPEAT,  BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -128,6 +126,11 @@ static const struct button_mapping button_context_quickscreen[]  = {
 
 static const struct button_mapping button_context_pitchscreen[]  = {
 
+    { ACTION_PS_INC_SMALL, BUTTON_PLUS,                BUTTON_NONE },
+    { ACTION_PS_INC_SMALL, BUTTON_PLUS|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL, BUTTON_MINUS,               BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_PS_EXIT,      BUTTON_POWER,               BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_pitchcreen */
 
diff --git a/apps/keymaps/keymap-touchpad.c b/apps/keymaps/keymap-touchpad.c
index a6a4baad66..5cf30d304f 100644
--- a/apps/keymaps/keymap-touchpad.c
+++ b/apps/keymaps/keymap-touchpad.c
@@ -76,6 +76,8 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_STOPSEEK,    BUTTON_MIDLEFT|BUTTON_REL,         BUTTON_MIDLEFT|BUTTON_REPEAT },
     { ACTION_WPS_STOPSEEK,    BUTTON_MIDRIGHT|BUTTON_REL,        BUTTON_MIDRIGHT|BUTTON_REPEAT },
     
+    { ACTION_WPS_CONTEXT,     BUTTON_CENTER|BUTTON_REPEAT,       BUTTON_CENTER },
+    { ACTION_WPS_QUICKSCREEN, BUTTON_TOPRIGHT|BUTTON_REPEAT,     BUTTON_TOPRIGHT },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS)
 }; /* button_context_wps */
 
@@ -159,11 +161,31 @@ static const struct button_mapping button_context_time[]  = {
 
 static const struct button_mapping button_context_quickscreen[]  = {
 
+    { ACTION_STD_CANCEL, BUTTON_CENTER|BUTTON_REL,          BUTTON_NONE },
+    { ACTION_QS_DOWNINV, BUTTON_TOPMIDDLE|BUTTON_REL,       BUTTON_NONE },
+    { ACTION_QS_DOWNINV, BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_BOTTOMMIDDLE|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_QS_DOWN,    BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_MIDLEFT|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_QS_LEFT,    BUTTON_MIDLEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_MIDRIGHT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_QS_RIGHT,   BUTTON_MIDRIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_QUICKSCREEN)
 }; /* button_context_quickscreen */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
 
+    { ACTION_PS_INC_SMALL,      BUTTON_TOPMIDDLE,                  BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,      BUTTON_BOTTOMMIDDLE,               BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_MIDLEFT,                    BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_MIDLEFT|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_MIDRIGHT,                   BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_MIDRIGHT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_BOTTOMRIGHT,                BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_CENTER,                     BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_TOPLEFT,                    BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_PITCHSCREEN)
 }; /* button_context_pitchcreen */