Patch #1421422 - Backdrop image patch started by Linus, finished by me. Adds ability to set backdrop images for file browser and menus (store full-screen bitmaps in /.rockbox/backdrops/) and also the ability to set a full-screen background image in a WPS using the %X|filename.bmp| WPS tag. Currently only implemented for targets with colour LCDs.

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

2 files changed, 99 insertions, 3 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index ca839a9bfa..09c271b904 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -28,6 +28,7 @@
 #include "power.h"
 #include "powermgmt.h"
 #include "sound.h"
+#include "debug.h"
 #ifdef HAVE_LCD_CHARCELLS
 #include "hwcompat.h"
 #endif
@@ -36,10 +37,11 @@
 #include "backlight.h"
 #include "lang.h"
 #include "misc.h"
-
+#include "backdrop.h"
 #include "splash.h"
 #include "scrollbar.h"
 #include "led.h"
+#include "lcd.h"
 #ifdef HAVE_LCD_BITMAP
 #include "peakmeter.h"
 /* Image stuff */
@@ -57,6 +59,10 @@ static void draw_player_fullbar(struct gui_wps *gwps,
                                 /* 3% of 30min file == 54s step size */
 #define MIN_FF_REWIND_STEP 500
 
+#ifdef HAVE_LCD_COLOR
+extern bool wps_has_backdrop;
+#endif
+
 /* Skip leading UTF-8 BOM, if present. */
 static char* skip_utf8_bom(char* buf)
 {
@@ -88,6 +94,7 @@ static int get_image_id(int c)
 /*
  * parse the given buffer for following static tags:
  * %x    -   load image for always display
+ * %X    -   load backdrop image
  * %xl   -   preload image
  * %we   -   enable statusbar on wps regardless of the global setting
  * %wd   -   disable statusbar on wps regardless of the global setting
@@ -133,7 +140,54 @@ bool wps_data_preload_tags(struct wps_data *data, char *buf,
                 return true;
             }
         break;
-        
+
+#ifdef HAVE_LCD_COLOR
+        case 'X':
+            /* Backdrop image - must be the same size as the LCD */
+        {
+            int ret = 0;
+            struct bitmap bm;
+            char *ptr = buf+2;
+            char *pos = NULL;
+            char imgname[MAX_PATH];
+
+            /* format: %X|filename.bmp| */
+            {
+                /* get filename */
+                pos = strchr(ptr, '|');
+                if ((pos - ptr) <
+                    (int)sizeof(imgname)-ROCKBOX_DIR_LEN-2)
+                {
+                    memcpy(imgname, bmpdir, bmpdirlen);
+                    imgname[bmpdirlen] = '/';
+                    memcpy(&imgname[bmpdirlen+1],
+                           ptr, pos - ptr);
+                    imgname[bmpdirlen+1+pos-ptr] = 0;
+                }
+                else
+                    /* filename too long */
+                    imgname[0] = 0;
+
+                ptr = pos+1;
+
+                /* load the image */
+                bm.data=(char*)&wps_backdrop[0][0];
+                ret = read_bmp_file(imgname, &bm,
+                                    sizeof(wps_backdrop), FORMAT_NATIVE);
+
+                if ((ret > 0) && (bm.width == LCD_WIDTH) 
+                              && (bm.height == LCD_HEIGHT)) {
+                    wps_has_backdrop=true;
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        break;
+#endif
+
         case 'x':
             /* Preload images so the %xd# tag can display it */
         {
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index d7d436c089..00d7aaa507 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -52,7 +52,7 @@
 #include "onplay.h"
 #include "abrepeat.h"
 #include "playback.h"
-
+#include "backdrop.h"
 #include "splash.h"
 
 #define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps"
@@ -62,6 +62,11 @@ struct wps_state wps_state;
 struct gui_wps gui_wps[NB_SCREENS];
 static struct wps_data wps_datas[NB_SCREENS];
 
+#ifdef HAVE_LCD_COLOR
+bool wps_has_backdrop;
+fb_data* old_backdrop;
+#endif
+
 bool keys_locked = false;
 
 /* change the path to the current played track */
@@ -102,6 +107,12 @@ long gui_wps_show(void)
     {
         gui_wps_set_margin(&gui_wps[i]);
     }
+#if HAVE_LCD_COLOR
+    old_backdrop = lcd_get_backdrop();
+    if (wps_has_backdrop) {
+        lcd_set_backdrop(&wps_backdrop[0][0]);
+    }
+#endif
 #endif
 
 #ifdef AB_REPEAT_ENABLE
@@ -225,7 +236,14 @@ long gui_wps_show(void)
 #ifdef WPS_RC_CONTEXT
             case WPS_RC_CONTEXT:
 #endif
+#ifdef HAVE_LCD_COLOR
+                lcd_set_backdrop(old_backdrop);
+#endif
                 onplay(wps_state.id3->path, TREE_ATTR_MPA, CONTEXT_WPS);
+#ifdef HAVE_LCD_COLOR
+                if (wps_has_backdrop)
+                    lcd_set_backdrop(&wps_backdrop[0][0]);
+#endif
 #ifdef HAVE_LCD_BITMAP
                 FOR_NB_SCREENS(i)
                 {
@@ -510,8 +528,15 @@ long gui_wps_show(void)
                 FOR_NB_SCREENS(i)
                     gui_wps[i].display->stop_scroll();
 
+#ifdef HAVE_LCD_COLOR
+                lcd_set_backdrop(old_backdrop);
+#endif
                 if (main_menu())
                     return true;
+#ifdef HAVE_LCD_COLOR
+                if (wps_has_backdrop)
+                    lcd_set_backdrop(&wps_backdrop[0][0]);
+#endif
 #ifdef HAVE_LCD_BITMAP
                 FOR_NB_SCREENS(i)
                 {
@@ -540,8 +565,15 @@ long gui_wps_show(void)
 #ifdef WPS_RC_QUICK
             case WPS_RC_QUICK:
 #endif
+#ifdef HAVE_LCD_COLOR
+                lcd_set_backdrop(old_backdrop);
+#endif
                 if (quick_screen_quick(button))
                     return SYS_USB_CONNECTED;
+#ifdef HAVE_LCD_COLOR
+                if (wps_has_backdrop)
+                    lcd_set_backdrop(&wps_backdrop[0][0]);
+#endif
 #ifdef HAVE_LCD_BITMAP
                 FOR_NB_SCREENS(i)
                 {
@@ -566,8 +598,15 @@ long gui_wps_show(void)
     || CONFIG_KEYPAD == IRIVER_H300_PAD
             case BUTTON_ON | BUTTON_UP:
             case BUTTON_ON | BUTTON_DOWN:
+#ifdef HAVE_LCD_COLOR
+                lcd_set_backdrop(old_backdrop);
+#endif
                 if (2 == pitch_screen())
                     return SYS_USB_CONNECTED;
+#ifdef HAVE_LCD_COLOR
+                if (wps_has_backdrop)
+                    lcd_set_backdrop(&wps_backdrop[0][0]);
+#endif
                 restore = true;
                 break;
 #endif
@@ -981,4 +1020,7 @@ void gui_sync_wps_init(void)
         gui_wps_set_data(&gui_wps[i], &wps_datas[i]);
         gui_wps_set_statusbar(&gui_wps[i], &statusbars.statusbars[i]);
     }
+#ifdef HAVE_LCD_COLOR
+    wps_has_backdrop = false;
+#endif
 }