Quickscreen for the radio screen. I added a keymap for almost all targets. I couldn't find a nice one (i.e. one that's consistent with the wps/menu quickscreen combo) for iaudio m3, ondavx747 and the gogears.

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

16 files changed, 28 insertions, 10 deletions

diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c
index 7bf5fe1..7d66921 100644
--- a/apps/keymaps/keymap-av300.c
+++ b/apps/keymaps/keymap-av300.c
@@ -217,6 +217,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_STOP,        BUTTON_OFF,                            BUTTON_NONE },
     { ACTION_FM_MODE,        BUTTON_ON | BUTTON_REPEAT,             BUTTON_ON },
     { ACTION_FM_EXIT,        BUTTON_ON | BUTTON_REL,                BUTTON_ON },
+    { ACTION_FM_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT,               BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
     
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c
index 457e81e..3312da3 100644
--- a/apps/keymaps/keymap-c100.c
+++ b/apps/keymaps/keymap-c100.c
@@ -194,6 +194,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MODE,        BUTTON_UP|BUTTON_REPEAT,           BUTTON_UP   },
     { ACTION_FM_EXIT,        BUTTON_DOWN|BUTTON_REL,            BUTTON_NONE },
     { ACTION_FM_PLAY,        BUTTON_UP|BUTTON_REL,              BUTTON_UP   },
+    { ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_DOWN },
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c
index af7c990..487a2db 100644
--- a/apps/keymaps/keymap-c200.c
+++ b/apps/keymaps/keymap-c200.c
@@ -216,7 +216,7 @@ static const struct button_mapping button_context_recscreen[]  = {
 #if CONFIG_TUNER
 static const struct button_mapping button_context_radio[]  = {
     { ACTION_NONE,              BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_FM_MENU,           BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_FM_MENU,           BUTTON_DOWN|BUTTON_REL,         BUTTON_NONE },
     { ACTION_FM_PRESET,         BUTTON_SELECT,                  BUTTON_NONE },
     { ACTION_FM_STOP,           BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP   },
     { ACTION_FM_MODE,           BUTTON_REC,                     BUTTON_NONE },
@@ -226,6 +226,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,      BUTTON_VOL_DOWN,                BUTTON_NONE },
     { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_FM_QUICKSCREEN,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index c312179..a50db6d 100644
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -232,13 +232,14 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MENU,           BUTTON_DOWN,                    BUTTON_NONE },
     { ACTION_FM_PRESET,         BUTTON_SELECT,                  BUTTON_NONE },
     { ACTION_FM_STOP,           BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP   },
-    { ACTION_FM_MODE,           BUTTON_HOME,                    BUTTON_NONE },
+    { ACTION_FM_MODE,           BUTTON_HOME|BUTTON_REL,         BUTTON_HOME },
     { ACTION_FM_EXIT,           BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
     { ACTION_FM_PLAY,           BUTTON_UP|BUTTON_REL,           BUTTON_UP },
     { ACTION_SETTINGS_INC,      BUTTON_VOL_UP,                  BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,      BUTTON_VOL_DOWN,                BUTTON_NONE },
     { ACTION_SETTINGS_DECREPEAT,BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_FM_QUICKSCREEN,    BUTTON_HOME|BUTTON_REPEAT,      BUTTON_HOME },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index f697222..367fdcb 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -241,6 +241,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MODE,        BUTTON_UP|BUTTON_REPEAT,           BUTTON_UP   },
     { ACTION_FM_EXIT,        BUTTON_DOWN|BUTTON_REL,            BUTTON_NONE },
     { ACTION_FM_PLAY,        BUTTON_UP|BUTTON_REL,              BUTTON_UP   },
+    { ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_DOWN },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
 
diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c
index 1272233..416674f 100644
--- a/apps/keymaps/keymap-fuze.c
+++ b/apps/keymaps/keymap-fuze.c
@@ -242,7 +242,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_EXIT,        BUTTON_DOWN|BUTTON_REL,            BUTTON_NONE },
     { ACTION_FM_PLAY,        BUTTON_UP|BUTTON_REL,              BUTTON_UP   },
     { ACTION_FM_PRESET,      BUTTON_HOME|BUTTON_REL,            BUTTON_NONE },
-    { ACTION_NONE,           BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_FM_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
 
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index 0793f7b..d690b24 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -305,13 +305,14 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MENU,            BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_FM_PRESET,          BUTTON_SELECT | BUTTON_REL,    BUTTON_SELECT },
     { ACTION_FM_STOP,            BUTTON_POWER,                  BUTTON_NONE },
-    { ACTION_FM_MODE,            BUTTON_MENU,                   BUTTON_NONE },
+    { ACTION_FM_MODE,            BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
     { ACTION_FM_EXIT,            BUTTON_BACK,                   BUTTON_NONE },
     { ACTION_FM_PLAY,            BUTTON_PLAY,                   BUTTON_NONE },
     { ACTION_SETTINGS_INC,       BUTTON_VOL_UP,                 BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_SETTINGS_DEC,       BUTTON_VOL_DOWN,               BUTTON_NONE },
     { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_FM_QUICKSCREEN,     BUTTON_MENU|BUTTON_REPEAT,     BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 315f28c..8597e24 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -320,7 +320,8 @@ const struct button_mapping button_context_recscreen[]  = {
 static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_PRESET,      BUTTON_RIGHT | BUTTON_REL,             BUTTON_RIGHT },
     { ACTION_FM_MENU,        BUTTON_RIGHT | BUTTON_REPEAT,          BUTTON_NONE },
-    { ACTION_FM_MODE,        BUTTON_LEFT,                           BUTTON_NONE },
+    { ACTION_FM_MODE,        BUTTON_LEFT|BUTTON_REL,                BUTTON_LEFT },
+    { ACTION_FM_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT,             BUTTON_NONE },
     { ACTION_FM_STOP,        BUTTON_PLAY | BUTTON_REPEAT,           BUTTON_PLAY },
     { ACTION_FM_EXIT,        BUTTON_POWER,                          BUTTON_NONE },
     { ACTION_FM_PLAY,        BUTTON_PLAY | BUTTON_REL,              BUTTON_PLAY },
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index d3b76ee..64d0f30 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -280,6 +280,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MODE,        BUTTON_ON | BUTTON_REPEAT,             BUTTON_ON },
     { ACTION_FM_EXIT,        BUTTON_MODE | BUTTON_REL,              BUTTON_MODE },
     { ACTION_FM_PLAY,        BUTTON_ON | BUTTON_REL,                BUTTON_ON },
+    { ACTION_FM_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT,             BUTTON_MODE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
     
@@ -690,6 +691,7 @@ static const struct button_mapping button_context_radio_h100remote[]  = {
     { ACTION_FM_STOP,        BUTTON_RC_STOP,                         BUTTON_NONE },
     { ACTION_FM_MODE,        BUTTON_RC_ON | BUTTON_REPEAT,           BUTTON_RC_ON },
     { ACTION_FM_EXIT,        BUTTON_RC_MODE | BUTTON_REL,            BUTTON_RC_MODE },
+    { ACTION_FM_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT,           BUTTON_RC_MODE },
     { ACTION_FM_PLAY,        BUTTON_RC_ON | BUTTON_REL,              BUTTON_RC_ON },
     { ACTION_FM_NEXT_PRESET, BUTTON_RC_BITRATE,                      BUTTON_NONE },
     { ACTION_FM_PREV_PRESET, BUTTON_RC_SOURCE,                       BUTTON_NONE },
@@ -711,6 +713,7 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = {
     { ACTION_FM_STOP,        BUTTON_RC_STOP,                         BUTTON_NONE },
     { ACTION_FM_MODE,        BUTTON_RC_ON | BUTTON_REPEAT,           BUTTON_RC_ON },
     { ACTION_FM_EXIT,        BUTTON_RC_MODE | BUTTON_REL,            BUTTON_RC_MODE },
+    { ACTION_FM_QUICKSCREEN, BUTTON_RC_MODE|BUTTON_REPEAT,           BUTTON_RC_MODE },
     { ACTION_FM_PLAY,        BUTTON_RC_ON | BUTTON_REL,              BUTTON_RC_ON },
     { ACTION_FM_NEXT_PRESET, BUTTON_RC_BITRATE,                      BUTTON_NONE },
     { ACTION_FM_PREV_PRESET, BUTTON_RC_SOURCE,                       BUTTON_NONE },
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 4f98777..751c6d8 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -199,7 +199,8 @@ const struct button_mapping button_context_recscreen[]  = {
      { ACTION_FM_MENU,           BUTTON_SELECT | BUTTON_REPEAT,   BUTTON_NONE },
      { ACTION_FM_STOP,           BUTTON_PLAY | BUTTON_REPEAT,     BUTTON_PLAY },
      { ACTION_FM_MODE,           BUTTON_SELECT,                   BUTTON_NONE },
-     { ACTION_FM_EXIT,           BUTTON_MENU | BUTTON_REL,        BUTTON_NONE },
+     { ACTION_FM_EXIT,           BUTTON_MENU | BUTTON_REL,        BUTTON_MENU },
+     { ACTION_FM_QUICKSCREEN,    BUTTON_MENU|BUTTON_REPEAT,       BUTTON_MENU },
      { ACTION_FM_PLAY,           BUTTON_PLAY | BUTTON_REL,        BUTTON_PLAY },   
      { ACTION_SETTINGS_INC,      BUTTON_SCROLL_FWD,               BUTTON_NONE },
      { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c
index d1e6f62..d199b20 100644
--- a/apps/keymaps/keymap-m200.c
+++ b/apps/keymaps/keymap-m200.c
@@ -234,7 +234,8 @@ static const struct button_mapping button_context_recscreen[]  = {
 #if CONFIG_TUNER
 static const struct button_mapping button_context_radio[]  = {
     { ACTION_NONE,              BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_FM_MENU,           BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_FM_MENU,           BUTTON_DOWN|BUTTON_REL,         BUTTON_DOWN },
+    { ACTION_FM_QUICKSCREEN,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },
     { ACTION_FM_PRESET,         BUTTON_SELECT,                  BUTTON_NONE },
     { ACTION_FM_STOP,           BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP   },
 //    { ACTION_FM_MODE,           BUTTON_REC,                     BUTTON_NONE },
diff --git a/apps/keymaps/keymap-m3.c b/apps/keymaps/keymap-m3.c
index a8f098b..4449d77 100644
--- a/apps/keymaps/keymap-m3.c
+++ b/apps/keymaps/keymap-m3.c
@@ -96,6 +96,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_STD_PREVREPEAT,  BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_STD_NEXT,        BUTTON_RIGHT,                  BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,  BUTTON_RIGHT|BUTTON_REPEAT,    BUTTON_NONE },
+    //{ ACTION_FM_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT,      BUTTON_REC },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
diff --git a/apps/keymaps/keymap-ondavx747.c b/apps/keymaps/keymap-ondavx747.c
index 508d86d..812b162 100644
--- a/apps/keymaps/keymap-ondavx747.c
+++ b/apps/keymaps/keymap-ondavx747.c
@@ -153,6 +153,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_PRESET,      BUTTON_MENU|BUTTON_REL,            BUTTON_NONE   },
     { ACTION_FM_MODE,        BUTTON_POWER|BUTTON_REL,           BUTTON_POWER  },
     { ACTION_FM_EXIT,        BUTTON_POWER|BUTTON_REPEAT,        BUTTON_NONE   },
+    //{ ACTION_FM_QUICKSCREEN, BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_radio */
 
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 859f4fe..c2ac45e 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -212,7 +212,8 @@ static const struct button_mapping button_context_bmark[]  = {
 
 static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_MENU,        BUTTON_F1,                             BUTTON_NONE },
-    { ACTION_FM_PRESET,      BUTTON_F2,                             BUTTON_NONE },
+    { ACTION_FM_PRESET,      BUTTON_F2|BUTTON_REL,                  BUTTON_F2 },
+    { ACTION_FM_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT,               BUTTON_NONE },
     { ACTION_FM_RECORD,      BUTTON_F3,                             BUTTON_NONE },
     { ACTION_FM_FREEZE,      BUTTON_PLAY,                           BUTTON_NONE },
     { ACTION_FM_STOP,        BUTTON_OFF,                            BUTTON_NONE },
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index ab1bf8a..6d3a515 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -274,7 +274,8 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_PRESET,      BUTTON_CENTER|BUTTON_REL,         BUTTON_NONE },
     { ACTION_FM_STOP,        BUTTON_BOTTOMRIGHT|BUTTON_REL,    BUTTON_NONE },
     { ACTION_FM_EXIT,        BUTTON_TOPLEFT|BUTTON_REL,        BUTTON_NONE },
-    { ACTION_FM_MODE,        BUTTON_BOTTOMLEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_FM_MODE,        BUTTON_BOTTOMLEFT|BUTTON_REL,     BUTTON_BOTTOMLEFT },
+    { ACTION_FM_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT,  BUTTON_BOTTOMLEFT },
     { ACTION_FM_PLAY,        BUTTON_TOPRIGHT|BUTTON_REL,       BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_FM)
 }; /* button_context_radio */
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 059a3f2..a2be640 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -100,6 +100,7 @@ static const struct button_mapping button_context_radio[]  = {
     { ACTION_FM_STOP,        BUTTON_POWER,                  BUTTON_NONE },
     { ACTION_FM_MODE,        BUTTON_PLAY | BUTTON_REPEAT,   BUTTON_PLAY },
     { ACTION_FM_EXIT,        BUTTON_REC | BUTTON_REL,       BUTTON_REC },
+    { ACTION_FM_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT,      BUTTON_REC },
     { ACTION_FM_PLAY,        BUTTON_PLAY | BUTTON_REL,      BUTTON_PLAY },
     { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_STD_NEXT,       BUTTON_RIGHT,                  BUTTON_NONE },
@@ -114,7 +115,8 @@ static const struct button_mapping remote_button_context_radio[]  = {
     { ACTION_FM_STOP,         BUTTON_RC_PLAY|BUTTON_REPEAT,  BUTTON_RC_PLAY },
     { ACTION_FM_PLAY,         BUTTON_RC_PLAY|BUTTON_REL,     BUTTON_RC_PLAY },
     { ACTION_FM_MODE,         BUTTON_RC_REC|BUTTON_REPEAT,   BUTTON_RC_REC },
-    { ACTION_FM_EXIT,         BUTTON_RC_MENU,                BUTTON_NONE },
+    { ACTION_FM_EXIT,         BUTTON_RC_MENU|BUTTON_REL,     BUTTON_RC_MENU },
+    { ACTION_FM_QUICKSCREEN,  BUTTON_RC_MENU|BUTTON_REPEAT,  BUTTON_RC_MENU },
     { ACTION_STD_PREVREPEAT,  BUTTON_RC_REW|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_STD_NEXT,        BUTTON_RC_FF,                  BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,  BUTTON_RC_FF|BUTTON_REPEAT,    BUTTON_NONE },