3 files changed, 22 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 */
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index ecfdfaa9e5..b66af75cb5 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -154,6 +154,8 @@ static int parse_statusbar_enable(const char *wps_bufptr,
         struct wps_token *token, struct wps_data *wps_data);
 static int parse_statusbar_disable(const char *wps_bufptr,
         struct wps_token *token, struct wps_data *wps_data);
+static int parse_statusbar_inbuilt(const char *wps_bufptr,
+        struct wps_token *token, struct wps_data *wps_data);
 static int parse_image_display(const char *wps_bufptr,
         struct wps_token *token, struct wps_data *wps_data);
 static int parse_image_load(const char *wps_bufptr,
@@ -349,6 +351,7 @@ static const struct wps_tag all_tags[] = {
 #ifdef HAVE_LCD_BITMAP
     { WPS_NO_TOKEN,                       "we",  0, parse_statusbar_enable },
     { WPS_NO_TOKEN,                       "wd",  0, parse_statusbar_disable },
+    { WPS_TOKEN_DRAW_INBUILTBAR,          "wi",  WPS_REFRESH_DYNAMIC, parse_statusbar_inbuilt },
 
     { WPS_NO_TOKEN,                       "xl",  0,       parse_image_load },
 
@@ -562,6 +565,14 @@ static int parse_statusbar_disable(const char *wps_bufptr,
     return skip_end_of_line(wps_bufptr);
 }
 
+static int parse_statusbar_inbuilt(const char *wps_bufptr,
+        struct wps_token *token, struct wps_data *wps_data)
+{
+    (void)wps_data;
+    token->value.data = (void*)&curr_vp->vp;
+    return skip_end_of_line(wps_bufptr);
+}
+
 static int get_image_id(int c)
 {
     if(c >= 'a' && c <= 'z')
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h
index d0df058cf0..2c6dd6b72a 100644
--- a/apps/gui/skin_engine/skin_tokens.h
+++ b/apps/gui/skin_engine/skin_tokens.h
@@ -189,6 +189,7 @@ enum wps_token_type {
 
     /* buttons */
   TOKEN_MARKER_MISC,
+    WPS_TOKEN_DRAW_INBUILTBAR,
     WPS_TOKEN_LIST_TITLE_TEXT,
     WPS_TOKEN_LIST_TITLE_ICON,
     WPS_TOKEN_BUTTON_VOLUME,