Now charcell displays require lcd_update() for updating the main lcd content like bitmap displays.

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

4 files changed, 11 insertions, 29 deletions

diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 4234171207..72279a371d 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -178,9 +178,7 @@ static void splash(struct screen * screen, const char *fmt, va_list ap)
         screen->set_drawmode(DRMODE_SOLID);
     }
 #endif
-#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
     screen->update();
-#endif
 }
 
 void gui_splash(struct screen * screen, int ticks, 
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index e93fc9649e..e082063a6f 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -191,10 +191,10 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
         }
         else
         {
-#else
+#else /* CONFIG_CHARGING < CHARGING_MONITOR */
         lasttime = current_tick;
         {
-#endif
+#endif /* CONFIG_CHARGING < CHARGING_MONITOR */
             /* animate in (max.) 4 steps, starting near the current charge level */
             if (TIME_AFTER(current_tick, bar->battery_icon_switch_tick)) 
             {
@@ -205,7 +205,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
         }
     }
     else
-#endif
+#endif /* CONFIG_CHARGING */
     {
         bar->info.batt_charge_step = -1;
         if (battery_level_safe())
@@ -254,13 +254,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
         display->fillrect(0, 0, display->width, STATUSBAR_HEIGHT);
         display->set_drawmode(DRMODE_SOLID);
 
-#else
-
-    /* players always "redraw" */
-    {
-#endif /* HAVE_LCD_BITMAP */
-
-#ifdef HAVE_LCD_BITMAP
         if (bar->info.battery_state)
             gui_statusbar_icon_battery(display, bar->info.battlevel, 
                                        bar->info.batt_charge_step);
@@ -281,7 +274,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
                                     STATUSBAR_PLUG_X_POS,
                                     STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH,
                                     STATUSBAR_HEIGHT);
-#endif
+#endif /* CONFIG_CHARGING */
 #ifdef HAVE_RECORDING
         /* turn off volume display in recording screen */
         bool recscreen_on = in_recording_screen();
@@ -332,8 +325,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
 #endif
         display->update_rect(0, 0, display->width, STATUSBAR_HEIGHT);
         bar->lastinfo = bar->info;
-#endif /* HAVE_LCD_BITMAP */
     }
+#endif /* HAVE_LCD_BITMAP */
 
 
 #ifdef HAVE_LCD_CHARCELLS
diff --git a/apps/gui/textarea.c b/apps/gui/textarea.c
index 54aa7e4a6c..0dd063c493 100644
--- a/apps/gui/textarea.c
+++ b/apps/gui/textarea.c
@@ -33,14 +33,16 @@ void gui_textarea_clear(struct screen * display)
 #endif
 }
 
-#ifdef HAVE_LCD_BITMAP
 void gui_textarea_update(struct screen * display)
 {
+#ifdef HAVE_LCD_BITMAP
     int y_start = gui_textarea_get_ystart(display);
     int y_end = gui_textarea_get_yend(display);
     display->update_rect(0, y_start, display->width, y_end - y_start);
-}
+#else
+    display->update();
 #endif
+}
 
 int gui_textarea_put_message(struct screen * display,
                              struct text_message * message,
@@ -56,8 +58,8 @@ int gui_textarea_put_message(struct screen * display,
 
 void gui_textarea_update_nblines(struct screen * display)
 {
-#ifdef HAVE_LCD_BITMAP
     int height=display->height;
+#ifdef HAVE_LCD_BITMAP
     if(global_settings.statusbar)
         height -= STATUSBAR_HEIGHT;
 #ifdef HAS_BUTTONBAR
@@ -66,11 +68,9 @@ void gui_textarea_update_nblines(struct screen * display)
 #endif
     display->getstringsize((unsigned char *)"A", &display->char_width,
                            &display->char_height);
-    display->nb_lines = height / display->char_height;
 #else
     display->char_width  = 1;
     display->char_height = 1;
-    /* default on char based player supported by rb */
-    display->nb_lines = MAX_LINES_ON_SCREEN;
 #endif
+    display->nb_lines = height / display->char_height;
 }
diff --git a/apps/gui/textarea.h b/apps/gui/textarea.h
index b1af1a5aba..413169db24 100644
--- a/apps/gui/textarea.h
+++ b/apps/gui/textarea.h
@@ -40,16 +40,7 @@ extern void gui_textarea_clear(struct screen * display);
  * Updates the area in the screen in which text can be displayed
  *  - display : the screen structure
  */
-#ifdef HAVE_LCD_BITMAP
 extern void gui_textarea_update(struct screen * display);
-#else
-#ifdef SIMULATOR
-#define gui_textarea_update(display) \
-    (display)->update();
-#else
-#define gui_textarea_update(display)
-#endif
-#endif
 
 /*
  * Displays message lines on the given screen