? h300 ? ipod ? tools/codepages ? tools/ipod_fw ? tools/mkboot ? tools/rdf2binary Index: apps/action.h =================================================================== RCS file: /cvsroot/rockbox/apps/action.h,v retrieving revision 1.7 diff -u -r1.7 action.h --- apps/action.h 17 Aug 2006 12:33:36 -0000 1.7 +++ apps/action.h 19 Aug 2006 11:48:01 -0000 @@ -46,13 +46,25 @@ CONTEXT_ID3DB = 5, /* Add new contexts here, no need to explicitly define a value for them */ CONTEXT_LIST, - CONTEXT_SETTINGS, /* options style settings, like from menus */ - CONTEXT_SETTINGSGRAPHICAL, /* screens like eq config and colour chooser */ - - CONTEXT_YESNOSCREEN, /*NOTE: make sure your target has this and ACTION_YESNO_ACCEPT */ - CONTEXT_BOOKMARKSCREEN, /*NOTE: requires the action_setting_* mappings also */ + CONTEXT_SETTINGS, /* regular setting screens (and debug screens) */ + /* bellow are setting screens which may need to redefine the standard + setting screen keys, targets should return the CONTEXT_SETTINGS + keymap unless they are not adequate for the screen + NOTE: uses ACTION_STD_[NEXT|PREV] so make sure they are there also + and (possibly) ACTION_SETTINGS_[INC|DEC] */ + CONTEXT_SETTINGS_EQ, + CONTEXT_SETTINGS_COLOURCHOOSER, + CONTEXT_SETTINGS_TIME, + + /* The following contexts should use ACTION_STD_[NEXT|PREV] + and (possibly) ACTION_SETTINGS_[INC|DEC] + Also add any extra actions they need */ + CONTEXT_BOOKMARKSCREEN, /* uses ACTION_BMS_ defines */ + CONTEXT_ALARMSCREEN, /* uses ACTION_AS_ defines */ CONTEXT_QUICKSCREEN, /* uses ACTION_QS_ defines below */ CONTEXT_PITCHSCREEN, /* uses ACTION_PS_ defines below */ + + CONTEXT_YESNOSCREEN, /*NOTE: make sure your target has this and ACTION_YESNO_ACCEPT */ }; @@ -121,15 +133,19 @@ /* settings */ ACTION_SETTINGS_INC, ACTION_SETTINGS_INCREPEAT, + ACTION_SETTINGS_INCBIGSTEP, ACTION_SETTINGS_DEC, ACTION_SETTINGS_DECREPEAT, - - /* yesno screen */ - ACTION_YESNO_ACCEPT, + ACTION_SETTINGS_DECBIGSTEP, + ACTION_SETTINGS_RESET, /* bookmark screen */ - ACTION_BMARK_DELETE, + ACTION_BMS_SELECT, + ACTION_BMS_DELETE, + ACTION_BMS_EXIT, + /* alarm menu screen */ + /* quickscreen */ ACTION_QS_LEFT, ACTION_QS_RIGHT, @@ -149,6 +165,9 @@ ACTION_PS_RESET, ACTION_PS_EXIT, /* _STD_* isnt going to work here */ + /* yesno screen */ + ACTION_YESNO_ACCEPT, + }; Index: apps/alarm_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/alarm_menu.c,v retrieving revision 1.13 diff -u -r1.13 alarm_menu.c --- apps/alarm_menu.c 15 Aug 2006 12:49:22 -0000 1.13 +++ apps/alarm_menu.c 19 Aug 2006 11:48:01 -0000 @@ -85,7 +85,7 @@ screens[i].puts(0, 1, buf); gui_textarea_update(&screens[i]); } - button = get_action(CONTEXT_SETTINGS,HZ); + button = get_action(CONTEXT_ALARMSCREEN,HZ); switch(button) { case ACTION_STD_OK: Index: apps/bookmark.c =================================================================== RCS file: /cvsroot/rockbox/apps/bookmark.c,v retrieving revision 1.51 diff -u -r1.51 bookmark.c --- apps/bookmark.c 15 Aug 2006 12:27:04 -0000 1.51 +++ apps/bookmark.c 19 Aug 2006 11:48:03 -0000 @@ -458,11 +458,12 @@ while(!done) { /* Wait for a key to be pushed */ - key = get_action(CONTEXT_SETTINGS,TIMEOUT_BLOCK); + key = get_action(CONTEXT_BOOKMARKSCREEN,TIMEOUT_BLOCK); switch(key) { #ifdef HAVE_LCD_BITMAP case ACTION_STD_NEXT: + case ACTION_STD_NEXTREPEAT: return bookmark_load(global_bookmark_file_name, false); #endif case ACTION_STD_OK: @@ -577,7 +578,7 @@ #endif bookmark_count = get_bookmark_count(bookmark_file_name); - + action_signalscreenchange(); while(true) { if(bookmark_id < 0) @@ -618,7 +619,7 @@ key = get_action(CONTEXT_BOOKMARKSCREEN,TIMEOUT_BLOCK); switch(key) { - case ACTION_STD_OK: + case ACTION_BMS_SELECT: /* User wants to use this bookmark */ #ifdef HAVE_LCD_BITMAP if (global_settings.statusbar) @@ -635,7 +636,7 @@ action_signalscreenchange(); return bookmark; - case ACTION_BMARK_DELETE: + case ACTION_BMS_DELETE: /* User wants to delete this bookmark */ delete_bookmark(bookmark_file_name, bookmark_id); bookmark_id_prev=-2; @@ -644,15 +645,17 @@ bookmark_id = bookmark_count -1; break; - case ACTION_SETTINGS_DEC: + case ACTION_STD_PREV: + case ACTION_STD_PREVREPEAT: bookmark_id--; break; - case ACTION_SETTINGS_INC: + case ACTION_STD_NEXT: + case ACTION_STD_NEXTREPEAT: bookmark_id++; break; - case ACTION_STD_CANCEL: + case ACTION_BMS_EXIT: #ifdef HAVE_LCD_BITMAP FOR_NB_SCREENS(i) screens[i].setmargins(x, y); Index: apps/eq_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/eq_menu.c,v retrieving revision 1.23 diff -u -r1.23 eq_menu.c --- apps/eq_menu.c 15 Aug 2006 12:27:04 -0000 1.23 +++ apps/eq_menu.c 19 Aug 2006 11:48:04 -0000 @@ -619,7 +619,7 @@ screens[i].update(); } - button = get_action(CONTEXT_SETTINGSGRAPHICAL,TIMEOUT_BLOCK); + button = get_action(CONTEXT_SETTINGS_EQ,TIMEOUT_BLOCK); switch (button) { case ACTION_SETTINGS_DEC: @@ -638,23 +638,19 @@ *(setting) = max; break; -#ifdef EQ_BTN_MODIFIER - case EQ_BTN_MODIFIER | EQ_BTN_INCREMENT: - case EQ_BTN_MODIFIER | EQ_BTN_INCREMENT | BUTTON_REPEAT: + case ACTION_SETTINGS_INCBIGSTEP: *(setting) += fast_step; has_changed = true; if (*(setting) > max) *(setting) = max; break; - case EQ_BTN_MODIFIER | EQ_BTN_DECREMENT: - case EQ_BTN_MODIFIER | EQ_BTN_DECREMENT | BUTTON_REPEAT: + case ACTION_SETTINGS_DECBIGSTEP: *(setting) -= fast_step; has_changed = true; if (*(setting) < min) *(setting) = min; break; -#endif case ACTION_STD_PREV: case ACTION_STD_PREVREPEAT: @@ -670,13 +666,13 @@ current_band = 0; /* wrap around */ break; - case ACTION_STD_OK: + case ACTION_STD_OK: mode++; if (mode > Q) mode = GAIN; /* wrap around */ break; - case ACTION_STD_CANCEL: + case ACTION_STD_CANCEL: exit_request = true; result = false; break; Index: apps/screens.c =================================================================== RCS file: /cvsroot/rockbox/apps/screens.c,v retrieving revision 1.166 diff -u -r1.166 screens.c --- apps/screens.c 17 Aug 2006 09:28:04 -0000 1.166 +++ apps/screens.c 19 Aug 2006 11:48:05 -0000 @@ -916,7 +916,7 @@ say_time(cursorpos, tm); } - button = get_action(CONTEXT_SETTINGS,HZ/2); + button = get_action(CONTEXT_SETTINGS_TIME,HZ/2); switch ( button ) { case ACTION_STD_PREV: cursorpos = (cursorpos + 6 - 1) % 6; @@ -925,6 +925,7 @@ cursorpos = (cursorpos + 6 + 1) % 6; break; case ACTION_SETTINGS_INC: + case ACTION_SETTINGS_INCREPEAT: *valptr = (*valptr + steps - min + 1) % steps + min; if(*valptr == 0) @@ -932,6 +933,7 @@ say_time(cursorpos, tm); break; case ACTION_SETTINGS_DEC: + case ACTION_SETTINGS_DECREPEAT: *valptr = (*valptr + steps - min - 1) % steps + min; if(*valptr == 0) Index: apps/gui/color_picker.c =================================================================== RCS file: /cvsroot/rockbox/apps/gui/color_picker.c,v retrieving revision 1.11 diff -u -r1.11 color_picker.c --- apps/gui/color_picker.c 15 Aug 2006 12:27:05 -0000 1.11 +++ apps/gui/color_picker.c 19 Aug 2006 11:48:06 -0000 @@ -184,14 +184,16 @@ draw_screen(&screens[i], title, rgb_val, newcolor, slider); } - button = get_action(CONTEXT_SETTINGSGRAPHICAL,TIMEOUT_BLOCK); + button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER,TIMEOUT_BLOCK); switch (button) { case ACTION_STD_PREV: + case ACTION_STD_PREVREPEAT: slider = (slider+2)%3; break; case ACTION_STD_NEXT: + case ACTION_STD_NEXTREPEAT: slider = (slider+1)%3; break; Index: apps/keymaps/keymap-h1x0_h3x0.c =================================================================== RCS file: /cvsroot/rockbox/apps/keymaps/keymap-h1x0_h3x0.c,v retrieving revision 1.11 diff -u -r1.11 keymap-h1x0_h3x0.c --- apps/keymaps/keymap-h1x0_h3x0.c 19 Aug 2006 08:00:20 -0000 1.11 +++ apps/keymaps/keymap-h1x0_h3x0.c 19 Aug 2006 11:48:08 -0000 @@ -38,7 +38,9 @@ /* CONTEXT_CUSTOM's used in this file... CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) - +CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens + i.e where up/down is inc/dec + CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec */ @@ -51,12 +53,14 @@ { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE }, + { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, { ACTION_STD_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, { ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_standard */ @@ -137,13 +141,16 @@ { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, + { 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_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_settings */ -const struct button_mapping button_context_settingsgraphical[] = { +const struct button_mapping button_context_settings_right_is_inc[] = { { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, @@ -152,6 +159,7 @@ { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_settingsgraphical */ @@ -161,10 +169,26 @@ LAST_ITEM_IN_LIST }; /* button_context_settings_yesno */ +const struct button_mapping button_context_colorchooser[] = { + { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), +}; /* button_context_settings_bmark */ + +const struct button_mapping button_context_eq[] = { + { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), +}; /* button_context_settings_bmark */ + const struct button_mapping button_context_bmark[] = { - { ACTION_BMARK_DELETE, BUTTON_REC, BUTTON_NONE }, + { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), +}; /* button_context_settings_bmark */ + +const struct button_mapping button_context_time[] = { + { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ const struct button_mapping button_context_quickscreen[] = { @@ -408,15 +432,15 @@ const struct button_mapping button_context_bmark_h100remote[] = { - { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE }, + { ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_ON, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL|CONTEXT_REMOTE), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS|CONTEXT_REMOTE), }; /* button_context_settings_bmark */ const struct button_mapping button_context_bmark_h300lcdremote[] = { - { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE }, + { ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_MENU, BUTTON_NONE }, - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL|CONTEXT_REMOTE), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS|CONTEXT_REMOTE), }; const struct button_mapping button_context_quickscreen_h100remote[] = { @@ -625,9 +649,6 @@ return remote_btn_ctxt_listtree_scroll_w_cmb; case CONTEXT_CUSTOM|CONTEXT_TREE: return remote_btn_ctxt_tree; - - case CONTEXT_SETTINGSGRAPHICAL: - return remote_btn_ctxt_settingsgrph; case CONTEXT_SETTINGS: return remote_btn_ctxt_settings; @@ -667,16 +688,22 @@ return button_context_listtree_scroll_with_combo; case CONTEXT_CUSTOM|CONTEXT_TREE: return button_context_tree; - - case CONTEXT_SETTINGSGRAPHICAL: - return button_context_settingsgraphical; case CONTEXT_SETTINGS: return button_context_settings; + case CONTEXT_CUSTOM|CONTEXT_SETTINGS: + return button_context_settings_right_is_inc; + + case CONTEXT_SETTINGS_COLOURCHOOSER: + return button_context_colorchooser; + case CONTEXT_SETTINGS_EQ: + return button_context_eq; - case CONTEXT_YESNOSCREEN: - return button_context_yesno; + case CONTEXT_SETTINGS_TIME: + return button_context_time; + case CONTEXT_YESNOSCREEN: + return button_context_yesno; case CONTEXT_BOOKMARKSCREEN: return button_context_bmark; case CONTEXT_QUICKSCREEN: Index: apps/keymaps/keymap-ipod.c =================================================================== RCS file: /cvsroot/rockbox/apps/keymaps/keymap-ipod.c,v retrieving revision 1.6 diff -u -r1.6 keymap-ipod.c --- apps/keymaps/keymap-ipod.c 16 Aug 2006 14:14:16 -0000 1.6 +++ apps/keymaps/keymap-ipod.c 19 Aug 2006 11:48:10 -0000 @@ -32,7 +32,7 @@ /* CONTEXT_CUSTOM's used in this file... -CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions) +CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) */ @@ -45,11 +45,11 @@ { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, + { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, - { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* button_context_standard */ @@ -69,7 +69,7 @@ { 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|1), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; const struct button_mapping button_context_wps[] = { @@ -102,7 +102,8 @@ { 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_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, /* rel so bmark screen works */ + { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, LAST_ITEM_IN_LIST }; /* button_context_settings */ @@ -113,7 +114,7 @@ }; /* button_context_settings_yesno */ const struct button_mapping button_context_bmark[] = { - { ACTION_BMARK_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, + { ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ @@ -157,15 +158,14 @@ case CONTEXT_TREE: if (global_settings.hold_lr_for_scroll_in_list) return button_context_tree_scroll_lr; - /* else fall through to CUSTOM|1 */ - case CONTEXT_CUSTOM|1: + /* else fall through to CUSTOM|CONTEXT_TREE */ + case CONTEXT_CUSTOM|CONTEXT_TREE: return button_context_tree; case CONTEXT_LIST: case CONTEXT_MAINMENU: break; case CONTEXT_SETTINGS: - case CONTEXT_SETTINGSGRAPHICAL: return button_context_settings; case CONTEXT_YESNOSCREEN: return button_context_yesno;