Tweak keymaps

Taken partly from:
http://forums.rockbox.org/index.php/topic,51653.msg243214/topicseen.html#msg243214

Change-Id: I7a565df0d6bd5a14cab541498e02ab64f25fa45f

1 files changed, 115 insertions, 120 deletions

diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c
index 74fd27262e..c74a0b8d00 100644
--- a/apps/keymaps/keymap-agptekrocker.c
+++ b/apps/keymaps/keymap-agptekrocker.c
@@ -32,184 +32,179 @@
  * Insert LAST_ITEM_IN_LIST at the end of each mapping 
  */
 static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,        BUTTON_UP,                BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,  BUTTON_UP|BUTTON_REPEAT,  BUTTON_NONE },
-
-    { ACTION_STD_NEXT,        BUTTON_DOWN,                 BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,  BUTTON_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
-
-
-    { ACTION_STD_OK,          BUTTON_SELECT|BUTTON_REL,          BUTTON_SELECT },
-    { ACTION_STD_OK,          BUTTON_RIGHT,                      BUTTON_NONE },
-
-    { ACTION_STD_CANCEL,      BUTTON_LEFT,                       BUTTON_NONE },
-
-    { ACTION_STD_CONTEXT,     BUTTON_SELECT|BUTTON_REPEAT,       BUTTON_SELECT },
-
-    { ACTION_STD_MENU,        BUTTON_POWER,            BUTTON_NONE },
-
-//    ACTION_STD_QUICKSCREEN,
-//    ACTION_STD_KEYLOCK
-//    ACTION_STD_REC
-//    ACTION_STD_HOTKEY
-
-//    { ACTION_STD_QUICKSCREEN, BUTTON_SELECT|BUTTON_REPEAT,         BUTTON_SELECT },
+    { ACTION_STD_PREV,       BUTTON_UP,                   BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_STD_NEXT,       BUTTON_DOWN,                 BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_STD_OK,         BUTTON_SELECT|BUTTON_REL,    BUTTON_SELECT },
+    { ACTION_STD_OK,         BUTTON_RIGHT,                BUTTON_NONE },
+    { ACTION_STD_CANCEL,     BUTTON_LEFT,                 BUTTON_NONE },
+    { ACTION_STD_CONTEXT,    BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
+    { ACTION_STD_MENU,       BUTTON_POWER,                BUTTON_NONE },
+
+/*    ACTION_STD_QUICKSCREEN,
+ *    ACTION_STD_KEYLOCK
+ *    ACTION_STD_REC
+ *    ACTION_STD_HOTKEY
+
+ *    { ACTION_STD_QUICKSCREEN, BUTTON_SELECT|BUTTON_REPEAT,         BUTTON_SELECT },
+ */
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
 
 
 static const struct button_mapping button_context_wps[]  = {
-//    { ACTION_WPS_BROWSE,        BUTTON_UP|BUTTON_REPEAT,  BUTTON_UP },
-    { ACTION_WPS_PLAY,     BUTTON_SELECT|BUTTON_REL,        BUTTON_SELECT },
-    { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,  BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL,    BUTTON_LEFT|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
-    { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
-    { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL,    BUTTON_LEFT },
-    { ACTION_WPS_STOP,     BUTTON_SELECT|BUTTON_REPEAT,     BUTTON_SELECT },
-    { ACTION_WPS_VOLDOWN,   BUTTON_VOLDOWN,                  BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,   BUTTON_VOLDOWN|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_VOLUP,                   BUTTON_NONE },
-    { ACTION_WPS_VOLUP,     BUTTON_VOLUP|BUTTON_REPEAT,     BUTTON_NONE },
-//    ACTION_WPS_PITCHSCREEN  optional
-//    ACTION_WPS_ID3SCREEN    optional
-    { ACTION_WPS_CONTEXT,       BUTTON_DOWN|BUTTON_REL,       BUTTON_DOWN },
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_DOWN }, // optional
-    { ACTION_WPS_MENU,          BUTTON_UP|BUTTON_REL,      BUTTON_UP }, /*this should be the same as ACTION_STD_MENU */
-//    ACTION_WPS_VIEW_PLAYLIST
-//    ACTION_WPS_LIST_BOOKMARKS,/* optional */
-//    ACTION_WPS_CREATE_BOOKMARK,/* optional */
-
-    { ACTION_STD_KEYLOCK,       BUTTON_POWER,      BUTTON_NONE },
+/*    { ACTION_WPS_BROWSE,        BUTTON_UP|BUTTON_REPEAT,  BUTTON_UP }, */
+    { ACTION_WPS_PLAY,        BUTTON_SELECT|BUTTON_REL,     BUTTON_SELECT },
+    { ACTION_WPS_SEEKBACK,    BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,     BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,    BUTTON_LEFT|BUTTON_REL,       BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,    BUTTON_RIGHT|BUTTON_REL,      BUTTON_RIGHT|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT,    BUTTON_RIGHT|BUTTON_REL,      BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,    BUTTON_LEFT|BUTTON_REL,       BUTTON_LEFT },
+    { ACTION_WPS_STOP,        BUTTON_SELECT|BUTTON_REPEAT,  BUTTON_SELECT },
+    { ACTION_WPS_VOLDOWN,     BUTTON_VOLDOWN,               BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,     BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_WPS_VOLUP,       BUTTON_VOLUP,                 BUTTON_NONE },
+    { ACTION_WPS_VOLUP,       BUTTON_VOLUP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_WPS_PITCHSCREEN, BUTTON_UP|BUTTON_REPEAT,      BUTTON_UP },
+/*    ACTION_WPS_ID3SCREEN    optional */
+    { ACTION_WPS_CONTEXT,     BUTTON_DOWN|BUTTON_REL,       BUTTON_DOWN },
+    { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_DOWN },
+    { ACTION_WPS_MENU,        BUTTON_UP|BUTTON_REL,         BUTTON_UP }, /* this should be the same as ACTION_STD_MENU */
+/*    ACTION_WPS_VIEW_PLAYLIST
+ *    ACTION_WPS_LIST_BOOKMARKS,  optional
+ *    ACTION_WPS_CREATE_BOOKMARK, optional
+ */
+
+    { ACTION_STD_KEYLOCK,     BUTTON_POWER,                 BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
 static const struct button_mapping button_context_settings[] = {
-    { ACTION_SETTINGS_INC,      BUTTON_VOLUP,                BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT,  BUTTON_NONE },
-//    ACTION_SETTINGS_INCBIGSTEP
-    { ACTION_SETTINGS_DEC,      BUTTON_VOLDOWN,               BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
-//    ACTION_SETTINGS_DECBIGSTEP
-    { ACTION_SETTINGS_RESET,    BUTTON_SELECT|BUTTON_REPEAT,     BUTTON_SELECT },
-//    ACTION_SETTINGS_SET, /* Used by touchscreen targets */
+    { ACTION_SETTINGS_INC,      BUTTON_VOLUP,                  BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_VOLUP|BUTTON_REPEAT,   BUTTON_NONE },
+/*    ACTION_SETTINGS_INCBIGSTEP */
+    { ACTION_SETTINGS_DEC,       BUTTON_VOLDOWN,               BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
+/*    ACTION_SETTINGS_DECBIGSTEP */
+    { ACTION_SETTINGS_RESET,     BUTTON_SELECT|BUTTON_REPEAT,  BUTTON_SELECT },
+/*    ACTION_SETTINGS_SET, Used by touchscreen targets */
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_settings */
 
 static const struct button_mapping button_context_list[]  = {
-//    ACTION_LISTTREE_PGUP,/* optional */
-//    ACTION_LISTTREE_PGDOWN,/* optional */
+/*    ACTION_LISTTREE_PGUP, optional
+ *    ACTION_LISTTREE_PGDOWN,optional
+ */
 
 #ifdef HAVE_VOLUME_IN_LIST
-    { ACTION_LIST_VOLUP,                BUTTON_VOL_UP,                     BUTTON_NONE },
-    { ACTION_LIST_VOLUP,                BUTTON_VOL_UP|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_LIST_VOLDOWN,              BUTTON_VOL_DOWN,                   BUTTON_NONE },
-    { ACTION_LIST_VOLDOWN,              BUTTON_VOL_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_LIST_VOLUP,   BUTTON_VOL_UP,                 BUTTON_NONE },
+    { ACTION_LIST_VOLUP,   BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
 #endif
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_list */
 
 static const struct button_mapping button_context_tree[]  = {
-//    ACTION_TREE_ROOT_INIT,
-//    ACTION_TREE_PGLEFT,/* optional */
-//    ACTION_TREE_PGRIGHT,/* optional */
-//    ACTION_TREE_STOP,
-//    ACTION_TREE_WPS,
-//    ACTION_TREE_HOTKEY,
-
-    { ACTION_TREE_WPS,    BUTTON_UP|BUTTON_REL,         BUTTON_UP },
-//    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
-//    { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL,        BUTTON_REC },
-    
+/*    ACTION_TREE_ROOT_INIT,
+ *    ACTION_TREE_PGLEFT, optional
+ *    ACTION_TREE_PGRIGHT, optional
+ *    ACTION_TREE_STOP,
+ *    ACTION_TREE_WPS,
+ *    ACTION_TREE_HOTKEY,
+ */
+    { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP },
+/*    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
+ *    { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL,        BUTTON_REC },
+ */
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_tree */
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,              BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_settings_yesno */
 
 static const struct button_mapping button_context_quickscreen[]  = {
-    { ACTION_QS_TOP,     BUTTON_UP|BUTTON_REL,          BUTTON_NONE },
-    { ACTION_QS_TOP,     BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REL,        BUTTON_NONE },
-    { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_QS_LEFT,    BUTTON_LEFT|BUTTON_REL,        BUTTON_NONE },
-    { ACTION_QS_LEFT,    BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_QS_RIGHT,   BUTTON_RIGHT|BUTTON_REL,       BUTTON_NONE },
-    { ACTION_QS_RIGHT,   BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_QS_TOP,   BUTTON_UP|BUTTON_REL,       BUTTON_NONE },
+    { ACTION_QS_TOP,   BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_QS_DOWN,  BUTTON_DOWN|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_QS_DOWN,  BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_QS_LEFT,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_QS_LEFT,  BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_quickscreen */
 
 static const struct button_mapping button_context_settings_time[] = {
-    { ACTION_STD_PREV,        BUTTON_LEFT|BUTTON_REL,             BUTTON_LEFT },
-//    { ACTION_STD_PREVREPEAT,  BUTTON_LEFT|BUTTON_REPEAT,          BUTTON_LEFT },
-    { ACTION_STD_NEXT,        BUTTON_RIGHT|BUTTON_REL,           BUTTON_RIGHT },
-    { ACTION_STD_NEXTREPEAT,  BUTTON_RIGHT|BUTTON_REPEAT,        BUTTON_RIGHT },
-    { ACTION_STD_CANCEL,      BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_LEFT },
-    { ACTION_STD_OK,          BUTTON_SELECT|BUTTON_REL,          BUTTON_SELECT },
-    { ACTION_SETTINGS_INC,      BUTTON_UP,                BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,      BUTTON_DOWN,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,           BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_STD_PREVREPEAT,     BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+    { ACTION_STD_NEXT,           BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
+    { ACTION_STD_CANCEL,         BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+    { ACTION_STD_OK,             BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
+    { ACTION_SETTINGS_INC,       BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
     //LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_settings_time */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
-    { ACTION_PS_INC_SMALL,      BUTTON_VOLUP,                BUTTON_NONE },
-    { ACTION_PS_INC_BIG,        BUTTON_VOLUP|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_PS_INC_SMALL,      BUTTON_VOLUP,                 BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_VOLUP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_PS_DEC_SMALL,      BUTTON_VOLDOWN,               BUTTON_NONE },
     { ACTION_PS_DEC_BIG,        BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,               BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,    BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,              BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,   BUTTON_NONE },
-//    { ACTION_PS_TOGGLE_MODE,    BUTTON_REC,                BUTTON_NONE },
-    { ACTION_PS_RESET,          BUTTON_SELECT,             BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_POWER,              BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_UP,                 BUTTON_NONE },
-    { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                  BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,       BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,                 BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,      BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_UP,                    BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_SELECT|BUTTON_REPEAT,  BUTTON_SELECT },
+    { ACTION_PS_EXIT,           BUTTON_POWER,                 BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_SELECT|BUTTON_REL,     BUTTON_SELECT },
+    { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_pitchscreen */
 
 static const struct button_mapping button_context_keyboard[]  = {
-    { ACTION_KBD_LEFT,         BUTTON_LEFT,                      BUTTON_NONE },
-    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                     BUTTON_NONE },
-    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE },
-    
+    { ACTION_KBD_LEFT,         BUTTON_LEFT,                             BUTTON_NONE },
+    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
     { ACTION_KBD_CURSOR_LEFT,  BUTTON_POWER|BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_KBD_CURSOR_LEFT,  BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_KBD_CURSOR_RIGHT, BUTTON_POWER|BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_KBD_CURSOR_RIGHT, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    
-    { ACTION_KBD_UP,           BUTTON_VOLDOWN,                 BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_VOLDOWN|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_VOLUP,               BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_POWER|BUTTON_SELECT,         BUTTON_POWER },
-    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN,                      BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                    BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_UP,                        BUTTON_NONE },
-    { ACTION_KBD_ABORT,        BUTTON_POWER,                     BUTTON_NONE },
-    { ACTION_KBD_MORSE_INPUT,  BUTTON_POWER|BUTTON_REL,            BUTTON_POWER },
-    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_VOLDOWN,                          BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_VOLDOWN|BUTTON_REPEAT,            BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_VOLUP,                            BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_VOLUP|BUTTON_REPEAT,              BUTTON_NONE },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_POWER|BUTTON_SELECT,              BUTTON_POWER },
+    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN,                             BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_UP,                               BUTTON_NONE },
+    { ACTION_KBD_ABORT,        BUTTON_POWER,                            BUTTON_NONE },
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_POWER|BUTTON_REL,                 BUTTON_POWER },
+    { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,                BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_LEFT,        BUTTON_NONE },
+    { ACTION_BMS_DELETE, BUTTON_LEFT, BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */