Finally commit a few improvements to the c200 (last version of FS#8824): In lists - long instead of short Rec to switch to the recording screen for consistency, one button 'resume' on long Right (disables the forced horizontal scrolling on long Left/Right though). WPS - put context menu on long Select for consistency, frees the short Down for entering the quickscreen. Virtual keyboard - enable line edit mode, additionally better navigating of the input line (Volume Up/Down to move left/right, backspace on Rec) and move accept to long Select -- see patch description for details (and everything I might forgot). Change the manual accordingly.

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

1 files changed, 26 insertions, 49 deletions

diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c
index b6047611ef..bddfa9b1d5 100644
--- a/apps/keymaps/keymap-c200.c
+++ b/apps/keymaps/keymap-c200.c
@@ -41,13 +41,13 @@ static const struct button_mapping button_context_standard[]  = {
     { 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_OK,            BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
+    { ACTION_STD_CANCEL,        BUTTON_LEFT,                    BUTTON_NONE },
 
-    { ACTION_STD_MENU,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER  },
+    { ACTION_STD_MENU,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
     { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
-    { ACTION_STD_REC,           BUTTON_REC|BUTTON_REPEAT,       BUTTON_NONE   },
-    { ACTION_STD_QUICKSCREEN,   BUTTON_REC|BUTTON_SELECT,       BUTTON_NONE   },
+    { ACTION_STD_REC,           BUTTON_REC|BUTTON_REPEAT,       BUTTON_REC },
+    { ACTION_STD_QUICKSCREEN,   BUTTON_REC|BUTTON_SELECT,       BUTTON_REC },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -64,23 +64,22 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
     { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE  },
     { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
-    
+
     { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT,      BUTTON_POWER },
     { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT,       BUTTON_POWER },
     { ACTION_WPS_ABRESET,       BUTTON_POWER|BUTTON_UP,         BUTTON_POWER },
     
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                  BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
-
     { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN,                BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
     
     { ACTION_WPS_MENU,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER  },
-    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },    
+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
     { ACTION_WPS_PITCHSCREEN,   BUTTON_SELECT|BUTTON_UP,        BUTTON_SELECT },
     { ACTION_WPS_ID3SCREEN,     BUTTON_SELECT|BUTTON_DOWN,      BUTTON_SELECT },
-    { ACTION_WPS_CONTEXT,       BUTTON_DOWN|BUTTON_REL,         BUTTON_DOWN   },
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN   },
+    { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
+    { ACTION_WPS_QUICKSCREEN,   BUTTON_DOWN,                    BUTTON_NONE   },
     { ACTION_WPS_REC,           BUTTON_REC|BUTTON_REPEAT,       BUTTON_NONE   },
     
     LAST_ITEM_IN_LIST
@@ -112,7 +111,6 @@ static const struct button_mapping button_context_list[]  = {
 #ifdef HAVE_VOLUME_IN_LIST
     { ACTION_LIST_VOLUP,        BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_LIST_VOLUP,        BUTTON_VOL_UP,                  BUTTON_NONE },
-
     { ACTION_LIST_VOLDOWN,      BUTTON_VOL_DOWN,                BUTTON_NONE },
     { ACTION_LIST_VOLDOWN,      BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 #endif
@@ -121,33 +119,17 @@ static const struct button_mapping button_context_list[]  = {
 }; /* button_context_list */
 
 static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,          BUTTON_REC|BUTTON_UP,               BUTTON_REC },
-    { ACTION_TREE_STOP,         BUTTON_REC|BUTTON_UP|BUTTON_REPEAT, BUTTON_REC|BUTTON_UP },
+    { ACTION_TREE_WPS,          BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_tree */
 
-static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
-    { ACTION_NONE,              BUTTON_LEFT,                    BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
-
-    { ACTION_NONE,              BUTTON_RIGHT,                   BUTTON_NONE  },
-    { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE  },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-}; /* button_context_listtree_scroll_without_combo */
-
 static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
     { ACTION_TREE_ROOT_INIT,    BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
-    
+
     { ACTION_TREE_PGLEFT,       BUTTON_REC|BUTTON_LEFT,         BUTTON_REC },
     { ACTION_TREE_PGLEFT,       BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
-    
+
     { ACTION_TREE_PGRIGHT,      BUTTON_REC|BUTTON_RIGHT,        BUTTON_REC },
     { ACTION_TREE_PGRIGHT,      BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
 
@@ -249,25 +231,23 @@ static const struct button_mapping button_context_keyboard[]  = {
     { 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_REC|BUTTON_LEFT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
-    
     { ACTION_KBD_UP,           BUTTON_UP,                       BUTTON_NONE },
     { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,         BUTTON_NONE },
     { ACTION_KBD_DOWN,         BUTTON_DOWN,                     BUTTON_NONE },
     { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,       BUTTON_NONE },
-    
-    { ACTION_KBD_BACKSPACE,    BUTTON_REC|BUTTON_DOWN,          BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_REC|BUTTON_DOWN|BUTTON_REPEAT,BUTTON_NONE },
-    
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_REC|BUTTON_SELECT,        BUTTON_REC },
-
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                   BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_VOL_UP,                   BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_VOL_DOWN,                 BUTTON_NONE },
+ 
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_VOL_DOWN,                 BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_VOL_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_UP,                   BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_UP|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_REC,                      BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_REC|BUTTON_REPEAT,        BUTTON_NONE },
+
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_SELECT|BUTTON_RIGHT,      BUTTON_SELECT },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_SELECT|BUTTON_LEFT,       BUTTON_SELECT },
+
+    { ACTION_KBD_SELECT,       BUTTON_SELECT|BUTTON_REL,        BUTTON_SELECT },
+    { ACTION_KBD_DONE,         BUTTON_SELECT|BUTTON_REPEAT,     BUTTON_SELECT },
     { ACTION_KBD_ABORT,        BUTTON_POWER,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
@@ -311,10 +291,7 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_list;
         case CONTEXT_TREE:
         case CONTEXT_MAINMENU:
-            if (global_settings.hold_lr_for_scroll_in_list)
-                return button_context_listtree_scroll_without_combo;
-            else 
-                return button_context_listtree_scroll_with_combo;
+            return button_context_listtree_scroll_with_combo;
         case CONTEXT_CUSTOM|CONTEXT_TREE:
             return button_context_tree;