5 files changed, 76 insertions, 71 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index e07436e565..2d65629f97 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -62,6 +62,7 @@
 #endif
 #include "backdrop.h"
 #include "viewport.h"
+#include "pcmbuf.h"
 
 #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ 
                                 /* 3% of 30min file == 54s step size */
@@ -75,36 +76,6 @@
 #define DEFAULT_SUBLINE_TIME_MULTIPLIER 20 /* In TIMEOUT_UNIT's */
 
 
-/* draws the statusbar on the given wps-screen */
-#ifdef HAVE_LCD_BITMAP
-static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force)
-{
-    (void)force;
-    bool draw = global_settings.statusbar;
-
-    if (wps->data->wps_sb_tag)
-        draw = wps->data->show_sb_on_wps;
-
-#if NB_SCREENS > 1
-    /* multi screen targets could show the bars on one screen but not both
-     * so the viewportmanager can't be used in its current form...
-     * Also, the WPS is a special screen so doing this is reasonable.
-     */
-    if (draw)
-    {
-        struct gui_statusbar *bar;
-        bar = &statusbars.statusbars[wps->data->remote_wps?SCREEN_REMOTE:SCREEN_MAIN];
-        gui_statusbar_draw(bar, force);
-    }
-#else
-    viewportmanager_set_statusbar(draw);
-#endif    
-}
-#else
-#define gui_wps_statusbar_draw(wps, force) viewportmanager_set_statusbar(true)
-#endif
-#include "pcmbuf.h"
-
 /* fades the volume */
 bool wps_fading_out = false;
 void fade(bool fade_in, bool updatewps)
@@ -170,7 +141,6 @@ void fade(bool fade_in, bool updatewps)
 */
 bool update_onvol_change(struct gui_wps * gwps)
 {
-    gui_wps_statusbar_draw(gwps, false);
     gui_wps_refresh(gwps, 0, WPS_REFRESH_NON_STATIC);
 
 #ifdef HAVE_LCD_CHARCELLS
@@ -366,7 +336,6 @@ bool gui_wps_display(void)
             }
 #endif
 #endif
-
             gui_wps[i].display->clear_display();
             if (!gui_wps[i].data->wps_loaded) {
                 if ( !gui_wps[i].data->num_tokens ) {
@@ -481,8 +450,6 @@ bool update(struct gui_wps *gwps)
             gui_wps_refresh(gwps, 0, WPS_REFRESH_NON_STATIC);
     }
 
-    gui_wps_statusbar_draw(gwps, false);
-
     return retcode;
 }
 
@@ -1978,7 +1945,6 @@ bool gui_wps_refresh(struct gui_wps *gwps,
     bool update_line, new_subline_refresh;
 
 #ifdef HAVE_LCD_BITMAP
-    gui_wps_statusbar_draw(gwps, true);
 
     /* to find out wether the peak meter is enabled we
        assume it wasn't until we find a line that contains
@@ -2195,7 +2161,8 @@ bool gui_wps_refresh(struct gui_wps *gwps,
             remote_backlight_on();
     }
 #endif
-
+    /* force a bars update if they are being displayed */
+    viewportmanager_draw_statusbars(NULL);
     return true;
 }
 
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 6c387ef62e..1d8d7255bf 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -115,8 +115,24 @@ static void next_track(void)
 
     audio_next();
 }
-
-
+static char fix_wps_bars(void)
+{
+#ifdef HAVE_LCD_BITMAP
+    int i;  
+    char wpsbars = 0;
+    FOR_NB_SCREENS(i)
+    {
+        bool draw = global_settings.statusbar;
+        if (gui_wps[i].data->wps_sb_tag)
+            draw = gui_wps[i].data->show_sb_on_wps;
+        if (draw)
+            wpsbars |=  VP_IGNORE_SB_SETTING(i)|(1<<i);
+    } 
+    return wpsbars;
+#else
+    return 1;    
+#endif
+}
 long gui_wps_show(void)
 {
     long button = 0;
@@ -127,8 +143,8 @@ long gui_wps_show(void)
     bool update_track = false;
     int i;
     long last_left = 0, last_right = 0;
+    char wpsbars = 0, oldbars = 0;
     
-    viewportmanager_set_statusbar(false);
     wps_state_init();
 
 #ifdef HAVE_LCD_CHARCELLS
@@ -149,6 +165,7 @@ long gui_wps_show(void)
     ab_reset_markers();
 #endif
 
+    oldbars = viewportmanager_set_statusbar(0);
     if(audio_status() & AUDIO_STATUS_PLAY)
     {
         wps_state.id3 = audio_current_track();
@@ -156,12 +173,13 @@ long gui_wps_show(void)
         if (wps_state.id3) {
             if (gui_wps_display())
                 return 0;
-            FOR_NB_SCREENS(i)
-                gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_ALL);
         }
 
         restore = true;
     }
