Index: apps/lang/english.lang =================================================================== --- apps/lang/english.lang (revision 20959) +++ apps/lang/english.lang (working copy) @@ -4240,7 +4240,7 @@ ipod*,c200,sa9200: "MENU = Revert" x5,m5: "RECORD = Revert" h10,h10_5gb,e200*: "PREV = Revert" - gigabeatf: "A = Revert" + gigabeatf: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" @@ -4251,7 +4251,7 @@ ipod*,c200,sa9200: "MENU = Revert" x5,m5: "RECORD = Revert" h10,h10_5gb,e200*: "PREV = Revert" - gigabeatf: "A = Revert" + gigabeatf: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" Index: apps/plugins/text_editor.c =================================================================== --- apps/plugins/text_editor.c (revision 20954) +++ apps/plugins/text_editor.c (working copy) @@ -154,6 +154,7 @@ if (!rb->read(fd,&t,1)) { rb->strcpy(eol,"\n"); + rb->close(fd); return 0; } if (t == '\r') @@ -323,14 +324,11 @@ bool changed = false; int cur_sel=0; static char copy_buffer[MAX_LINE_LEN]; - bool prev_show_statusbar; #ifdef HAVE_LCD_COLOR bool edit_colors_file = false; #endif copy_buffer[0]='\0'; - prev_show_statusbar = rb->global_settings->statusbar; - rb->global_settings->statusbar = false; #if LCD_DEPTH > 1 rb->lcd_set_backdrop(NULL); @@ -512,6 +510,5 @@ } rb->gui_synclist_set_nb_items(&lists,line_count); } - rb->global_settings->statusbar = prev_show_statusbar; return PLUGIN_OK; } Index: apps/plugins/spacerocks.c =================================================================== --- apps/plugins/spacerocks.c (revision 20954) +++ apps/plugins/spacerocks.c (working copy) @@ -1985,8 +1985,8 @@ button = rb->button_get(false); #ifdef HAS_BUTTON_HOLD - if (rb->button_hold()) - game_state = PAUSE_MODE; + if (rb->button_hold() && game_state == PLAY_MODE) + game_state = PAUSE_MODE; #endif switch(button) Index: apps/plugins/star.c =================================================================== --- apps/plugins/star.c (revision 20954) +++ apps/plugins/star.c (working copy) @@ -1054,7 +1054,7 @@ } while(!menu_quit) { - switch(rb->do_menu(&menu, &selection, vp, false)) + switch(rb->do_menu(&menu, &selection, vp, true)) { case 0: menu_quit = true; Index: apps/plugins/rocklife.c =================================================================== --- apps/plugins/rocklife.c (revision 20954) +++ apps/plugins/rocklife.c (working copy) @@ -129,7 +129,7 @@ static bool load_cellfile(const char *file, char *pgrid){ int fd; fd = rb->open(file, O_RDONLY); - if (fd==-1) + if (fd<0) return false; init_grid(pgrid); Index: apps/plugins/pictureflow/pictureflow.c =================================================================== --- apps/plugins/pictureflow/pictureflow.c (revision 20954) +++ apps/plugins/pictureflow/pictureflow.c (working copy) @@ -2547,7 +2547,7 @@ #endif ret = main_menu(); if ( ret == -1 ) return PLUGIN_OK; - if ( ret != 0 ) return i; + if ( ret != 0 ) return ret; #ifdef USEGSLIB grey_show(true); #endif Index: apps/plugins/lib/helper.c =================================================================== --- apps/plugins/lib/helper.c (revision 20954) +++ apps/plugins/lib/helper.c (working copy) @@ -25,8 +25,6 @@ /* Force the backlight on */ void backlight_force_on(void) { - if(!rb) - return; if (rb->global_settings->backlight_timeout > 0) rb->backlight_set_timeout(0); #if CONFIG_CHARGING @@ -38,8 +36,6 @@ /* Reset backlight operation to its settings */ void backlight_use_settings(void) { - if (!rb) - return; rb->backlight_set_timeout(rb->global_settings->backlight_timeout); #if CONFIG_CHARGING rb->backlight_set_timeout_plugged(rb->global_settings-> @@ -51,8 +47,6 @@ /* Force the backlight on */ void remote_backlight_force_on(void) { - if (!rb) - return; if (rb->global_settings->remote_backlight_timeout > 0) rb->remote_backlight_set_timeout(0); #if CONFIG_CHARGING @@ -64,8 +58,6 @@ /* Reset backlight operation to its settings */ void remote_backlight_use_settings(void) { - if (!rb) - return; rb->remote_backlight_set_timeout(rb->global_settings-> remote_backlight_timeout); #if CONFIG_CHARGING @@ -79,8 +71,6 @@ /* Force the buttonlight on */ void buttonlight_force_on(void) { - if (!rb) - return; if (rb->global_settings->buttonlight_timeout > 0) rb->buttonlight_set_timeout(0); } @@ -88,8 +78,6 @@ /* Reset buttonlight operation to its settings */ void buttonlight_use_settings(void) { - if (!rb) - return; rb->buttonlight_set_timeout(rb->global_settings->buttonlight_timeout); } #endif /* HAVE_BUTTON_LIGHT */ @@ -97,15 +85,11 @@ #ifdef HAVE_BACKLIGHT_BRIGHTNESS void backlight_brightness_set(int brightness) { - if (!rb) - return; rb->backlight_set_brightness(brightness); } void backlight_brightness_use_setting(void) { - if (!rb) - return; rb->backlight_set_brightness(rb->global_settings->brightness); } #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ Index: apps/plugins/dict.c =================================================================== --- apps/plugins/dict.c (revision 20954) +++ apps/plugins/dict.c (working copy) @@ -147,8 +147,8 @@ #endif /* data files */ -#define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index" -#define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc" +#define DICT_INDEX PLUGIN_APPS_DIR "/dict.index" +#define DICT_DESC PLUGIN_APPS_DIR "/dict.desc" /* the main plugin function */ enum plugin_status plugin_start(const void* parameter) Index: apps/plugins/stopwatch.c =================================================================== --- apps/plugins/stopwatch.c (revision 20954) +++ apps/plugins/stopwatch.c (working copy) @@ -32,7 +32,7 @@ #define LAP_Y TIMER_Y+1 #define MAX_LAPS 64 -#define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat" +#define STOPWATCH_FILE PLUGIN_APPS_DIR "/stopwatch.dat" /* variable button definitions */ #if CONFIG_KEYPAD == RECORDER_PAD Index: apps/plugins/keybox.c =================================================================== --- apps/plugins/keybox.c (revision 20954) +++ apps/plugins/keybox.c (working copy) @@ -22,7 +22,7 @@ #include "lib/md5.h" PLUGIN_HEADER -#define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat" +#define KEYBOX_FILE PLUGIN_APPS_DIR "/keybox.dat" #define BLOCK_SIZE 8 #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */ #define FIELD_LEN 32 /* should be enough for anyone ;) */ Index: apps/plugins/pegbox.c =================================================================== --- apps/plugins/pegbox.c (revision 20954) +++ apps/plugins/pegbox.c (working copy) @@ -39,8 +39,8 @@ #define PB_USB 2 #define PB_QUIT 1 -#define DATA_FILE PLUGIN_DIR "/games/pegbox.data" -#define SAVE_FILE PLUGIN_DIR "/games/pegbox.save" +#define DATA_FILE PLUGIN_GAMES_DIR "/pegbox.data" +#define SAVE_FILE PLUGIN_GAMES_DIR "/pegbox.save" #define ROWS 8 /* Number of rows on each board */ #define COLS 12 /* Number of columns on each board */ Index: apps/keymaps/keymap-gigabeat.c =================================================================== --- apps/keymaps/keymap-gigabeat.c (revision 20954) +++ apps/keymaps/keymap-gigabeat.c (working copy) @@ -68,8 +68,8 @@ static const struct button_mapping button_context_wps[] = { - { ACTION_WPS_PLAY, BUTTON_A|BUTTON_REL, BUTTON_A }, - { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, + { ACTION_WPS_PLAY, BUTTON_A|BUTTON_REL, BUTTON_A }, + { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, @@ -79,39 +79,39 @@ { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_A|BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_WPS_ABSETA_PREVDIR, BUTTON_A|BUTTON_LEFT, BUTTON_NONE }, - { ACTION_WPS_ABRESET, BUTTON_A|BUTTON_SELECT, BUTTON_NONE }, + { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_A|BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_WPS_ABSETA_PREVDIR,BUTTON_A|BUTTON_LEFT, BUTTON_NONE }, + { ACTION_WPS_ABRESET, BUTTON_A|BUTTON_SELECT, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, - { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, - { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_DOWN, BUTTON_A }, + { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, + { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_DOWN, BUTTON_A }, { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, - { ACTION_WPS_ID3SCREEN, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, + { ACTION_WPS_ID3SCREEN, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, LAST_ITEM_IN_LIST }; /* button_context_wps */ static const struct button_mapping button_context_list[] = { - { ACTION_LISTTREE_PGUP, BUTTON_A|BUTTON_UP, BUTTON_A }, - { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_A|BUTTON_UP }, - { ACTION_LISTTREE_PGUP, BUTTON_A|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_LISTTREE_PGDOWN, BUTTON_A|BUTTON_DOWN, BUTTON_A }, - { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_A|BUTTON_DOWN }, - { ACTION_LISTTREE_PGDOWN, BUTTON_A|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_LISTTREE_PGUP, BUTTON_A|BUTTON_UP, BUTTON_A }, + { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_A|BUTTON_UP }, + { ACTION_LISTTREE_PGUP, BUTTON_A|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_LISTTREE_PGDOWN, BUTTON_A|BUTTON_DOWN, BUTTON_A }, + { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_A|BUTTON_DOWN }, + { ACTION_LISTTREE_PGDOWN, BUTTON_A|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, #ifdef HAVE_VOLUME_IN_LIST { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, @@ -123,7 +123,7 @@ }; /* button_context_list */ static const struct button_mapping button_context_tree[] = { - { ACTION_TREE_WPS, BUTTON_A|BUTTON_REL, BUTTON_A }, + { ACTION_TREE_WPS, BUTTON_A|BUTTON_REL, BUTTON_A }, { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, @@ -134,12 +134,12 @@ static const struct button_mapping button_context_listtree_scroll_with_combo[] = { { ACTION_NONE, BUTTON_A, BUTTON_NONE }, { ACTION_TREE_PGLEFT, BUTTON_A|BUTTON_LEFT, BUTTON_A }, - { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_A|BUTTON_LEFT }, + { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_A|BUTTON_LEFT }, { ACTION_TREE_PGLEFT, BUTTON_A|BUTTON_LEFT, BUTTON_LEFT|BUTTON_REL }, - { ACTION_TREE_ROOT_INIT, BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_A|BUTTON_LEFT }, + { ACTION_TREE_ROOT_INIT, BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_A|BUTTON_LEFT }, { ACTION_TREE_PGLEFT, BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_TREE_PGRIGHT, BUTTON_A|BUTTON_RIGHT, BUTTON_A }, - { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_A|BUTTON_RIGHT }, + { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_A|BUTTON_RIGHT }, { ACTION_TREE_PGRIGHT, BUTTON_A|BUTTON_RIGHT, BUTTON_RIGHT|BUTTON_REL }, { ACTION_TREE_PGRIGHT, BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), @@ -167,7 +167,7 @@ { 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_A, BUTTON_NONE }, + { ACTION_SETTINGS_RESET, BUTTON_A, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ @@ -181,36 +181,36 @@ { 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_A, BUTTON_NONE }, + { ACTION_SETTINGS_RESET, BUTTON_A, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical */ static const struct button_mapping button_context_yesno[] = { - { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, + { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ static const struct button_mapping button_context_colorchooser[] = { - { ACTION_STD_OK, BUTTON_A|BUTTON_REL, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_A|BUTTON_REL, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_colorchooser */ static const struct button_mapping button_context_eq[] = { - { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), }; /* button_context_eq */ /** Bookmark Screen **/ static const struct button_mapping button_context_bmark[] = { - { ACTION_BMS_DELETE, BUTTON_A, BUTTON_NONE }, + { ACTION_BMS_DELETE, BUTTON_A, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_bmark */ static const struct button_mapping button_context_time[] = { - { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - { ACTION_STD_OK, BUTTON_A, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_A, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_time */ @@ -238,8 +238,8 @@ { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_TOGGLE_MODE, BUTTON_MENU, BUTTON_NONE }, - { ACTION_PS_RESET, BUTTON_A, BUTTON_NONE }, - { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, + { ACTION_PS_RESET, BUTTON_A, BUTTON_NONE }, + { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ @@ -249,14 +249,14 @@ { 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_A|BUTTON_LEFT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_LEFT, BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_CURSOR_LEFT, BUTTON_A|BUTTON_LEFT, BUTTON_NONE }, + { ACTION_KBD_CURSOR_LEFT, BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_KBD_PAGE_FLIP, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, - { ACTION_KBD_DONE, BUTTON_A|BUTTON_REL, BUTTON_A }, - { ACTION_KBD_ABORT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, + { ACTION_KBD_PAGE_FLIP, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, + { ACTION_KBD_DONE, BUTTON_A|BUTTON_REL, BUTTON_A }, + { ACTION_KBD_ABORT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE },