Index: apps/menu.c =================================================================== --- apps/menu.c (Revision 24080) +++ apps/menu.c (Arbeitskopie) @@ -69,11 +69,11 @@ static int talk_menu_item(int selected_item, void *data); static void get_menu_callback(const struct menu_item_ex *m, - menu_callback_type *menu_callback) + menu_callback_type *menu_callback) { if (m->flags&(MENU_HAS_DESC|MENU_DYNAMIC_DESC)) *menu_callback= m->callback_and_desc->menu_callback; - else + else *menu_callback = m->menu_callback; } @@ -101,7 +101,7 @@ const struct menu_item_ex *menu = (const struct menu_item_ex *)data; int type = (menu->flags&MENU_TYPE_MASK); selected_item = get_menu_selection(selected_item, menu); - + (void)buffer_len; /* only MT_MENU or MT_RETURN_ID is allowed in here */ if (type == MT_RETURN_ID) @@ -111,13 +111,13 @@ menu->menu_get_name_and_icon->list_get_name_data, buffer); return menu->strings[selected_item]; } - + menu = menu->submenus[selected_item]; - + if ((menu->flags&MENU_DYNAMIC_DESC) && (type != MT_SETTING_W_TEXT)) return menu->menu_get_name_and_icon->list_get_name(selected_item, menu->menu_get_name_and_icon->list_get_name_data, buffer); - + type = (menu->flags&MENU_TYPE_MASK); if ((type == MT_SETTING) || (type == MT_SETTING_W_TEXT)) { @@ -135,7 +135,7 @@ const struct menu_item_ex *menu = (const struct menu_item_ex *)data; int menu_icon = Icon_NOICON; selected_item = get_menu_selection(selected_item, menu); - + if ((menu->flags&MENU_TYPE_MASK) == MT_RETURN_ID) { return Icon_Menu_functioncall; @@ -145,7 +145,7 @@ menu_icon = menu->callback_and_desc->icon_id; else if (menu->flags&MENU_DYNAMIC_DESC) menu_icon = menu->menu_get_name_and_icon->icon_id; - + if (menu_icon == Icon_NOICON) { switch (menu->flags&MENU_TYPE_MASK) @@ -194,7 +194,7 @@ current_subitems_count++; } } - else + else { current_subitems[current_subitems_count] = i; current_subitems_count++; @@ -219,7 +219,7 @@ gui_synclist_set_nb_items(lists,current_subitems_count); gui_synclist_limit_scroll(lists,true); gui_synclist_select_item(lists, find_menu_selection(selected)); - + get_menu_callback(menu,&menu_callback); if (callback && menu_callback) menu_callback(ACTION_ENTER_MENUITEM,menu); @@ -234,13 +234,13 @@ int type; unsigned char *str; int sel = get_menu_selection(selected_item, menu); - + if ((menu->flags&MENU_TYPE_MASK) == MT_MENU) { type = menu->submenus[sel]->flags&MENU_TYPE_MASK; if ((type == MT_SETTING) || (type == MT_SETTING_W_TEXT)) talk_setting(menu->submenus[sel]->variable); - else + else { if (menu->submenus[sel]->flags&(MENU_DYNAMIC_DESC)) { @@ -305,7 +305,7 @@ title = temp->callback_and_desc->desc; else title = ID2P(setting->lang_id); - + /* Pad the title string by repeating it. This is needed so the scroll settings title can actually be used to test the setting */ @@ -328,7 +328,7 @@ padded_title[i] = '\0'; title = padded_title; } - + option_screen((struct settings_list *)setting, parent, setting->flags&F_TEMPVAR, title); } @@ -339,13 +339,26 @@ { int selected = start_selected? *start_selected : 0; int action; + char buf[64]; + bool backdrop_reset = false; struct gui_synclist lists; const struct menu_item_ex *temp, *menu; int ret = 0, i; bool redraw_lists; - FOR_NB_SCREENS(i) + + if (!lcd_get_backdrop()) { + snprintf(buf, sizeof buf, BACKDROP_DIR "/%s.bmp", + global_settings.backdrop_file); + backdrop_load(BACKDROP_MAIN, buf); + backdrop_reset = true; + } + + FOR_NB_SCREENS(i) { + if (backdrop_reset) + screens[i].backdrop_show(BACKDROP_MAIN); viewportmanager_theme_enable(i, !hide_bars, NULL); - + } + const struct menu_item_ex *menu_stack[MAX_MENUS]; int menu_stack_selected_item[MAX_MENUS]; int stack_top = 0; @@ -370,8 +383,8 @@ in_stringlist = ((menu->flags&MENU_TYPE_MASK) == MT_RETURN_ID); /* load the callback, and only reload it if menu changes */ get_menu_callback(menu, &menu_callback); - + #ifdef HAVE_BUTTONBAR if (!hide_bars) { @@ -391,7 +404,7 @@ action = get_action(CONTEXT_MAINMENU, list_do_action_timeout(&lists, HZ)); /* HZ so the status bar redraws corectly */ - + if (menu_callback) { int old_action = action; @@ -460,12 +473,12 @@ ID2P(LANG_BOTTOM_QS_ITEM), ID2P(LANG_RIGHT_QS_ITEM)); #endif - MENUITEM_STRINGLIST(notquickscreen_able_option, + MENUITEM_STRINGLIST(notquickscreen_able_option, ID2P(LANG_ONPLAY_MENU_TITLE), NULL, ID2P(LANG_RESET_SETTING)); const struct menu_item_ex *menu; int menu_selection = 0; - const struct settings_list *setting = + const struct settings_list *setting = find_setting(temp->variable, NULL); #ifdef HAVE_QUICKSCREEN if (is_setting_quickscreenable(setting)) @@ -531,7 +544,7 @@ if (!exiting_menu && (menu->flags&MENU_EXITAFTERTHISMENU)) done = true; else - init_menu_lists(menu, &lists, + init_menu_lists(menu, &lists, menu_stack_selected_item[stack_top], false, vps); /* new menu, so reload the callback */ get_menu_callback(menu, &menu_callback); @@ -562,7 +575,7 @@ redraw_lists = true; if (in_stringlist) type = (menu->flags&MENU_TYPE_MASK); - else + else { type = (temp->flags&MENU_TYPE_MASK); get_menu_callback(temp, &menu_callback); @@ -592,7 +605,7 @@ if (temp->flags&MENU_FUNC_USEPARAM) return_value = temp->function->function_w_param( temp->function->param); - else + else return_value = temp->function->function(); if (!(menu->flags&MENU_EXITAFTERTHISMENU) || (temp->flags&MENU_EXITAFTERTHISMENU)) @@ -646,7 +659,7 @@ init_menu_lists(menu,&lists,selected,true,vps); /* callback was changed, so reload the menu's callback */ get_menu_callback(menu, &menu_callback); - if ((menu->flags&MENU_EXITAFTERTHISMENU) && + if ((menu->flags&MENU_EXITAFTERTHISMENU) && !(temp->flags&MENU_EXITAFTERTHISMENU)) { done = true; @@ -665,7 +678,7 @@ ret = MENU_ATTACHED_USB; done = true; } - + if (redraw_lists && !done) { if (menu_callback) @@ -686,8 +699,13 @@ *start_selected = get_menu_selection( gui_synclist_get_sel_pos(&lists), menu); } - FOR_NB_SCREENS(i) - viewportmanager_theme_undo(i); + + if (backdrop_reset) + backdrop_unload(BACKDROP_MAIN); + + FOR_NB_SCREENS(i) + if (backdrop_reset) + screens[i].backdrop_show(BACKDROP_MAIN); + viewportmanager_theme_undo(i); return ret; } -