Index: apps/settings.c =================================================================== --- apps/settings.c (Revision 19921) +++ apps/settings.c (Arbeitskopie) @@ -66,6 +66,7 @@ #include "filetypes.h" #include "option_select.h" #include "backdrop.h" +#include "viewport.h" #if CONFIG_TUNER #include "radio.h" @@ -888,6 +889,9 @@ read_color_theme_file(); #endif } +#ifdef HAVE_LCD_BITMAP + viewport_init_custom_vp(); +#endif #ifdef HAVE_LCD_COLOR screens[SCREEN_MAIN].set_foreground(global_settings.fg_color); @@ -959,7 +963,6 @@ #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC enc_global_settings_apply(); #endif - list_init_viewports(NULL); } Index: apps/plugins/pictureflow.c =================================================================== --- apps/plugins/pictureflow.c (Revision 19921) +++ apps/plugins/pictureflow.c (Arbeitskopie) @@ -204,6 +204,8 @@ #define MAX_SPACING 40 #define MAX_MARGIN 80 +static struct viewport parent[NB_SCREENS]; + /* config values and their defaults */ static int slide_spacing = DISPLAY_WIDTH / 4; static int center_margin = (LCD_WIDTH - DISPLAY_WIDTH) / 12; @@ -1615,7 +1617,7 @@ MENUITEM_STRINGLIST(album_name_menu,"Show album title",NULL, "Hide album title", "Show at the bottom", "Show at the top"); - rb->do_menu(&album_name_menu, &selection, NULL, false); + rb->do_menu(&album_name_menu, &selection, parent, false); show_album_name = selection; return GO_TO_PREVIOUS; @@ -1634,7 +1636,7 @@ "Show album title", "Resize Covers", "Rebuild cache"); do { - selection=rb->do_menu(&settings_menu,&selection, NULL, false); + selection=rb->do_menu(&settings_menu,&selection, parent, false); switch(selection) { case 0: rb->set_bool("Show FPS", &show_fps); @@ -1711,7 +1713,7 @@ MENUITEM_STRINGLIST(main_menu,"PictureFlow Main Menu",NULL, "Settings", "Return", "Quit"); while (1) { - switch (rb->do_menu(&main_menu,&selection, NULL, false)) { + switch (rb->do_menu(&main_menu,&selection, parent, false)) { case 0: result = settings_menu(); if ( result != 0 ) return result; @@ -1965,8 +1967,11 @@ */ int main(void) { - int ret; - + int ret, i; + rb->viewportmanager_set_custom_vp(false); + FOR_NB_SCREENS(i) + rb->viewport_set_defaults(&parent[i], i); + rb->lcd_setfont(FONT_UI); draw_splashscreen(); @@ -2008,8 +2013,6 @@ return PLUGIN_ERROR; } - int i; - /* initialize */ int min_slide_cache = fmin(number_of_slides, SLIDE_CACHE_SIZE); for (i = 0; i < min_slide_cache; i++) { Index: apps/plugins/star.c =================================================================== --- apps/plugins/star.c (Revision 19921) +++ apps/plugins/star.c (Arbeitskopie) @@ -1019,6 +1019,7 @@ "Information","Keys","Quit"); FOR_NB_SCREENS(selection) { + rb->viewportmanager_set_custom_vp(false); rb->viewport_set_defaults(&vp[selection], selection); #if LCD_DEPTH > 1 if (rb->screens[selection]->depth > 1) @@ -1121,6 +1122,8 @@ level--; star_run_game(level); } + + rb->viewportmanager_set_custom_vp(false); return PLUGIN_OK; } Index: apps/plugins/text_editor.c =================================================================== --- apps/plugins/text_editor.c (Revision 19921) +++ apps/plugins/text_editor.c (Arbeitskopie) @@ -35,6 +35,7 @@ static int line_count = 0; static int last_action_line = 0; static int last_char_index = 0; +static struct viewport parent[NB_SCREENS]; #define ACTION_INSERT 0 #define ACTION_GET 1 @@ -204,7 +205,7 @@ void setup_lists(struct gui_synclist *lists, int sel) { - rb->gui_synclist_init(lists,list_get_name_cb,0, false, 1, NULL); + rb->gui_synclist_init(lists,list_get_name_cb,0, false, 1, parent); rb->gui_synclist_set_icon_callback(lists,NULL); rb->gui_synclist_set_nb_items(lists,line_count); rb->gui_synclist_limit_scroll(lists,true); @@ -322,11 +323,17 @@ #ifdef HAVE_LCD_COLOR bool edit_colors_file = false; #endif + int i; - copy_buffer[0]='\0'; prev_show_statusbar = rb->global_settings->statusbar; rb->global_settings->statusbar = false; + + rb->viewportmanager_set_custom_vp(false); + FOR_NB_SCREENS(i) + rb->viewport_set_defaults(&parent[i], i); + copy_buffer[0]='\0'; + #if LCD_DEPTH > 1 rb->lcd_set_backdrop(NULL); #endif @@ -503,6 +510,7 @@ } rb->gui_synclist_set_nb_items(&lists,line_count); } + rb->viewportmanager_set_custom_vp(true); rb->global_settings->statusbar = prev_show_statusbar; return PLUGIN_OK; } Index: apps/gui/statusbar.c =================================================================== --- apps/gui/statusbar.c (Revision 19921) +++ apps/gui/statusbar.c (Arbeitskopie) @@ -262,7 +262,7 @@ memcmp(&(bar->info), &(bar->lastinfo), sizeof(struct status_info))) { struct viewport vp; - viewport_set_defaults(&vp, display->screen_type); + viewport_set_fullscreen(&vp, display->screen_type); vp.height = STATUSBAR_HEIGHT; vp.x = STATUSBAR_X_POS; vp.y = STATUSBAR_Y_POS; Index: apps/gui/list.c =================================================================== --- apps/gui/list.c (Revision 19921) +++ apps/gui/list.c (Arbeitskopie) @@ -65,15 +65,16 @@ #ifdef HAVE_LCD_BITMAP static struct viewport parent[NB_SCREENS]; -void list_init_viewports(struct gui_synclist *list) +static void list_init_viewports(struct gui_synclist *list) { int i; - struct viewport *vp; FOR_NB_SCREENS(i) { - vp = &parent[i]; - if (!list || list->parent[i] == vp) - viewport_set_defaults(vp, i); + if (list->parent[i] == &parent[i]) + { + viewport_set_defaults(list->parent[i], i); + viewportmanager_set_custom_vp(true); + } } #ifdef HAVE_BUTTONBAR if (list && (list->parent[0] == &parent[0]) && global_settings.buttonbar) Index: apps/gui/viewport.c =================================================================== --- apps/gui/viewport.c (Revision 19921) +++ apps/gui/viewport.c (Arbeitskopie) @@ -37,6 +37,11 @@ static int statusbar_enabled = VP_SB_ALLSCREENS; +#ifdef HAVE_LCD_BITMAP +static bool custom_vp_enabled = false; +static struct viewport custom_vp[NB_SCREENS]; +#endif + int viewport_get_nb_lines(struct viewport *vp) { #ifdef HAVE_LCD_BITMAP @@ -53,10 +58,21 @@ return global_settings.statusbar || (statusbar_enabled & VP_SB_IGNORE_SETTING(screen)); return false; -} +} void viewport_set_defaults(struct viewport *vp, enum screen_type screen) { +#ifdef HAVE_LCD_BITMAP + if (custom_vp_enabled) + *vp = custom_vp[screen]; + else +#endif + viewport_set_fullscreen(vp, screen); +} + + +void viewport_set_fullscreen(struct viewport *vp, enum screen_type screen) +{ vp->x = 0; vp->width = screens[screen].lcdwidth; @@ -131,3 +147,142 @@ (void)data; viewportmanager_set_statusbar(statusbar_enabled); } + +#ifdef HAVE_LCD_BITMAP +void viewportmanager_set_custom_vp(const bool enable) +{ + if (enable && !custom_vp_enabled) + { + int i; + FOR_NB_SCREENS(i) + { + screens[i].clear_display(); + screens[i].update(); + } + } + custom_vp_enabled = enable; +} + +/* Generic viewport parsing function to parse viewports structures like + * the %V tag; basically just a wrapper for parse_list, so improvements + * should aim parse_list */ +const char* viewport_parse_viewport(struct viewport *vp, + const char *bufptr, const char seperator, enum screen_type screen) +{ + /* parse the list to the viewport struct */ + const char *ptr = bufptr; + int depth; + uint32_t set = 0; + + enum { + PL_X = 0, + PL_Y, + PL_WIDTH, + PL_HEIGHT, + PL_FONT, + PL_FG, + PL_BG, + }; + + /* Work out the depth of this display */ + depth = screens[screen].depth; +#ifdef HAVE_LCD_COLOR + if (depth == 16) + { + if (!(ptr = parse_list("dddddcc", &set, seperator, ptr, &vp->x, &vp->y, &vp->width, + &vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern))) + return VP_ERROR; + } + else +#endif +#if (LCD_DEPTH == 2) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 2) + if (depth == 2) { + if (!(ptr = parse_list("dddddgg", &set, seperator, ptr, &vp->x, &vp->y, &vp->width, + &vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern))) + return VP_ERROR; + } + else +#endif +#if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1) + if (depth == 1) + { + if (!(ptr = parse_list("ddddd", &set, seperator, ptr, &vp->x, &vp->y, &vp->width, + &vp->height, &vp->font))) + return VP_ERROR; + } + else +#endif + {} + + if (!LIST_VALUE_PARSED(set, PL_X) || !LIST_VALUE_PARSED(set, PL_Y)) + return VP_ERROR; + + /* fix defaults */ + if (!LIST_VALUE_PARSED(set, PL_WIDTH)) + vp->width = screens[screen].lcdwidth - vp->x; + if (!LIST_VALUE_PARSED(set, PL_HEIGHT)) + vp->height = screens[screen].lcdheight - vp->y; + +#if (LCD_DEPTH > 1) + if (!LIST_VALUE_PARSED(set, PL_FG)) + vp->fg_pattern = global_settings.fg_color; + if (!LIST_VALUE_PARSED(set, PL_BG)) + vp->bg_pattern = global_settings.bg_color; +#endif +#ifdef HAVE_LCD_COLOR + vp->lss_pattern = global_settings.lss_color; + vp->lse_pattern = global_settings.lse_color; + vp->lst_pattern = global_settings.lst_color; +#endif + /* Validate the viewport dimensions - we know that the numbers are + non-negative integers */ + if ((vp->x >= screens[screen].lcdwidth) || + ((vp->x + vp->width) > screens[screen].lcdwidth) || + (vp->y >= screens[screen].lcdheight) || + ((vp->y + vp->height) > screens[screen].lcdheight)) + { + return VP_ERROR; + } + + /* Default to using the user font if the font was an invalid number */ + if ((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI)) + vp->font = FONT_UI; + + vp->drawmode = DRMODE_SOLID; + + return ptr; +} + +/* returns 0 if defaults are used, due to viewport_parse_viewport failure */ +int viewport_init_custom_vp(void) +{ + custom_vp_enabled = false; + int screen; + FOR_NB_SCREENS(screen) + { +#ifdef HAVE_REMOTE_LCD + if (screen= SCREEN_REMOTE) + { + if(!(viewport_parse_viewport(&custom_vp[screen], + global_settings.remote_list_vp_config, ',', screen))) + { + viewport_set_fullscreen(&custom_vp[screen], screen); + return 0; + } + } + else +#endif + { + if (!(viewport_parse_viewport(&custom_vp[screen], + global_settings.list_vp_config, ',', screen))) + { + viewport_set_fullscreen(&custom_vp[screen], screen); + return 0; + } + } + } + + return 1; +} + +#endif /* HAVE_LCD_BITMAP */ Index: apps/gui/gwps.c =================================================================== --- apps/gui/gwps.c (Revision 19921) +++ apps/gui/gwps.c (Arbeitskopie) @@ -165,7 +165,7 @@ ab_repeat_init(); ab_reset_markers(); #endif - + viewportmanager_set_custom_vp(false); oldbars = viewportmanager_set_statusbar(VP_SB_HIDE_ALL); if(audio_status() & AUDIO_STATUS_PLAY) { @@ -284,12 +284,14 @@ #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_main_backdrop(); #endif + viewportmanager_set_custom_vp(true); viewportmanager_set_statusbar(oldbars); /* if music is stopped in the context menu we want to exit the wps */ if (onplay(wps_state.id3->path, FILE_ATTR_AUDIO, CONTEXT_WPS) == ONPLAY_MAINMENU || !audio_status()) return GO_TO_ROOT; + viewportmanager_set_custom_vp(false); viewportmanager_set_statusbar(wpsbars); /* track might have changed */ update_track = true; @@ -305,15 +307,22 @@ break; case ACTION_WPS_BROWSE: +#if LCD_DEPTH > 1 + show_main_backdrop(); +#endif +#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 + show_remote_main_backdrop(); +#endif #ifdef HAVE_LCD_CHARCELLS status_set_record(false); status_set_audio(false); #endif FOR_NB_SCREENS(i) gui_wps[i].display->stop_scroll(); + viewportmanager_set_custom_vp(true); + viewportmanager_set_statusbar(oldbars); return GO_TO_PREVIOUS_BROWSER; break; - /* play/pause */ case ACTION_WPS_PLAY: if (global_settings.party_mode) @@ -545,23 +554,25 @@ #ifdef HAVE_QUICKSCREEN case ACTION_WPS_QUICKSCREEN: { - viewportmanager_set_statusbar(oldbars); #if LCD_DEPTH > 1 show_main_backdrop(); #endif #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_main_backdrop(); #endif + viewportmanager_set_custom_vp(true); + viewportmanager_set_statusbar(oldbars); if (quick_screen_quick(button)) return SYS_USB_CONNECTED; wpsbars = fix_wps_bars(); - viewportmanager_set_statusbar(wpsbars); #if LCD_DEPTH > 1 show_wps_backdrop(); #endif #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_wps_backdrop(); #endif + viewportmanager_set_custom_vp(false); + viewportmanager_set_statusbar(wpsbars); restore = true; } break; @@ -571,17 +582,19 @@ #ifdef BUTTON_F3 case ACTION_F3: { - viewportmanager_set_statusbar(oldbars); #if LCD_DEPTH > 1 show_main_backdrop(); #endif #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_main_backdrop(); #endif + viewportmanager_set_custom_vp(true); + viewportmanager_set_statusbar(oldbars); if (quick_screen_f3(BUTTON_F3)) return SYS_USB_CONNECTED; restore = true; wpsbars = fix_wps_bars(); + viewportmanager_set_custom_vp(false); viewportmanager_set_statusbar(wpsbars); } break; @@ -591,13 +604,14 @@ #ifdef HAVE_PITCHSCREEN case ACTION_WPS_PITCHSCREEN: { - viewportmanager_set_statusbar(oldbars); #if LCD_DEPTH > 1 show_main_backdrop(); #endif #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_main_backdrop(); #endif + viewportmanager_set_custom_vp(true); + viewportmanager_set_statusbar(oldbars); if (1 == gui_syncpitchscreen_run()) return SYS_USB_CONNECTED; #if LCD_DEPTH > 1 @@ -606,8 +620,9 @@ #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_wps_backdrop(); #endif + viewportmanager_set_custom_vp(false); + viewportmanager_set_statusbar(wpsbars); restore = true; - viewportmanager_set_statusbar(wpsbars); } break; #endif /* HAVE_PITCHSCREEN */ @@ -633,13 +648,14 @@ case ACTION_WPS_ID3SCREEN: { - viewportmanager_set_statusbar(oldbars); #if LCD_DEPTH > 1 show_main_backdrop(); #endif #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_main_backdrop(); #endif + viewportmanager_set_custom_vp(true); + viewportmanager_set_statusbar(oldbars); browse_id3(); #if LCD_DEPTH > 1 show_wps_backdrop(); @@ -648,6 +664,7 @@ show_remote_wps_backdrop(); #endif restore = true; + viewportmanager_set_custom_vp(false); viewportmanager_set_statusbar(wpsbars); } break; @@ -665,13 +682,15 @@ break; #endif case SYS_POWEROFF: - viewportmanager_set_statusbar(oldbars); + #if LCD_DEPTH > 1 show_main_backdrop(); #endif #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_main_backdrop(); #endif + viewportmanager_set_custom_vp(true); + viewportmanager_set_statusbar(oldbars); default_event_handler(SYS_POWEROFF); break; @@ -704,7 +723,6 @@ } if (exit) { - viewportmanager_set_statusbar(oldbars); #ifdef HAVE_LCD_CHARCELLS status_set_record(false); status_set_audio(false); @@ -720,6 +738,15 @@ #ifdef AB_REPEAT_ENABLE ab_reset_markers(); #endif + +#if LCD_DEPTH > 1 + show_main_backdrop(); +#endif +#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 + show_remote_main_backdrop(); +#endif + viewportmanager_set_custom_vp(true); + viewportmanager_set_statusbar(oldbars); #ifdef HAVE_RECORDING if (button == ACTION_WPS_REC) return GO_TO_RECSCREEN; Index: apps/gui/list.h =================================================================== --- apps/gui/list.h (Revision 19921) +++ apps/gui/list.h (Arbeitskopie) @@ -139,8 +139,6 @@ extern void gui_list_screen_scroll_out_of_view(bool enable); #endif /* HAVE_LCD_BITMAP */ -void list_init_viewports(struct gui_synclist * lists); - extern void gui_synclist_init( struct gui_synclist * lists, list_get_name callback_get_item_name, Index: apps/gui/viewport.h =================================================================== --- apps/gui/viewport.h (Revision 19921) +++ apps/gui/viewport.h (Arbeitskopie) @@ -65,8 +65,20 @@ #define VP_SB_ONSCREEN(screen) (1u<remote_wps) - { - lcd_width = LCD_REMOTE_WIDTH; - lcd_height = LCD_REMOTE_HEIGHT; - } -#endif if (wps_data->num_viewports >= WPS_MAX_VIEWPORTS) return WPS_ERROR_INVALID_PARAM; @@ -623,7 +604,7 @@ return WPS_ERROR_INVALID_PARAM; ptr++; - vp = &wps_data->viewports[wps_data->num_viewports].vp; + struct viewport *vp = &wps_data->viewports[wps_data->num_viewports].vp; /* format: %V|x|y|width|height|font|fg_pattern|bg_pattern| */ /* Set the defaults for fields not user-specified */ @@ -631,80 +612,27 @@ /* Work out the depth of this display */ #ifdef HAVE_REMOTE_LCD - depth = (wps_data->remote_wps ? LCD_REMOTE_DEPTH : LCD_DEPTH); -#else - depth = LCD_DEPTH; -#endif - -#ifdef HAVE_LCD_COLOR - if (depth == 16) + if (!(wps_data->remote_wps)) { - if (!(ptr = parse_list("dddddcc", &set, '|', ptr, &vp->x, &vp->y, &vp->width, - &vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern))) - return WPS_ERROR_INVALID_PARAM; - } - else #endif -#if (LCD_DEPTH == 2) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 2) - if (depth == 2) { - /* Default to black on white */ - vp->fg_pattern = 0; - vp->bg_pattern = 3; - if (!(ptr = parse_list("dddddgg", &set, '|', ptr, &vp->x, &vp->y, &vp->width, - &vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern))) + if (!(ptr = viewport_parse_viewport(vp, ptr, '|', SCREEN_MAIN))) return WPS_ERROR_INVALID_PARAM; +#ifdef HAVE_REMOTE_LCD } - else -#endif -#if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1) - if (depth == 1) + else { - if (!(ptr = parse_list("ddddd", &set, '|', ptr, &vp->x, &vp->y, - &vp->width, &vp->height, &vp->font))) + if (!(ptr = viewport_parse_viewport(vp, ptr, '|', SCREEN_REMOTE))) return WPS_ERROR_INVALID_PARAM; } - else + #endif - {} + /* Check for trailing | */ if (*ptr != '|') return WPS_ERROR_INVALID_PARAM; - if (!LIST_VALUE_PARSED(set, PL_X) || !LIST_VALUE_PARSED(set, PL_Y)) - return WPS_ERROR_INVALID_PARAM; - - /* fix defaults */ - if (!LIST_VALUE_PARSED(set, PL_WIDTH)) - vp->width = lcd_width - vp->x; - if (!LIST_VALUE_PARSED(set, PL_HEIGHT)) - vp->height = lcd_height - vp->y; - - /* Default to using the user font if the font was an invalid number */ - if (!LIST_VALUE_PARSED(set, PL_FONT) || - ((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI))) - vp->font = FONT_UI; - /* Validate the viewport dimensions - we know that the numbers are - non-negative integers */ - if ((vp->x >= lcd_width) || - ((vp->x + vp->width) > lcd_width) || - (vp->y >= lcd_height) || - ((vp->y + vp->height) > lcd_height)) - { - return WPS_ERROR_INVALID_PARAM; - } - -#ifdef HAVE_LCD_COLOR - if (depth == 16) - { - if (!LIST_VALUE_PARSED(set, PL_FG)) - vp->fg_pattern = global_settings.fg_color; - if (!LIST_VALUE_PARSED(set, PL_BG)) - vp->bg_pattern = global_settings.bg_color; - } -#endif - wps_data->viewports[wps_data->num_viewports-1].last_line = wps_data->num_lines - 1; wps_data->viewports[wps_data->num_viewports].first_line = wps_data->num_lines; Index: apps/settings.h =================================================================== --- apps/settings.h (Revision 19921) +++ apps/settings.h (Arbeitskopie) @@ -735,6 +735,12 @@ /* If values are just added to the end, no need to bump plugin API version. */ /* new stuff to be added at the end */ +#ifdef HAVE_LCD_BITMAP + unsigned char list_vp_config[50]; /* viewport string for the lists */ +#endif +#ifdef HAVE_REMOTE_LCD + unsigned char remote_list_vp_config[50]; /* viewport file for the remote lists */ +#endif }; /** global variables **/ Index: apps/settings_list.c =================================================================== --- apps/settings_list.c (Revision 19921) +++ apps/settings_list.c (Arbeitskopie) @@ -177,6 +177,9 @@ {.custom = (void*)default}, name, NULL, \ {.custom_setting = (struct custom_setting[]){ \ {load_from_cfg, write_to_cfg, is_change, set_default}}}} +#define VIEWPORT_SETTING(var,name,default) \ + TEXT_SETTING(0,var,name,default, NULL, NULL) + /* some sets of values which are used more than once, to save memory */ static const char off_on[] = "off,on"; static const char off_on_ask[] = "off,on,ask"; @@ -1455,6 +1458,13 @@ qs_load_from_cfg, qs_write_to_cfg, qs_is_changed, qs_set_default), #endif + /* Customizable list */ +#ifdef HAVE_LCD_BITMAP + VIEWPORT_SETTING(list_vp_config, "list viewport", ""), +#endif +#ifdef HAVE_REMOTE_LCD + VIEWPORT_SETTING(remote_list_vp_config, "remote list viewport", ""), +#endif }; const int nb_settings = sizeof(settings)/sizeof(*settings); Index: apps/plugin.c =================================================================== --- apps/plugin.c (Revision 19921) +++ apps/plugin.c (Arbeitskopie) @@ -630,7 +630,10 @@ #ifdef CPU_ARM __div0, #endif - strip_extension + strip_extension, +#ifdef HAVE_LCD_BITMAP + viewportmanager_set_custom_vp, +#endif }; int plugin_load(const char* plugin, const void* parameter) Index: apps/plugin.h =================================================================== --- apps/plugin.h (Revision 19921) +++ apps/plugin.h (Arbeitskopie) @@ -786,6 +786,10 @@ void (*__div0)(void); #endif char* (*strip_extension)(char* buffer, int buffer_size, const char *filename); + +#ifdef HAVE_LCD_BITMAP + void (*viewportmanager_set_custom_vp)(const bool enable); +#endif }; /* plugin header */ Index: wps/WPSLIST =================================================================== --- wps/WPSLIST (Revision 19921) +++ wps/WPSLIST (Arbeitskopie) @@ -69,6 +69,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: - +remote list viewport: - @@ -81,6 +83,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: - +remote list viewport: - @@ -93,6 +97,8 @@ viewers iconset: selector type: bar (inverse) Statusbar: on +list viewport: - +remote list viewport: - @@ -105,6 +111,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: +remote list viewport: @@ -152,6 +160,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: - +remote list viewport: - @@ -159,6 +169,8 @@ Author: Mike Sobel Font: 13-Nimbus.fnt Statusbar: on +list viewport: - +remote list viewport: - @@ -173,6 +185,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: - +remote list viewport: - @@ -205,6 +219,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: - +remote list viewport: - @@ -227,6 +243,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: - +remote list viewport: - @@ -259,6 +277,8 @@ iconset: viewers iconset: selector type: bar (inverse) +list viewport: - +remote list viewport: - @@ -345,6 +365,10 @@ # Whether the WPS is designed to have the statusbar on or off Statusbar: on + +# list & remote list viewports +list viewport: - +remote list viewport: - Index: wps/wpsbuild.pl =================================================================== --- wps/wpsbuild.pl (Revision 19921) +++ wps/wpsbuild.pl (Arbeitskopie) @@ -53,6 +53,8 @@ my $viewericon; my $lineselecttextcolor; my $filetylecolor; +my $listviewport; +my $remotelistviewport; # LCD sizes my ($main_height, $main_width, $main_depth); @@ -290,6 +292,12 @@ if($rwps && $has_remote ) { push @out, "rwps: /$rbdir/wps/$rwps\n"; } + if(defined($listviewport)) { + push @out, "list viewport: $listviewport\n"; + } + if(defined($remotelistviewport) && $has_remote) { + push @out, "remote list viewport: $listviewport\n"; + } if(-f "$rbdir/wps/$cfg") { print STDERR "wpsbuild warning: wps/$cfg already exists!\n"; } @@ -344,6 +352,8 @@ undef $viewericon; undef $lineselecttextcolor; undef $filetylecolor; + undef $listviewport; + undef $remotelistviewport; next; } @@ -510,6 +520,12 @@ elsif($l =~ /^filetype colours: *(.*)/i) { $filetylecolor = $1; } + elsif($l =~ /^list viewport: *(.*)/i) { + $listviewport = $1; + } + elsif($l =~ /^remote list viewport: *(.*)/i) { + $remotelistviewport = $1; + } else{ #print "Unknown line: $l!\n"; }