summaryrefslogtreecommitdiffstats
path: root/uisimulator/sdl/lcd-sdl.c
diff options
context:
space:
mode:
Diffstat (limited to 'uisimulator/sdl/lcd-sdl.c')
-rw-r--r--uisimulator/sdl/lcd-sdl.c90
1 files changed, 18 insertions, 72 deletions
diff --git a/uisimulator/sdl/lcd-sdl.c b/uisimulator/sdl/lcd-sdl.c
index 6431c5f39d..373e07ffc0 100644
--- a/uisimulator/sdl/lcd-sdl.c
+++ b/uisimulator/sdl/lcd-sdl.c
@@ -21,11 +21,9 @@
#include "lcd-sdl.h"
#include "uisdl.h"
+#include "system.h" /* for MIN() and MAX() */
int display_zoom = 1;
-#ifdef UI_LCD_SPLIT
-static int gradient_steps = 0;
-#endif
void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width,
int height, int max_x, int max_y,
@@ -51,18 +49,30 @@ void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width,
for (x = x_start; x < xmax; x++) {
dest.x = x * display_zoom;
+#ifdef HAVE_LCD_SPLIT
+ for (y = y_start; y < MIN(ymax, LCD_SPLIT_POS); y++) {
+ dest.y = y * display_zoom;
+
+ SDL_FillRect(surface, &dest, (Uint32)(getpixel(x, y) | 0x80));
+ }
+ for (y = MAX(y_start, LCD_SPLIT_POS); y < ymax; y++) {
+ dest.y = (y + LCD_SPLIT_LINES) * display_zoom ;
+
+ SDL_FillRect(surface, &dest, (Uint32)getpixel(x, y));
+ }
+#else
for (y = y_start; y < ymax; y++) {
dest.y = y * display_zoom;
SDL_FillRect(surface, &dest, (Uint32)getpixel(x, y));
}
+#endif
}
SDL_UnlockSurface(surface);
}
-void sdl_gui_update(SDL_Surface *surface, IFSPLIT(SDL_Surface *real_surface,)
- int x_start, int y_start, int width,
+void sdl_gui_update(SDL_Surface *surface, int x_start, int y_start, int width,
int height, int max_x, int max_y, int ui_x, int ui_y)
{
int xmax, ymax;
@@ -80,73 +90,17 @@ void sdl_gui_update(SDL_Surface *surface, IFSPLIT(SDL_Surface *real_surface,)
SDL_Rect dest= {(ui_x + x_start) * display_zoom, (ui_y + y_start) * display_zoom,
xmax * display_zoom, ymax * display_zoom};
-#ifdef UI_LCD_SPLIT
- /* fix real screen coordinates */
- if(ymax >= UI_LCD_SPLIT_LINES)
- src.h += UI_LCD_SPLIT_BLACK_LINES * display_zoom;
-
- SDL_LockSurface(surface);
- SDL_LockSurface(real_surface);
-
- int pixel, npixels;
-
-#if LCD_DEPTH != 1
-#error "Split screen only works for monochrome displays !"
-#endif
-
- npixels = display_zoom * display_zoom * UI_LCD_SPLIT_LINES * surface->pitch;
- const unsigned char * pixels_src = (const unsigned char*)surface->pixels;
- unsigned char * pixels_dst = (unsigned char*)real_surface->pixels;
- const int start_pixel = UI_LCD_SPLIT_LINES * surface->pitch * display_zoom;
- const int stop_pixel = (UI_LCD_SPLIT_LINES+UI_LCD_SPLIT_BLACK_LINES)
- * surface->pitch * display_zoom;
-
- /* draw top pixels, change the color */
- for (pixel = 0; pixel < npixels ; pixel++)
- {
- int pix = pixels_src[pixel] + gradient_steps;
- if(pix > 255) pix = 255;
-
- pixels_dst[pixel] = pix;
- }
-
- /* copy bottom pixels */
- memcpy(&pixels_dst[stop_pixel], &pixels_src[start_pixel],
- (UI_LCD_HEIGHT - UI_LCD_SPLIT_LINES) * surface->pitch * display_zoom);
-
- /* separation lines are off */
- for (pixel = start_pixel; pixel < stop_pixel ; pixel++)
- pixels_dst[pixel] = 0;
-
- SDL_UnlockSurface(surface);
- SDL_UnlockSurface(real_surface);
-
- SDL_BlitSurface(real_surface, &src, gui_surface, &dest);
-#else
SDL_BlitSurface(surface, &src, gui_surface, &dest);
-#endif
SDL_Flip(gui_surface);
}
/* set a range of bitmap indices to a gradient from startcolour to endcolour */
void sdl_set_gradient(SDL_Surface *surface, SDL_Color *start, SDL_Color *end,
- IFSPLIT(SDL_Color *split_start,)
- IFSPLIT(SDL_Color *split_end ,) int first, int steps)
+ int first, int steps)
{
int i;
-
-#ifdef UI_LCD_SPLIT
- int tot_steps = steps * 2;
- if (tot_steps > 256)
- tot_steps = 256;
-
- gradient_steps = steps;
-#else
-#define tot_steps steps
-#endif
-
- SDL_Color palette[tot_steps];
+ SDL_Color palette[steps];
for (i = 0; i < steps; i++) {
palette[i].r = start->r + (end->r - start->r) * i / (steps - 1);
@@ -154,14 +108,6 @@ void sdl_set_gradient(SDL_Surface *surface, SDL_Color *start, SDL_Color *end,
palette[i].b = start->b + (end->b - start->b) * i / (steps - 1);
}
-#ifdef UI_LCD_SPLIT /* extra color */
- for (i = steps ; i < tot_steps; i++) {
- palette[i].r = split_start->r + (split_end->r - split_start->r) * (i - steps) / (tot_steps - steps - 1);
- palette[i].g = split_start->g + (split_end->g - split_start->g) * (i - steps) / (tot_steps - steps - 1);
- palette[i].b = split_start->b + (split_end->b - split_start->b) * (i - steps) / (tot_steps - steps - 1);
- }
-#endif
-
- SDL_SetPalette(surface, SDL_LOGPAL|SDL_PHYSPAL, palette, first, tot_steps);
+ SDL_SetPalette(surface, SDL_LOGPAL|SDL_PHYSPAL, palette, first, steps);
}