From 1016ee4e809776619fa9e4e773ceb1523bd7bc66 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Mon, 19 Oct 2009 15:28:15 +0000
Subject: Initial custom statusbar commit.

The custom statusbar can be used as a WPS for the main UI, using .(r)sbs files. It's using the skin engine and knows all tags the WPS also knows.
The default folder for .sbs is the wps folder to reuse images used in the WPS.
As it can be shown in the WPS also, it's useful to move shared parts to the custom statusbar in order to save skin buffer space.
There are a few restrictions/TODOs:
*) Peak meter doesn't redraw nicely(not frequent enough), as very frequent updates would slow the UI down as hell (some targets fight with it in the WPS already: FS#10686)
*) No touchregion support as the statusbar doesn't have any action handling (it won't fail to parse though).
*) Drawing stuff into the default VP is forbidden (loading images in it is not). You *need* to use viewports for the displaying stuff (parsing fails if no viewport is used).
*) Themes that don't use a custom ui viewport can be fixed up using the new %Vi tag to avoid nasty redraw effectts (you must not draw into it as well, it's used to fix up the ui viewport). %Vi describes the viewport that the lists can use without getting in the way of the statusbar.

Otherwise, it behaves like the classic statusbar, it can be configured in the theme settings, and can be turned off in the wps using %wd.

Note to translaters: When translating LANG_STATUSBAR_CUSTOM, please consider using the same translation as for LANG_CHANNEL_CUSTOM if it's compatible. They could be combined later then.

Flyspray: FS#10566
Author: myself

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23258 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/skin_engine/skin_parser.c | 42 +++++++++-----------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

(limited to 'apps/gui/skin_engine/skin_parser.c')

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index fa35ed994f..434e7c9fa5 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -683,8 +683,15 @@ static int parse_viewport(const char *wps_bufptr,
     curr_line = NULL;
     if (!skin_start_new_line(skin_vp, wps_data->num_tokens))
         return WPS_ERROR_INVALID_PARAM;
-
-    if (*ptr == 'l')
+        
+    
+    if (*ptr == 'i')
+    {
+        skin_vp->label = VP_INFO_LABEL;
+        skin_vp->hidden_flags = VP_NEVER_VISIBLE;
+        ++ptr;
+    }
+    else if (*ptr == 'l')
     {
         if (*(ptr+1) == '|')
         {
@@ -1674,7 +1681,6 @@ static bool load_skin_bmp(struct wps_data *wps_data, struct bitmap *bitmap, char
     else
 	{
         /* Abort if we can't load an image */
-        DEBUGF("ERR: Failed to load image - %s\n",img_path);
 		loaded = false;
     }
 	return loaded;
@@ -1733,7 +1739,6 @@ static bool load_skin_bitmaps(struct wps_data *wps_data, char *bmpdir)
 /* to setup up the wps-data from a format-buffer (isfile = false)
    from a (wps-)file (isfile = true)*/
 bool skin_data_load(struct wps_data *wps_data,
-                   struct screen *display,
                    const char *buf,
                    bool isfile)
 {
@@ -1755,6 +1760,7 @@ bool skin_data_load(struct wps_data *wps_data,
 
     skin_data_reset(wps_data);
 
+    /* alloc default viewport, will be fixed up later */
     curr_vp = skin_buffer_alloc(sizeof(struct skin_viewport));
     if (!curr_vp)
         return false;
@@ -1766,9 +1772,6 @@ bool skin_data_load(struct wps_data *wps_data,
 
     /* Initialise the first (default) viewport */
     curr_vp->label         = VP_DEFAULT_LABEL;
-    curr_vp->vp.x          = 0;
-    curr_vp->vp.width      = display->getwidth();
-    curr_vp->vp.height     = display->getheight();
     curr_vp->pb            = NULL;
     curr_vp->hidden_flags  = 0;
     curr_vp->lines         = NULL;
@@ -1777,31 +1780,6 @@ bool skin_data_load(struct wps_data *wps_data,
     if (!skin_start_new_line(curr_vp, 0))
         return false;
 
-    switch (statusbar_position(display->screen_type))
-    {
-        case STATUSBAR_OFF:
-            curr_vp->vp.y      = 0;
-            break;
-        case STATUSBAR_TOP:
-            curr_vp->vp.y       = STATUSBAR_HEIGHT;
-            curr_vp->vp.height -= STATUSBAR_HEIGHT;
-            break;
-        case STATUSBAR_BOTTOM:
-            curr_vp->vp.y       = 0;
-            curr_vp->vp.height -= STATUSBAR_HEIGHT;
-            break;
-    }
-#ifdef HAVE_LCD_BITMAP
-    curr_vp->vp.font       = FONT_UI;
-    curr_vp->vp.drawmode   = DRMODE_SOLID;
-#endif
-#if LCD_DEPTH > 1
-    if (display->depth > 1)
-    {
-        curr_vp->vp.fg_pattern = display->get_foreground();
-        curr_vp->vp.bg_pattern = display->get_background();
-    }
-#endif
     if (!isfile)
     {
         return wps_parse(wps_data, buf, false);
-- 
cgit v1.2.3