summaryrefslogtreecommitdiffstats
path: root/uisimulator/sdl/lcd-bitmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'uisimulator/sdl/lcd-bitmap.c')
-rw-r--r--uisimulator/sdl/lcd-bitmap.c89
1 files changed, 74 insertions, 15 deletions
diff --git a/uisimulator/sdl/lcd-bitmap.c b/uisimulator/sdl/lcd-bitmap.c
index 2fd7576ecc..788a5f662d 100644
--- a/uisimulator/sdl/lcd-bitmap.c
+++ b/uisimulator/sdl/lcd-bitmap.c
@@ -22,6 +22,7 @@
#include "lcd-sdl.h"
SDL_Surface* lcd_surface;
+int lcd_backlight_val;
#if LCD_DEPTH <= 8
SDL_Color lcd_color_zero = {UI_LCD_BGCOLOR, 0};
@@ -29,22 +30,27 @@ SDL_Color lcd_backlight_color_zero = {UI_LCD_BGCOLORLIGHT, 0};
SDL_Color lcd_color_max = {0, 0, 0, 0};
#endif
-static inline Uint32 get_lcd_pixel(int x, int y)
+#if LCD_DEPTH < 8
+int lcd_ex_shades = 0;
+unsigned long (*lcd_ex_getpixel)(int, int) = NULL;
+#endif
+
+static unsigned long get_lcd_pixel(int x, int y)
{
#if LCD_DEPTH == 1
- return ((lcd_framebuffer[y/8][x] >> (y & 7)) & 1);
+ return ((lcd_framebuffer[y/8][x] >> (y & 7)) & 1);
#elif LCD_DEPTH == 2
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
- return ((lcd_framebuffer[y][x/4] >> (2 * (x & 3))) & 3);
+ return ((lcd_framebuffer[y][x/4] >> (2 * (x & 3))) & 3);
#else
- return ((lcd_framebuffer[y/4][x] >> (2 * (y & 3))) & 3);
+ return ((lcd_framebuffer[y/4][x] >> (2 * (y & 3))) & 3);
#endif
#elif LCD_DEPTH == 16
#if LCD_PIXELFORMAT == RGB565SWAPPED
- unsigned bits = lcd_framebuffer[y][x];
- return (bits >> 8) | (bits << 8);
+ unsigned bits = lcd_framebuffer[y][x];
+ return (bits >> 8) | (bits << 8);
#else
- return lcd_framebuffer[y][x];
+ return lcd_framebuffer[y][x];
#endif
#endif
}
@@ -57,22 +63,41 @@ void lcd_update(void)
void lcd_update_rect(int x_start, int y_start, int width, int height)
{
- sdl_update_rect(lcd_surface, x_start, y_start, width, height, LCD_WIDTH, LCD_HEIGHT,
- background ? UI_LCD_POSX : 0, background? UI_LCD_POSY : 0,
- get_lcd_pixel);
+ sdl_update_rect(lcd_surface, x_start, y_start, width, height, LCD_WIDTH,
+ LCD_HEIGHT, get_lcd_pixel);
+ sdl_gui_update(lcd_surface, x_start, y_start, width, height, LCD_WIDTH,
+ LCD_HEIGHT, background ? UI_LCD_POSX : 0, background? UI_LCD_POSY : 0);
}
#ifdef CONFIG_BACKLIGHT
void sim_backlight(int value)
{
+ lcd_backlight_val = value;
+
#if LCD_DEPTH <= 8
if (value > 0) {
- sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, &lcd_color_max, (1<<LCD_DEPTH));
+ sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero,
+ &lcd_color_max, 0, (1<<LCD_DEPTH));
} else {
- sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max, (1<<LCD_DEPTH));
+ sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max,
+ 0, (1<<LCD_DEPTH));
}
-
- lcd_update();
+#if LCD_DEPTH < 8
+ if (lcd_ex_shades) {
+ if (value > 0) {
+ sdl_set_gradient(lcd_surface, &lcd_color_max,
+ &lcd_backlight_color_zero, (1<<LCD_DEPTH),
+ lcd_ex_shades);
+ } else {
+ sdl_set_gradient(lcd_surface, &lcd_color_max, &lcd_color_zero,
+ (1<<LCD_DEPTH), lcd_ex_shades);
+ }
+ }
+#endif
+
+ sdl_gui_update(lcd_surface, 0, 0, LCD_WIDTH, LCD_HEIGHT, LCD_WIDTH,
+ LCD_HEIGHT, background ? UI_LCD_POSX : 0, background? UI_LCD_POSY : 0);
+
#else
DEBUGF("backlight: %s\n", (value > 0) ? "on" : "off");
#endif
@@ -91,7 +116,41 @@ void sim_lcd_init(void)
#endif
#if LCD_DEPTH <= 8
- sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max, (1<<LCD_DEPTH));
+ sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, &lcd_color_max,
+ 0, (1<<LCD_DEPTH));
+#endif
+}
+
+#if LCD_DEPTH < 8
+void sim_lcd_ex_init(int shades, unsigned long (*getpixel)(int, int))
+{
+ lcd_ex_shades = shades;
+ lcd_ex_getpixel = getpixel;
+ if (shades) {
+#ifdef CONFIG_BACKLIGHT
+ if (lcd_backlight_val > 0) {
+ sdl_set_gradient(lcd_surface, &lcd_color_max,
+ &lcd_backlight_color_zero, (1<<LCD_DEPTH),
+ shades);
+ }
+ else
#endif
+ {
+ sdl_set_gradient(lcd_surface, &lcd_color_max, &lcd_color_zero,
+ (1<<LCD_DEPTH), shades);
+ }
+ }
}
+void sim_lcd_ex_update_rect(int x_start, int y_start, int width, int height)
+{
+ if (lcd_ex_getpixel) {
+ sdl_update_rect(lcd_surface, x_start, y_start, width, height,
+ LCD_WIDTH, LCD_HEIGHT, lcd_ex_getpixel);
+ sdl_gui_update(lcd_surface, x_start, y_start, width, height, LCD_WIDTH,
+ LCD_HEIGHT, background ? UI_LCD_POSX : 0,
+ background? UI_LCD_POSY : 0);
+ }
+}
+#endif
+