cleanup statusbar+base skin relationship...

* remove the "custom" option from the statusbar setting. if a sbs file is set then statusbar setting is ignored, no other user visible change there.
* new tag, %wi  - use to draw the inbuilt statusbar in the current viewport


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25038 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 3 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index d610fe4a4d..316b97523c 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -630,7 +630,8 @@ static bool get_line(struct gui_wps *gwps,
                      struct skin_subline *subline,
                      struct align_pos *align,
                      char *linebuf,
-                     int linebuf_size)
+                     int linebuf_size,
+                     unsigned refresh_mode)
 {
     struct wps_data *data = gwps->data;
 
@@ -639,6 +640,7 @@ static bool get_line(struct gui_wps *gwps,
     char *linebuf_end = linebuf + linebuf_size - 1;
     bool update = false;
     int i;
+    (void)refresh_mode; /* silence warning on charcell */
 
     /* alignment-related variables */
     int cur_align;
@@ -676,6 +678,11 @@ static bool get_line(struct gui_wps *gwps,
                     img->display = subimage;
                 break;
             }
+            case WPS_TOKEN_DRAW_INBUILTBAR:
+                gui_statusbar_draw(&(statusbars.statusbars[gwps->display->screen_type]),
+                                   refresh_mode == WPS_REFRESH_ALL,
+                                   data->tokens[i].value.data);
+                break;
 #endif
 
             case WPS_TOKEN_ALIGN_LEFT:
@@ -1176,8 +1183,8 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
                 || new_subline_refresh || hidden_vp)
             {
                 /* get_line tells us if we need to update the line */
-                update_line = get_line(gwps, subline,
-                                       &align, linebuf, sizeof(linebuf));
+                update_line = get_line(gwps, subline, &align,
+                                       linebuf, sizeof(linebuf), vp_refresh_mode);
             }
 #ifdef HAVE_LCD_BITMAP
             /* peakmeter */