6 files changed, 35 insertions, 6 deletions

diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 2df035c76b..08e2312a89 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -183,7 +183,8 @@ const struct button_mapping button_context_eq[]  = {
 
 const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,       BUTTON_REC,      BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_SELECT,   BUTTON_NONE },
+    { ACTION_BMS_SELECT,       BUTTON_SELECT,   BUTTON_NONE },
+    { ACTION_BMS_EXIT,         BUTTON_OFF,      BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_settings_bmark */
 
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index b41a91afdf..1151f10a20 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -116,6 +116,8 @@ const struct button_mapping button_context_yesno[]  = {
 
 const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,          BUTTON_MENU|BUTTON_REPEAT,       BUTTON_MENU },
+    { ACTION_BMS_SELECT,       BUTTON_SELECT,   BUTTON_NONE },
+    { ACTION_BMS_EXIT,         BUTTON_PLAY,      BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
 }; /* button_context_settings_bmark */
 
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 9af3b12cab..249417a366 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -107,9 +107,10 @@ const struct button_mapping button_context_yesno[] = {
 struct button_mapping button_context_bmark[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                 BUTTON_NONE },
     { ACTION_BMS_DELETE,      BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_LEFT },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,      BUTTON_LEFT },
+    { ACTION_BMS_EXIT,        BUTTON_LEFT|BUTTON_REL,      BUTTON_LEFT },
+    { ACTION_BMS_SELECT,       BUTTON_RIGHT,   BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_settings_bmark */
 
 const struct button_mapping button_context_pitchscreen[]  = {
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 7fadf931d4..6d3b5c98b9 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -84,6 +84,15 @@ static const struct button_mapping button_context_yesno[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings_yesno */
 
+struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_PLAY },
+    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_ON },
+    { ACTION_BMS_EXIT,        BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_BMS_SELECT,       BUTTON_PLAY|BUTTON_REL,   BUTTON_PLAY },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+}; /* button_context_settings_bmark */
+
 /*****************************************************************************
  *    Remote control mappings
  *****************************************************************************/
@@ -142,7 +151,8 @@ const struct button_mapping* get_context_mapping( int context )
 
         case CONTEXT_TREE:
             return button_context_tree;
-            
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
         case CONTEXT_STD:
         case CONTEXT_LIST:
         case CONTEXT_MAINMENU:
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 4fb278db6e..1470b33965 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -184,6 +184,14 @@ const struct button_mapping button_context_keyboard[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
 
+struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_PLAY },
+    { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_ON },
+    { ACTION_BMS_EXIT,        BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_BMS_SELECT,       BUTTON_PLAY|BUTTON_REL,   BUTTON_PLAY },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+}; /* button_context_settings_bmark */
 /*****************************************************************************
  *    Remote control mappings
  *****************************************************************************/
@@ -242,7 +250,8 @@ const struct button_mapping* get_context_mapping( int context )
 
         case CONTEXT_PITCHSCREEN:
             return button_context_pitchscreen;
-
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
         case CONTEXT_TREE:
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_tree_scroll_lr;
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 603f9c7568..a8992e4ff8 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -232,6 +232,12 @@ const struct button_mapping button_context_keyboard[]  = {
 
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
+const struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,       BUTTON_REC|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_BMS_SELECT,       BUTTON_SELECT,   BUTTON_NONE },
+    { ACTION_BMS_EXIT,         BUTTON_REC|BUTTON_REL,      BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_settings_bmark */
 
 static const struct button_mapping* get_context_mapping_remote( int context )
 {
@@ -277,7 +283,7 @@ const struct button_mapping* get_context_mapping( int context )
         case CONTEXT_TREE:
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_tree_scroll_lr;
-            /* else fall through to CUSTOM|1 */
+            /* else fall through to CUSTOM|CONTEXT_TREE */
         case CONTEXT_CUSTOM|CONTEXT_TREE
         :
             return button_context_tree;