Charcell lcd driver: Preparations for switching to non-immediate LCD updates, using lcd_update() like on bitmap targets. * Added proper clipping. * Simplified simulator code.

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

5 files changed, 27 insertions, 70 deletions

diff --git a/uisimulator/sdl/SOURCES b/uisimulator/sdl/SOURCES
index 8f1f3e2fd7..e563cb984d 100644
--- a/uisimulator/sdl/SOURCES
+++ b/uisimulator/sdl/SOURCES
@@ -3,7 +3,7 @@ kernel.c
 #ifdef HAVE_LCD_BITMAP
 lcd-bitmap.c
 #elif defined(HAVE_LCD_CHARCELLS)
-lcd-charcell.c
+lcd-charcells.c
 #endif
 #ifdef HAVE_REMOTE_LCD
 lcd-remote-bitmap.c
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 76a41f2230..4b03008497 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -18,7 +18,7 @@
  ****************************************************************************/
 
 #include "uisdl.h"
-#include "lcd-charcell.h"
+#include "lcd-charcells.h"
 #include "lcd-remote.h"
 #include "config.h"
 #include "button.h"
diff --git a/uisimulator/sdl/lcd-charcell.c b/uisimulator/sdl/lcd-charcells.c
index 8849efc7cd..5a08179232 100644
--- a/uisimulator/sdl/lcd-charcell.c
+++ b/uisimulator/sdl/lcd-charcells.c
@@ -19,6 +19,7 @@
 
 #include "debug.h"
 #include "lcd.h"
+#include "lcd-charcell.h"
 #include "misc.h"
 #include <string.h>
 #include <unistd.h>
@@ -36,82 +37,38 @@ SDL_Color lcd_color_zero = {UI_LCD_BGCOLOR, 0};
 SDL_Color lcd_backlight_color_zero = {UI_LCD_BGCOLORLIGHT, 0};
 SDL_Color lcd_color_max  = {0, 0, 0, 0};
 
-/* Defined in lcd-playersim.c */
-extern void lcd_print_char(int x, int y);
 
-void lcd_update(void)
+static unsigned long get_lcd_pixel(int x, int y)
 {
-    int x, y;
-    SDL_Rect dest = {UI_LCD_POSX, UI_LCD_POSY, UI_LCD_WIDTH, UI_LCD_HEIGHT};
-
-    SDL_LockSurface(lcd_surface);
-    
-    for (y=0; y<2; y++) {
-        for (x=0; x<11; x++) {
-            lcd_print_char(x, y);
-        }
-    }
-    
-    SDL_UnlockSurface(lcd_surface);
-
-    if (!background) {
-        dest.x -= UI_LCD_POSX;
-        dest.y -= UI_LCD_POSY;
-    }
-    
-    SDL_BlitSurface(lcd_surface, NULL, gui_surface, &dest);
-    SDL_UpdateRect(gui_surface, dest.x, dest.y, dest.w, dest.h);
-    SDL_Flip(gui_surface);
+    return sim_lcd_framebuffer[y][x];
 }
 
-void drawdots(int color, struct coordinate *points, int count)
+void sim_lcd_update_rect(int x_start, int y_start, int width, int height)
 {
-    SDL_Rect dest;
-    Uint32 sdlcolor;
-    
-    SDL_LockSurface(lcd_surface);
-
-    if (color == 1) {
-        sdlcolor = SDL_MapRGB(lcd_surface->format, lcd_color_max.r, lcd_color_max.g, lcd_color_max.b);
-    } else {
-        sdlcolor = SDL_MapRGB(lcd_surface->format, lcd_color_zero.r, lcd_color_zero.g, lcd_color_zero.b);
-    }
-
-    while (count--) {
-        dest.x = points[count].x * display_zoom;
-        dest.y = points[count].y * display_zoom;
-        dest.w = 1 * display_zoom;
-        dest.h = 1 * display_zoom;
-
-        SDL_FillRect(lcd_surface, &dest, sdlcolor);
-    }
-
-    SDL_UnlockSurface(lcd_surface);
+    sdl_update_rect(lcd_surface, x_start, y_start, width, height,
+                    SIM_LCD_WIDTH, SIM_LCD_HEIGHT, get_lcd_pixel);
+    sdl_gui_update(lcd_surface, x_start, y_start, width, height,
+                   SIM_LCD_WIDTH, SIM_LCD_HEIGHT,
+                   background ? UI_LCD_POSX : 0, background ? UI_LCD_POSY : 0);
 }
 
-void drawrectangles(int color, struct rectangle *points, int count)
+void lcd_update(void)
 {
-    SDL_Rect dest;
-    Uint32 sdlcolor;
-
-    SDL_LockSurface(lcd_surface);
-
-    if (color == 1) {
-        sdlcolor = SDL_MapRGB(lcd_surface->format, lcd_color_max.r, lcd_color_max.g, lcd_color_max.b);
-    } else {
-        sdlcolor = SDL_MapRGB(lcd_surface->format, lcd_color_zero.r, lcd_color_zero.g, lcd_color_zero.b);
-    }
+    int x, y;
     
-    while (count--) {
-        dest.x = points[count].x * display_zoom;
-        dest.y = points[count].y * display_zoom;
-        dest.w = points[count].width * display_zoom;
-        dest.h = points[count].height * display_zoom;
+    for (y = 0; y < lcd_pattern_count; y++)
+        if (lcd_patterns[y].count > 0)
+            sim_lcd_define_pattern(y, lcd_patterns[y].pattern);
         
-        SDL_FillRect(lcd_surface, &dest, sdlcolor);
-    }
+    for (y = 0; y < LCD_HEIGHT; y++)
+        for (x = 0; x < LCD_WIDTH; x++)
+            lcd_print_char(x, y, lcd_charbuffer[y][x]);
 
-    SDL_UnlockSurface(lcd_surface);
+    if (lcd_cursor.visible)
+        lcd_print_char(lcd_cursor.x, lcd_cursor.y, lcd_cursor.hw_char);
+
+    sim_lcd_update_rect(0, ICON_HEIGHT, SIM_LCD_WIDTH,
+                        LCD_HEIGHT*CHAR_HEIGHT*CHAR_PIXEL);
 }
 
 #if CONFIG_BACKLIGHT
@@ -124,8 +81,8 @@ void sim_backlight(int value)
         sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max,
                          0, (1<<LCD_DEPTH));
     }
-    
-    lcd_update();
+
+    sim_lcd_update_rect(0, 0, SIM_LCD_WIDTH, SIM_LCD_HEIGHT);
 }
 #endif
 
diff --git a/uisimulator/sdl/lcd-charcell.h b/uisimulator/sdl/lcd-charcells.h
index 6b1e85e549..6b1e85e549 100644
--- a/uisimulator/sdl/lcd-charcell.h
+++ b/uisimulator/sdl/lcd-charcells.h
diff --git a/uisimulator/sdl/uisdl.c b/uisimulator/sdl/uisdl.c
index 037c54a9bf..54175ce727 100644
--- a/uisimulator/sdl/uisdl.c
+++ b/uisimulator/sdl/uisdl.c
@@ -28,7 +28,7 @@
 #ifdef HAVE_LCD_BITMAP
 #include "lcd-bitmap.h"
 #elif defined(HAVE_LCD_CHARCELLS)
-#include "lcd-charcell.h"
+#include "lcd-charcells.h"
 #endif
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote-bitmap.h"