From 3e3e1d518ead4c1f864f61b219fa975396fe75f2 Mon Sep 17 00:00:00 2001 From: Robert Kukla Date: Sun, 2 Mar 2008 21:28:26 +0000 Subject: [PATCH] simulator: - correct colours for m:robe 100 display & screendump - labelled button on background git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16488 a1c6a512-1295-4272-9138-f99709370657 --- apps/misc.c | 5 ++++ uisimulator/sdl/UI-mrobe100.bmp | Bin 309558 -> 309558 bytes uisimulator/sdl/button.c | 1 + uisimulator/sdl/lcd-bitmap.c | 7 ++--- uisimulator/sdl/lcd-charcells.c | 6 +++-- uisimulator/sdl/uisdl.h | 45 +++++++++++++++++++++----------- 6 files changed, 44 insertions(+), 20 deletions(-) diff --git a/apps/misc.c b/apps/misc.c index 8fe8791677..09c1f9a861 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -393,8 +393,13 @@ static const unsigned char bmpheader[] = LE32_CONST(BMP_NUMCOLORS), /* Number of important colours */ #if LCD_DEPTH == 1 +#ifdef MROBE_100 + 2, 2, 94, 0x00, /* Colour #0 */ + 3, 6, 241, 0x00 /* Colour #1 */ +#elif 0x90, 0xee, 0x90, 0x00, /* Colour #0 */ 0x00, 0x00, 0x00, 0x00 /* Colour #1 */ +#endif #elif LCD_DEPTH == 2 0xe6, 0xd8, 0xad, 0x00, /* Colour #0 */ 0x99, 0x90, 0x73, 0x00, /* Colour #1 */ diff --git a/uisimulator/sdl/UI-mrobe100.bmp b/uisimulator/sdl/UI-mrobe100.bmp index 17e7abcde1061ecddf2ab59b867380895a84014a..19e5e1f3d301213e9a52746ce24433de04d22d3e 100644 GIT binary patch delta 12309 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 diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 0b347c9322..967f41baf7 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c @@ -702,6 +702,7 @@ void button_event(int key, bool pressed) case SDLK_SPACE: new_btn = BUTTON_SELECT; break; + case SDLK_KP_MULTIPLY: case SDLK_F8: case SDLK_ESCAPE: new_btn = BUTTON_POWER; diff --git a/uisimulator/sdl/lcd-bitmap.c b/uisimulator/sdl/lcd-bitmap.c index 7b6e2217c6..438b133804 100644 --- a/uisimulator/sdl/lcd-bitmap.c +++ b/uisimulator/sdl/lcd-bitmap.c @@ -27,9 +27,10 @@ int lcd_backlight_val; #if LCD_DEPTH <= 8 #ifdef HAVE_BACKLIGHT SDL_Color lcd_backlight_color_zero = {UI_LCD_BGCOLORLIGHT, 0}; +SDL_Color lcd_backlight_color_max = {UI_LCD_FGCOLORLIGHT, 0}; #endif SDL_Color lcd_color_zero = {UI_LCD_BGCOLOR, 0}; -SDL_Color lcd_color_max = {0, 0, 0, 0}; +SDL_Color lcd_color_max = {UI_LCD_FGCOLOR, 0}; #endif #if LCD_DEPTH < 8 @@ -79,7 +80,7 @@ void sim_backlight(int value) #if LCD_DEPTH <= 8 if (value > 0) { sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, - &lcd_color_max, 0, (1< 0) { - sdl_set_gradient(lcd_surface, &lcd_color_max, + sdl_set_gradient(lcd_surface, &lcd_backlight_color_max, &lcd_backlight_color_zero, (1< 0) { - sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, &lcd_color_max, + sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, + &lcd_backlight_color_max, 0, (1<