+    wpsbars = fix_wps_bars();
+    viewportmanager_set_statusbar(wpsbars);
+    
     while ( 1 )
     {
         bool audio_paused = (audio_status() & AUDIO_STATUS_PAUSE)?true:false;
@@ -259,20 +277,19 @@ long gui_wps_show(void)
         {
             case ACTION_WPS_CONTEXT:
             {
-                bool bars;
 #if LCD_DEPTH > 1
                 show_main_backdrop();
 #endif
 #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
                 show_remote_main_backdrop();
 #endif
-                bars = viewportmanager_set_statusbar(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_statusbar(bars);
+                viewportmanager_set_statusbar(wpsbars);
                 /* track might have changed */
                 update_track = true;
 
@@ -527,7 +544,7 @@ long gui_wps_show(void)
 #ifdef HAVE_QUICKSCREEN
             case ACTION_WPS_QUICKSCREEN:
             {
-                bool bars = viewportmanager_set_statusbar(true);
+                viewportmanager_set_statusbar(oldbars);
 #if LCD_DEPTH > 1
                 show_main_backdrop();
 #endif
@@ -536,7 +553,8 @@ long gui_wps_show(void)
 #endif
                 if (quick_screen_quick(button))
                     return SYS_USB_CONNECTED;
-                viewportmanager_set_statusbar(bars);
+                wpsbars = fix_wps_bars();
+                viewportmanager_set_statusbar(wpsbars);
 #if LCD_DEPTH > 1
                 show_wps_backdrop();
 #endif
@@ -552,7 +570,7 @@ long gui_wps_show(void)
 #ifdef BUTTON_F3
             case ACTION_F3:
             {
-                bool bars = viewportmanager_set_statusbar(true);
+                viewportmanager_set_statusbar(oldbars);
 #if LCD_DEPTH > 1
                 show_main_backdrop();
 #endif
@@ -562,7 +580,8 @@ long gui_wps_show(void)
                 if (quick_screen_f3(BUTTON_F3))
                     return SYS_USB_CONNECTED;
                 restore = true;
-                viewportmanager_set_statusbar(bars);
+                wpsbars = fix_wps_bars();
+                viewportmanager_set_statusbar(wpsbars);
             }
             break;
 #endif /* BUTTON_F3 */
@@ -571,7 +590,7 @@ long gui_wps_show(void)
 #ifdef HAVE_PITCHSCREEN
             case ACTION_WPS_PITCHSCREEN:
             {
-                bool bars = viewportmanager_set_statusbar(true);
+                viewportmanager_set_statusbar(oldbars);
 #if LCD_DEPTH > 1
                 show_main_backdrop();
 #endif
@@ -587,7 +606,7 @@ long gui_wps_show(void)
                 show_remote_wps_backdrop();
 #endif
                 restore = true;
-                viewportmanager_set_statusbar(bars);
+                viewportmanager_set_statusbar(wpsbars);
             }
             break;
 #endif /* HAVE_PITCHSCREEN */
@@ -613,7 +632,7 @@ long gui_wps_show(void)
 
             case ACTION_WPS_ID3SCREEN:
             {
-                bool bars = viewportmanager_set_statusbar(true);
+                viewportmanager_set_statusbar(oldbars);
 #if LCD_DEPTH > 1
                 show_main_backdrop();
 #endif
@@ -628,7 +647,7 @@ long gui_wps_show(void)
                 show_remote_wps_backdrop();
 #endif
                 restore = true;
-                viewportmanager_set_statusbar(bars);
+                viewportmanager_set_statusbar(wpsbars);
             }
             break;
 
@@ -645,7 +664,7 @@ long gui_wps_show(void)
                 break;
 #endif
             case SYS_POWEROFF:
-                viewportmanager_set_statusbar(true);
+                viewportmanager_set_statusbar(oldbars);
 #if LCD_DEPTH > 1
                 show_main_backdrop();
 #endif
@@ -681,13 +700,10 @@ long gui_wps_show(void)
             if (gui_wps_display()) {
                 exit = true;
             }
-            else if (wps_state.id3){
-                FOR_NB_SCREENS(i)
-                    gui_wps_refresh(&gui_wps[i], 0, WPS_REFRESH_NON_STATIC);
-            }
         }
 
         if (exit) {
+            viewportmanager_set_statusbar(oldbars);
 #ifdef HAVE_LCD_CHARCELLS
             status_set_record(false);
             status_set_audio(false);
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 2107d3a593..7b8c2975c1 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -845,7 +845,7 @@ bool simplelist_show_list(struct simplelist_info *info)
 {
     struct gui_synclist lists;
     int action, old_line_count = simplelist_line_count;
-    bool oldbars = viewportmanager_set_statusbar(true);
+    char oldbars = viewportmanager_set_statusbar(VP_ALLSCREENS);
     char* (*getname)(int item, void * data, char *buffer, size_t buffer_len);
     int wrap = LIST_WRAP_UNLESS_HELD;
     if (info->get_name)
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 24ba652498..3854430521 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -35,7 +35,7 @@
 #include "screen_access.h"
 #include "appevents.h"
 
-static bool statusbar_enabled = true;
+static char statusbar_enabled = VP_ALLSCREENS;
 
 int viewport_get_nb_lines(struct viewport *vp)
 {
@@ -47,13 +47,19 @@ int viewport_get_nb_lines(struct viewport *vp)
 #endif
 }
 
+static bool showing_bars(enum screen_type screen)
+{
+    if (statusbar_enabled&(1<<screen))
+        return global_settings.statusbar || (statusbar_enabled&(1<<(screen+4)));
+    return false;
+}    
 
 void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
 {
     vp->x = 0;
     vp->width = screens[screen].lcdwidth;
 
-    vp->y = statusbar_enabled?gui_statusbar_height():0;
+    vp->y = showing_bars(screen)?gui_statusbar_height():0;
     vp->height = screens[screen].lcdheight - vp->y;
 #ifdef HAVE_LCD_BITMAP
     vp->drawmode = DRMODE_SOLID;
@@ -87,17 +93,18 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
 }
 
 /* returns true if it was enabled BEFORE this call */
-bool viewportmanager_set_statusbar(bool enabled)
+char viewportmanager_set_statusbar(char enabled)
 {
-    bool old = statusbar_enabled;
-    if (enabled 
-#ifdef HAVE_LCD_BITMAP    
-                && global_settings.statusbar
-#endif    
-       )
+    char old = statusbar_enabled;
+    if (enabled)
     {
+        int i;
+        FOR_NB_SCREENS(i)
+        {
+            if (showing_bars(i))
+                gui_statusbar_draw(&statusbars.statusbars[i], true);
+        }
         add_event(GUI_EVENT_ACTIONUPDATE, false, viewportmanager_draw_statusbars);
-        gui_syncstatusbar_draw(&statusbars, true);
     }
     else
     {
@@ -110,8 +117,12 @@ bool viewportmanager_set_statusbar(bool enabled)
 void viewportmanager_draw_statusbars(void* data)
 {
     (void)data;
-    if (statusbar_enabled)
-        gui_syncstatusbar_draw(&statusbars, false);
+    int i;
+    FOR_NB_SCREENS(i)
+    {
+        if (showing_bars(i))
+            gui_statusbar_draw(&statusbars.statusbars[i], false);
+    }
 }
 
 void viewportmanager_statusbar_changed(void* data)
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h
index 53f522347f..02748527a4 100644
--- a/apps/gui/viewport.h
+++ b/apps/gui/viewport.h
@@ -41,7 +41,18 @@ int viewport_load_config(const char *config, struct viewport *vp);
 
 void viewport_set_defaults(struct viewport *vp, enum screen_type screen);
 
-bool viewportmanager_set_statusbar(bool enabled);
+/* viewportmanager_set_statusbar() is used to specify which screens the statusbar
+ * should be displayed on.
+ * *usually* enabled will be VP_ALLSCREENS which means display the bar if the setting
+ * is enabled. (and it will be on both screens)
+ * For the WPS (and other possible exceptions) use VP_IGNORE_SB_SETTING() to
+ * FORCE the statusbar on for the given screen (i.e it will show regardless of the setting
+ */
+#define VP_SB_ONSCREEN(screen) (1<<screen) /* turn the SB on "screen" only */
+#define VP_ALLSCREENS (VP_SB_ONSCREEN(0)|VP_SB_ONSCREEN(1)) /* SB on for both screens */
+#define VP_IGNORE_SB_SETTING(screen) (1<<(4+screen))
+char viewportmanager_set_statusbar(char enabled);
+
 /* callbacks for GUI_EVENT_* events */
 void viewportmanager_draw_statusbars(void*data);
 void viewportmanager_statusbar_changed(void* data);