diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-21 11:28:29 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-21 11:28:29 +0000 |
commit | 56a16d7b236984d2a2012874eb5ed790a9ccf26b (patch) | |
tree | 216dae5691f749d6bbf5be1dbefa11dcbacfd7a2 /apps/keymaps/keymap-h1x0_h3x0.c | |
parent | d12f81ddd4a0cdd76d08540b70068b3cb2c985ed (diff) | |
download | rockbox-56a16d7b236984d2a2012874eb5ed790a9ccf26b.tar.gz rockbox-56a16d7b236984d2a2012874eb5ed790a9ccf26b.zip |
Action lists no longer automatically "chain" to the CONTEXT_STD unless explicitly told to
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10671 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-h1x0_h3x0.c')
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index b68aed8a37..ff87bff7d3 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -100,7 +100,7 @@ const struct button_mapping button_context_list[] = { | |||
100 | { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON }, | 100 | { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON }, |
101 | { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_ON|BUTTON_DOWN }, | 101 | { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_ON|BUTTON_DOWN }, |
102 | { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 102 | { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
103 | LAST_ITEM_IN_LIST | 103 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
104 | }; /* button_context_list */ | 104 | }; /* button_context_list */ |
105 | 105 | ||
106 | const struct button_mapping button_context_tree[] = { | 106 | const struct button_mapping button_context_tree[] = { |
@@ -148,7 +148,7 @@ const struct button_mapping button_context_settings[] = { | |||
148 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 148 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
149 | { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, | 149 | { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, |
150 | 150 | ||
151 | LAST_ITEM_IN_LIST | 151 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
152 | }; /* button_context_settings */ | 152 | }; /* button_context_settings */ |
153 | 153 | ||
154 | const struct button_mapping button_context_settings_right_is_inc[] = { | 154 | const struct button_mapping button_context_settings_right_is_inc[] = { |
@@ -162,12 +162,12 @@ const struct button_mapping button_context_settings_right_is_inc[] = { | |||
162 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 162 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
163 | { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, | 163 | { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, |
164 | 164 | ||
165 | LAST_ITEM_IN_LIST | 165 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
166 | }; /* button_context_settingsgraphical */ | 166 | }; /* button_context_settingsgraphical */ |
167 | 167 | ||
168 | const struct button_mapping button_context_yesno[] = { | 168 | const struct button_mapping button_context_yesno[] = { |
169 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 169 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
170 | LAST_ITEM_IN_LIST | 170 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
171 | }; /* button_context_settings_yesno */ | 171 | }; /* button_context_settings_yesno */ |
172 | 172 | ||
173 | const struct button_mapping button_context_colorchooser[] = { | 173 | const struct button_mapping button_context_colorchooser[] = { |
@@ -203,7 +203,7 @@ const struct button_mapping button_context_quickscreen[] = { | |||
203 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 203 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
204 | { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, | 204 | { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, |
205 | 205 | ||
206 | LAST_ITEM_IN_LIST | 206 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
207 | }; /* button_context_quickscreen */ | 207 | }; /* button_context_quickscreen */ |
208 | 208 | ||
209 | const struct button_mapping button_context_pitchscreen[] = { | 209 | const struct button_mapping button_context_pitchscreen[] = { |
@@ -218,7 +218,7 @@ const struct button_mapping button_context_pitchscreen[] = { | |||
218 | { ACTION_PS_RESET, BUTTON_ON, BUTTON_NONE }, | 218 | { ACTION_PS_RESET, BUTTON_ON, BUTTON_NONE }, |
219 | { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE }, | 219 | { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE }, |
220 | 220 | ||
221 | LAST_ITEM_IN_LIST | 221 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
222 | }; /* button_context_pitchcreen */ | 222 | }; /* button_context_pitchcreen */ |
223 | 223 | ||
224 | const struct button_mapping button_context_recscreen[] = { | 224 | const struct button_mapping button_context_recscreen[] = { |
@@ -229,7 +229,7 @@ const struct button_mapping button_context_recscreen[] = { | |||
229 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 229 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
230 | { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 230 | { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
231 | 231 | ||
232 | LAST_ITEM_IN_LIST | 232 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
233 | }; /* button_context_recscreen */ | 233 | }; /* button_context_recscreen */ |
234 | 234 | ||
235 | /***************************************************************************** | 235 | /***************************************************************************** |
@@ -251,7 +251,7 @@ const struct button_mapping button_context_standard_h100remote[] = { | |||
251 | { ACTION_STD_OK, BUTTON_RC_ON, BUTTON_NONE }, | 251 | { ACTION_STD_OK, BUTTON_RC_ON, BUTTON_NONE }, |
252 | { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, | 252 | { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, |
253 | 253 | ||
254 | LAST_ITEM_IN_LIST | 254 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
255 | }; /* button_context_standard_h100lcdremote */ | 255 | }; /* button_context_standard_h100lcdremote */ |
256 | 256 | ||
257 | const struct button_mapping button_context_standard_h300lcdremote[] = { | 257 | const struct button_mapping button_context_standard_h300lcdremote[] = { |
@@ -268,7 +268,7 @@ const struct button_mapping button_context_standard_h300lcdremote[] = { | |||
268 | { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, | 268 | { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, |
269 | { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE }, | 269 | { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE }, |
270 | 270 | ||
271 | LAST_ITEM_IN_LIST | 271 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
272 | 272 | ||
273 | }; | 273 | }; |
274 | 274 | ||
@@ -302,12 +302,12 @@ const struct button_mapping button_context_wps_remotescommon[] = { | |||
302 | const struct button_mapping button_context_wps_h100remote[] = { | 302 | const struct button_mapping button_context_wps_h100remote[] = { |
303 | { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, | 303 | { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, |
304 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, | 304 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, |
305 | LAST_ITEM_IN_LIST | 305 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
306 | }; | 306 | }; |
307 | const struct button_mapping button_context_wps_h300lcdremote[] = { | 307 | const struct button_mapping button_context_wps_h300lcdremote[] = { |
308 | { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, | 308 | { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, |
309 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, | 309 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, |
310 | LAST_ITEM_IN_LIST | 310 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
311 | }; | 311 | }; |
312 | 312 | ||
313 | const struct button_mapping button_context_list_h100remote[] = { | 313 | const struct button_mapping button_context_list_h100remote[] = { |
@@ -315,7 +315,7 @@ const struct button_mapping button_context_list_h100remote[] = { | |||
315 | { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, | 315 | { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, |
316 | { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, | 316 | { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, |
317 | { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, | 317 | { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, |
318 | LAST_ITEM_IN_LIST | 318 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
319 | }; | 319 | }; |
320 | 320 | ||
321 | const struct button_mapping *button_context_list_h300lcdremote = | 321 | const struct button_mapping *button_context_list_h300lcdremote = |
@@ -392,7 +392,7 @@ const struct button_mapping button_context_settings_h100remote[] = { | |||
392 | { ACTION_NONE, BUTTON_RC_STOP, BUTTON_NONE }, | 392 | { ACTION_NONE, BUTTON_RC_STOP, BUTTON_NONE }, |
393 | { ACTION_NONE, BUTTON_RC_MENU|BUTTON_REL, BUTTON_NONE }, | 393 | { ACTION_NONE, BUTTON_RC_MENU|BUTTON_REL, BUTTON_NONE }, |
394 | */ | 394 | */ |
395 | LAST_ITEM_IN_LIST | 395 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
396 | }; /* button_context_settings */ | 396 | }; /* button_context_settings */ |
397 | 397 | ||
398 | const struct button_mapping button_context_settings_h300lcdremote[] = { | 398 | const struct button_mapping button_context_settings_h300lcdremote[] = { |
@@ -403,7 +403,7 @@ const struct button_mapping button_context_settings_h300lcdremote[] = { | |||
403 | { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, | 403 | { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, |
404 | { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE }, | 404 | { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE }, |
405 | 405 | ||
406 | LAST_ITEM_IN_LIST | 406 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
407 | }; /* button_context_settings */ | 407 | }; /* button_context_settings */ |
408 | 408 | ||
409 | 409 | ||
@@ -418,7 +418,7 @@ const struct button_mapping button_context_settingsgraphical_h100remote[] = { | |||
418 | { ACTION_STD_NEXT, BUTTON_RC_BITRATE, BUTTON_NONE }, | 418 | { ACTION_STD_NEXT, BUTTON_RC_BITRATE, BUTTON_NONE }, |
419 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, | 419 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, |
420 | 420 | ||
421 | LAST_ITEM_IN_LIST | 421 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
422 | }; /* button_context_settingsgraphical_h100remote */ | 422 | }; /* button_context_settingsgraphical_h100remote */ |
423 | 423 | ||
424 | const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { | 424 | const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { |
@@ -431,12 +431,12 @@ const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = | |||
431 | { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 431 | { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
432 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 432 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
433 | 433 | ||
434 | LAST_ITEM_IN_LIST | 434 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
435 | }; /* button_context_settingsgraphical_h300remote */ | 435 | }; /* button_context_settingsgraphical_h300remote */ |
436 | 436 | ||
437 | const struct button_mapping button_context_yesno_h100remote[] = { | 437 | const struct button_mapping button_context_yesno_h100remote[] = { |
438 | { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, | 438 | { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, |
439 | LAST_ITEM_IN_LIST | 439 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
440 | }; /* button_context_settings_yesno */ | 440 | }; /* button_context_settings_yesno */ |
441 | 441 | ||
442 | const struct button_mapping *button_context_yesno_h300lcdremote = | 442 | const struct button_mapping *button_context_yesno_h300lcdremote = |
@@ -465,7 +465,7 @@ const struct button_mapping button_context_quickscreen_h100remote[] = { | |||
465 | { ACTION_QS_RIGHT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, | 465 | { ACTION_QS_RIGHT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, |
466 | { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, | 466 | { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, |
467 | 467 | ||
468 | LAST_ITEM_IN_LIST | 468 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
469 | }; /* button_context_quickscreen */ | 469 | }; /* button_context_quickscreen */ |
470 | 470 | ||
471 | const struct button_mapping button_context_quickscreen_h300lcdremote[] = { | 471 | const struct button_mapping button_context_quickscreen_h300lcdremote[] = { |
@@ -479,7 +479,7 @@ const struct button_mapping button_context_quickscreen_h300lcdremote[] = { | |||
479 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 479 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, |
480 | { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, | 480 | { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, |
481 | 481 | ||
482 | LAST_ITEM_IN_LIST | 482 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
483 | }; /* button_context_quickscreen */ | 483 | }; /* button_context_quickscreen */ |
484 | 484 | ||
485 | const struct button_mapping button_context_pitchscreen_h100remote[] = { | 485 | const struct button_mapping button_context_pitchscreen_h100remote[] = { |
@@ -494,7 +494,7 @@ const struct button_mapping button_context_pitchscreen_h100remote[] = { | |||
494 | { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, | 494 | { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, |
495 | { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, | 495 | { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, |
496 | 496 | ||
497 | LAST_ITEM_IN_LIST | 497 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
498 | }; /* button_context_pitchcreen */ | 498 | }; /* button_context_pitchcreen */ |
499 | 499 | ||
500 | const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { | 500 | const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { |
@@ -509,7 +509,7 @@ const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { | |||
509 | { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, | 509 | { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, |
510 | { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, | 510 | { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, |
511 | 511 | ||
512 | LAST_ITEM_IN_LIST | 512 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
513 | }; | 513 | }; |
514 | 514 | ||
515 | const struct button_mapping button_context_recscreen_h100remote[] = { | 515 | const struct button_mapping button_context_recscreen_h100remote[] = { |
@@ -521,7 +521,7 @@ const struct button_mapping button_context_recscreen_h100remote[] = { | |||
521 | { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE, BUTTON_NONE }, | 521 | { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE, BUTTON_NONE }, |
522 | { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, | 522 | { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, |
523 | 523 | ||
524 | LAST_ITEM_IN_LIST | 524 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
525 | }; /* button_context_recscreen_h100remote */ | 525 | }; /* button_context_recscreen_h100remote */ |
526 | 526 | ||
527 | const struct button_mapping button_context_recscreen_h300lcdremote[] = { | 527 | const struct button_mapping button_context_recscreen_h300lcdremote[] = { |
@@ -533,7 +533,7 @@ const struct button_mapping button_context_recscreen_h300lcdremote[] = { | |||
533 | { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, | 533 | { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, |
534 | { ACTION_SETTINGS_DEC, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 534 | { ACTION_SETTINGS_DEC, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
535 | 535 | ||
536 | LAST_ITEM_IN_LIST | 536 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
537 | }; /* button_context_recscreen_h300lcdremote */ | 537 | }; /* button_context_recscreen_h300lcdremote */ |
538 | 538 | ||
539 | 539 | ||