diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2009-06-20 10:32:55 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2009-06-20 10:32:55 +0000 |
commit | c88ee0ba077a0d281cbc18131b2d5d28a23afbc9 (patch) | |
tree | f67ad519d1570fb578855d9b4c2f8f5fdb9dee9a /apps/keymaps | |
parent | 346da2fd5e7d9e0f7b27934d84b5fef848f360af (diff) | |
download | rockbox-c88ee0ba077a0d281cbc18131b2d5d28a23afbc9.tar.gz rockbox-c88ee0ba077a0d281cbc18131b2d5d28a23afbc9.zip |
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
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-c200.c | 75 |
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[] = { | |||
41 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 41 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
42 | 42 | ||
43 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 43 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
44 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 44 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
46 | 46 | ||
47 | { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 47 | { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
48 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 48 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
49 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 49 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
50 | { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE }, | 50 | { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, |
51 | 51 | ||
52 | LAST_ITEM_IN_LIST | 52 | LAST_ITEM_IN_LIST |
53 | }; /* button_context_standard */ | 53 | }; /* button_context_standard */ |
@@ -64,23 +64,22 @@ static const struct button_mapping button_context_wps[] = { | |||
64 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 64 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
65 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 65 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
66 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 66 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
67 | 67 | ||
68 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, | 68 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, |
69 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, | 69 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, |
70 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, | 70 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, |
71 | 71 | ||
72 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 72 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
73 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 73 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
74 | |||
75 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 74 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
76 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 75 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
77 | 76 | ||
78 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 77 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
79 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 78 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
80 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 79 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
81 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | 80 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
82 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 81 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
83 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 82 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN, BUTTON_NONE }, |
84 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 83 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
85 | 84 | ||
86 | LAST_ITEM_IN_LIST | 85 | LAST_ITEM_IN_LIST |
@@ -112,7 +111,6 @@ static const struct button_mapping button_context_list[] = { | |||
112 | #ifdef HAVE_VOLUME_IN_LIST | 111 | #ifdef HAVE_VOLUME_IN_LIST |
113 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 112 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
114 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 113 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
115 | |||
116 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 114 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
117 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 115 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
118 | #endif | 116 | #endif |
@@ -121,33 +119,17 @@ static const struct button_mapping button_context_list[] = { | |||
121 | }; /* button_context_list */ | 119 | }; /* button_context_list */ |
122 | 120 | ||
123 | static const struct button_mapping button_context_tree[] = { | 121 | static const struct button_mapping button_context_tree[] = { |
124 | { ACTION_TREE_WPS, BUTTON_REC|BUTTON_UP, BUTTON_REC }, | 122 | { ACTION_TREE_WPS, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
125 | { ACTION_TREE_STOP, BUTTON_REC|BUTTON_UP|BUTTON_REPEAT, BUTTON_REC|BUTTON_UP }, | ||
126 | 123 | ||
127 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 124 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
128 | }; /* button_context_tree */ | 125 | }; /* button_context_tree */ |
129 | 126 | ||
130 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | ||
131 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | ||
132 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
133 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
134 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
135 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | ||
136 | |||
137 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | ||
138 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
139 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
140 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | ||
141 | |||
142 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | ||
143 | }; /* button_context_listtree_scroll_without_combo */ | ||
144 | |||
145 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 127 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
146 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 128 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
147 | 129 | ||
148 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, | 130 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, |
149 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 131 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
150 | 132 | ||
151 | { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_REC }, | 133 | { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_REC }, |
152 | { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | 134 | { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, |
153 | 135 | ||
@@ -249,25 +231,23 @@ static const struct button_mapping button_context_keyboard[] = { | |||
249 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 231 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
250 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 232 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
251 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 233 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
252 | |||
253 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, | ||
254 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE }, | ||
255 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, | ||
256 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | ||
257 | |||
258 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 234 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
259 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 235 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
260 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 236 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
261 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 237 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
262 | 238 | ||
263 | { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, | 239 | { ACTION_KBD_CURSOR_LEFT, BUTTON_VOL_DOWN, BUTTON_NONE }, |
264 | { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_DOWN|BUTTON_REPEAT,BUTTON_NONE }, | 240 | { ACTION_KBD_CURSOR_LEFT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
265 | 241 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_UP, BUTTON_NONE }, | |
266 | { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, | 242 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
267 | 243 | { ACTION_KBD_BACKSPACE, BUTTON_REC, BUTTON_NONE }, | |
268 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 244 | { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
269 | { ACTION_KBD_DONE, BUTTON_VOL_UP, BUTTON_NONE }, | 245 | |
270 | { ACTION_KBD_DONE, BUTTON_VOL_DOWN, BUTTON_NONE }, | 246 | { ACTION_KBD_PAGE_FLIP, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_SELECT }, |
247 | { ACTION_KBD_PAGE_FLIP, BUTTON_SELECT|BUTTON_LEFT, BUTTON_SELECT }, | ||
248 | |||
249 | { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
250 | { ACTION_KBD_DONE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
271 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, | 251 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, |
272 | 252 | ||
273 | LAST_ITEM_IN_LIST | 253 | LAST_ITEM_IN_LIST |
@@ -311,10 +291,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
311 | return button_context_list; | 291 | return button_context_list; |
312 | case CONTEXT_TREE: | 292 | case CONTEXT_TREE: |
313 | case CONTEXT_MAINMENU: | 293 | case CONTEXT_MAINMENU: |
314 | if (global_settings.hold_lr_for_scroll_in_list) | 294 | return button_context_listtree_scroll_with_combo; |
315 | return button_context_listtree_scroll_without_combo; | ||
316 | else | ||
317 | return button_context_listtree_scroll_with_combo; | ||
318 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 295 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
319 | return button_context_tree; | 296 | return button_context_tree; |
320 | 297 | ||