diff options
author | Robert Kukla <roolku@rockbox.org> | 2008-03-02 21:28:26 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2008-03-02 21:28:26 +0000 |
commit | 3e3e1d518ead4c1f864f61b219fa975396fe75f2 (patch) | |
tree | 9881d351a37d037d2ce8d4905fea37ae77e16646 | |
parent | 793fc3f0729103ad8d2c196f0783b9f36662f6bd (diff) | |
download | rockbox-3e3e1d518ead4c1f864f61b219fa975396fe75f2.tar.gz rockbox-3e3e1d518ead4c1f864f61b219fa975396fe75f2.zip |
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
-rw-r--r-- | apps/misc.c | 5 | ||||
-rw-r--r-- | uisimulator/sdl/UI-mrobe100.bmp | bin | 309558 -> 309558 bytes | |||
-rw-r--r-- | uisimulator/sdl/button.c | 1 | ||||
-rw-r--r-- | uisimulator/sdl/lcd-bitmap.c | 7 | ||||
-rw-r--r-- | uisimulator/sdl/lcd-charcells.c | 6 | ||||
-rw-r--r-- | 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[] = | |||
393 | LE32_CONST(BMP_NUMCOLORS), /* Number of important colours */ | 393 | LE32_CONST(BMP_NUMCOLORS), /* Number of important colours */ |
394 | 394 | ||
395 | #if LCD_DEPTH == 1 | 395 | #if LCD_DEPTH == 1 |
396 | #ifdef MROBE_100 | ||
397 | 2, 2, 94, 0x00, /* Colour #0 */ | ||
398 | 3, 6, 241, 0x00 /* Colour #1 */ | ||
399 | #elif | ||
396 | 0x90, 0xee, 0x90, 0x00, /* Colour #0 */ | 400 | 0x90, 0xee, 0x90, 0x00, /* Colour #0 */ |
397 | 0x00, 0x00, 0x00, 0x00 /* Colour #1 */ | 401 | 0x00, 0x00, 0x00, 0x00 /* Colour #1 */ |
402 | #endif | ||
398 | #elif LCD_DEPTH == 2 | 403 | #elif LCD_DEPTH == 2 |
399 | 0xe6, 0xd8, 0xad, 0x00, /* Colour #0 */ | 404 | 0xe6, 0xd8, 0xad, 0x00, /* Colour #0 */ |
400 | 0x99, 0x90, 0x73, 0x00, /* Colour #1 */ | 405 | 0x99, 0x90, 0x73, 0x00, /* Colour #1 */ |
diff --git a/uisimulator/sdl/UI-mrobe100.bmp b/uisimulator/sdl/UI-mrobe100.bmp index 17e7abcde1..19e5e1f3d3 100644 --- a/uisimulator/sdl/UI-mrobe100.bmp +++ b/uisimulator/sdl/UI-mrobe100.bmp | |||
Binary files differ | |||
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) | |||
702 | case SDLK_SPACE: | 702 | case SDLK_SPACE: |
703 | new_btn = BUTTON_SELECT; | 703 | new_btn = BUTTON_SELECT; |
704 | break; | 704 | break; |
705 | case SDLK_KP_MULTIPLY: | ||
705 | case SDLK_F8: | 706 | case SDLK_F8: |
706 | case SDLK_ESCAPE: | 707 | case SDLK_ESCAPE: |
707 | new_btn = BUTTON_POWER; | 708 | 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; | |||
27 | #if LCD_DEPTH <= 8 | 27 | #if LCD_DEPTH <= 8 |
28 | #ifdef HAVE_BACKLIGHT | 28 | #ifdef HAVE_BACKLIGHT |
29 | SDL_Color lcd_backlight_color_zero = {UI_LCD_BGCOLORLIGHT, 0}; | 29 | SDL_Color lcd_backlight_color_zero = {UI_LCD_BGCOLORLIGHT, 0}; |
30 | SDL_Color lcd_backlight_color_max = {UI_LCD_FGCOLORLIGHT, 0}; | ||
30 | #endif | 31 | #endif |
31 | SDL_Color lcd_color_zero = {UI_LCD_BGCOLOR, 0}; | 32 | SDL_Color lcd_color_zero = {UI_LCD_BGCOLOR, 0}; |
32 | SDL_Color lcd_color_max = {0, 0, 0, 0}; | 33 | SDL_Color lcd_color_max = {UI_LCD_FGCOLOR, 0}; |
33 | #endif | 34 | #endif |
34 | 35 | ||
35 | #if LCD_DEPTH < 8 | 36 | #if LCD_DEPTH < 8 |
@@ -79,7 +80,7 @@ void sim_backlight(int value) | |||
79 | #if LCD_DEPTH <= 8 | 80 | #if LCD_DEPTH <= 8 |
80 | if (value > 0) { | 81 | if (value > 0) { |
81 | sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, | 82 | sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, |
82 | &lcd_color_max, 0, (1<<LCD_DEPTH)); | 83 | &lcd_backlight_color_max, 0, (1<<LCD_DEPTH)); |
83 | } else { | 84 | } else { |
84 | sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max, | 85 | sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max, |
85 | 0, (1<<LCD_DEPTH)); | 86 | 0, (1<<LCD_DEPTH)); |
@@ -87,7 +88,7 @@ void sim_backlight(int value) | |||
87 | #if LCD_DEPTH < 8 | 88 | #if LCD_DEPTH < 8 |
88 | if (lcd_ex_shades) { | 89 | if (lcd_ex_shades) { |
89 | if (value > 0) { | 90 | if (value > 0) { |
90 | sdl_set_gradient(lcd_surface, &lcd_color_max, | 91 | sdl_set_gradient(lcd_surface, &lcd_backlight_color_max, |
91 | &lcd_backlight_color_zero, (1<<LCD_DEPTH), | 92 | &lcd_backlight_color_zero, (1<<LCD_DEPTH), |
92 | lcd_ex_shades); | 93 | lcd_ex_shades); |
93 | } else { | 94 | } else { |
diff --git a/uisimulator/sdl/lcd-charcells.c b/uisimulator/sdl/lcd-charcells.c index 722933f002..85ff9678e4 100644 --- a/uisimulator/sdl/lcd-charcells.c +++ b/uisimulator/sdl/lcd-charcells.c | |||
@@ -35,7 +35,8 @@ extern int sim_creat(const char *name); | |||
35 | SDL_Surface* lcd_surface; | 35 | SDL_Surface* lcd_surface; |
36 | SDL_Color lcd_color_zero = {UI_LCD_BGCOLOR, 0}; | 36 | SDL_Color lcd_color_zero = {UI_LCD_BGCOLOR, 0}; |
37 | SDL_Color lcd_backlight_color_zero = {UI_LCD_BGCOLORLIGHT, 0}; | 37 | SDL_Color lcd_backlight_color_zero = {UI_LCD_BGCOLORLIGHT, 0}; |
38 | SDL_Color lcd_color_max = {0, 0, 0, 0}; | 38 | SDL_Color lcd_color_max = {UI_LCD_FGCOLOR, 0}; |
39 | SDL_Color lcd_backlight_color_max = {UI_LCD_FGCOLORLIGHT, 0}; | ||
39 | 40 | ||
40 | 41 | ||
41 | static unsigned long get_lcd_pixel(int x, int y) | 42 | static unsigned long get_lcd_pixel(int x, int y) |
@@ -75,7 +76,8 @@ void lcd_update(void) | |||
75 | void sim_backlight(int value) | 76 | void sim_backlight(int value) |
76 | { | 77 | { |
77 | if (value > 0) { | 78 | if (value > 0) { |
78 | sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, &lcd_color_max, | 79 | sdl_set_gradient(lcd_surface, &lcd_backlight_color_zero, |
80 | &lcd_backlight_color_max, | ||
79 | 0, (1<<LCD_DEPTH)); | 81 | 0, (1<<LCD_DEPTH)); |
80 | } else { | 82 | } else { |
81 | sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max, | 83 | sdl_set_gradient(lcd_surface, &lcd_color_zero, &lcd_color_max, |
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index db11047dd1..5a7d89a8ec 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h | |||
@@ -31,7 +31,8 @@ | |||
31 | #define UI_HEIGHT 406 /* height of GUI window */ | 31 | #define UI_HEIGHT 406 /* height of GUI window */ |
32 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 32 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
33 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */ | 33 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */ |
34 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 34 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
35 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
35 | #define UI_LCD_POSX 80 /* x position of lcd */ | 36 | #define UI_LCD_POSX 80 /* x position of lcd */ |
36 | #define UI_LCD_POSY 104 /* y position of lcd (96 for real aspect) */ | 37 | #define UI_LCD_POSY 104 /* y position of lcd (96 for real aspect) */ |
37 | #define UI_LCD_WIDTH 112 | 38 | #define UI_LCD_WIDTH 112 |
@@ -43,7 +44,8 @@ | |||
43 | #define UI_HEIGHT 420 /* height of GUI window */ | 44 | #define UI_HEIGHT 420 /* height of GUI window */ |
44 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 45 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
45 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */ | 46 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */ |
46 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 47 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
48 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
47 | #define UI_LCD_POSX 75 /* x position of lcd */ | 49 | #define UI_LCD_POSX 75 /* x position of lcd */ |
48 | #define UI_LCD_POSY 116 /* y position of lcd */ | 50 | #define UI_LCD_POSY 116 /* y position of lcd */ |
49 | #define UI_LCD_WIDTH 132 | 51 | #define UI_LCD_WIDTH 132 |
@@ -55,7 +57,8 @@ | |||
55 | #define UI_HEIGHT 414 /* height of GUI window */ | 57 | #define UI_HEIGHT 414 /* height of GUI window */ |
56 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 58 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
57 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */ | 59 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 /* bkgnd color of LCD (backlight) */ |
58 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 60 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
61 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
59 | #define UI_LCD_POSX 87 /* x position of lcd */ | 62 | #define UI_LCD_POSX 87 /* x position of lcd */ |
60 | #define UI_LCD_POSY 77 /* y position of lcd (69 for real aspect) */ | 63 | #define UI_LCD_POSY 77 /* y position of lcd (69 for real aspect) */ |
61 | #define UI_LCD_WIDTH 112 | 64 | #define UI_LCD_WIDTH 112 |
@@ -67,7 +70,8 @@ | |||
67 | #define UI_HEIGHT 334 /* height of GUI window */ | 70 | #define UI_HEIGHT 334 /* height of GUI window */ |
68 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 71 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
69 | #define UI_LCD_BGCOLORLIGHT 130, 180, 250 /* bkgnd color of LCD (backlight mod) */ | 72 | #define UI_LCD_BGCOLORLIGHT 130, 180, 250 /* bkgnd color of LCD (backlight mod) */ |
70 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 73 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
74 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
71 | #define UI_LCD_POSX 21 /* x position of lcd */ | 75 | #define UI_LCD_POSX 21 /* x position of lcd */ |
72 | #define UI_LCD_POSY 82 /* y position of lcd (74 for real aspect) */ | 76 | #define UI_LCD_POSY 82 /* y position of lcd (74 for real aspect) */ |
73 | #define UI_LCD_WIDTH 112 | 77 | #define UI_LCD_WIDTH 112 |
@@ -79,13 +83,16 @@ | |||
79 | #define UI_HEIGHT 508 /* height of GUI window */ | 83 | #define UI_HEIGHT 508 /* height of GUI window */ |
80 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 84 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
81 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ | 85 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ |
82 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 86 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
87 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
83 | #define UI_LCD_POSX 109 /* x position of lcd */ | 88 | #define UI_LCD_POSX 109 /* x position of lcd */ |
84 | #define UI_LCD_POSY 23 /* y position of lcd */ | 89 | #define UI_LCD_POSY 23 /* y position of lcd */ |
85 | #define UI_LCD_WIDTH 160 | 90 | #define UI_LCD_WIDTH 160 |
86 | #define UI_LCD_HEIGHT 128 | 91 | #define UI_LCD_HEIGHT 128 |
87 | #define UI_REMOTE_BGCOLOR 90, 145, 90 /* bkgnd of remote lcd (no bklight) */ | 92 | #define UI_REMOTE_BGCOLOR 90, 145, 90 /* bkgnd of remote lcd (no bklight) */ |
88 | #define UI_REMOTE_BGCOLORLIGHT 130, 180, 250 /* bkgnd of remote lcd (bklight) */ | 93 | #define UI_REMOTE_BGCOLORLIGHT 130, 180, 250 /* bkgnd of remote lcd (bklight) */ |
94 | #define UI_REMOTE_FGCOLOR 0, 0, 0 /* foreground color of remote LCD (no backlight) */ | ||
95 | #define UI_REMOTE_FGCOLORLIGHT 0, 0, 0 /* foreground color of remote LCD (backlight) */ | ||
89 | #define UI_REMOTE_POSX 50 /* x position of remote lcd */ | 96 | #define UI_REMOTE_POSX 50 /* x position of remote lcd */ |
90 | #define UI_REMOTE_POSY 403 /* y position of remote lcd */ | 97 | #define UI_REMOTE_POSY 403 /* y position of remote lcd */ |
91 | #define UI_REMOTE_WIDTH 128 | 98 | #define UI_REMOTE_WIDTH 128 |
@@ -113,7 +120,8 @@ | |||
113 | #define UI_HEIGHT 382 /* height of GUI window */ | 120 | #define UI_HEIGHT 382 /* height of GUI window */ |
114 | #define UI_LCD_BGCOLOR 100, 135, 100 /* bkgnd color of LCD (no backlight) */ | 121 | #define UI_LCD_BGCOLOR 100, 135, 100 /* bkgnd color of LCD (no backlight) */ |
115 | #define UI_LCD_BGCOLORLIGHT 223, 216, 255 /* bkgnd color of LCD (backlight) */ | 122 | #define UI_LCD_BGCOLORLIGHT 223, 216, 255 /* bkgnd color of LCD (backlight) */ |
116 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 123 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
124 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
117 | #define UI_LCD_POSX 32 /* x position of lcd */ | 125 | #define UI_LCD_POSX 32 /* x position of lcd */ |
118 | #define UI_LCD_POSY 12 /* y position of lcd */ | 126 | #define UI_LCD_POSY 12 /* y position of lcd */ |
119 | #define UI_LCD_WIDTH 160 | 127 | #define UI_LCD_WIDTH 160 |
@@ -125,7 +133,8 @@ | |||
125 | #define UI_HEIGHT 389 /* height of GUI window */ | 133 | #define UI_HEIGHT 389 /* height of GUI window */ |
126 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 134 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
127 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ | 135 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ |
128 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 136 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
137 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
129 | #define UI_LCD_POSX 29 /* x position of lcd */ | 138 | #define UI_LCD_POSX 29 /* x position of lcd */ |
130 | #define UI_LCD_POSY 16 /* y position of lcd */ | 139 | #define UI_LCD_POSY 16 /* y position of lcd */ |
131 | #define UI_LCD_WIDTH 160 | 140 | #define UI_LCD_WIDTH 160 |
@@ -137,7 +146,8 @@ | |||
137 | #define UI_HEIGHT 370 /* height of GUI window */ | 146 | #define UI_HEIGHT 370 /* height of GUI window */ |
138 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 147 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
139 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ | 148 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ |
140 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 149 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
150 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
141 | #define UI_LCD_POSX 19 /* x position of lcd */ | 151 | #define UI_LCD_POSX 19 /* x position of lcd */ |
142 | #define UI_LCD_POSY 14 /* y position of lcd */ | 152 | #define UI_LCD_POSY 14 /* y position of lcd */ |
143 | #define UI_LCD_WIDTH 160 | 153 | #define UI_LCD_WIDTH 160 |
@@ -149,7 +159,8 @@ | |||
149 | #define UI_HEIGHT 365 /* height of GUI window */ | 159 | #define UI_HEIGHT 365 /* height of GUI window */ |
150 | #define UI_LCD_BGCOLOR 100, 135, 100 /* bkgnd color of LCD (no backlight) */ | 160 | #define UI_LCD_BGCOLOR 100, 135, 100 /* bkgnd color of LCD (no backlight) */ |
151 | #define UI_LCD_BGCOLORLIGHT 223, 216, 255 /* bkgnd color of LCD (backlight) */ | 161 | #define UI_LCD_BGCOLORLIGHT 223, 216, 255 /* bkgnd color of LCD (backlight) */ |
152 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 162 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
163 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
153 | #define UI_LCD_POSX 24 /* x position of lcd */ | 164 | #define UI_LCD_POSX 24 /* x position of lcd */ |
154 | #define UI_LCD_POSY 17 /* y position of lcd */ | 165 | #define UI_LCD_POSY 17 /* y position of lcd */ |
155 | #define UI_LCD_WIDTH 138 | 166 | #define UI_LCD_WIDTH 138 |
@@ -301,7 +312,8 @@ | |||
301 | #define UI_HEIGHT 183 /* height of GUI window */ | 312 | #define UI_HEIGHT 183 /* height of GUI window */ |
302 | #define UI_LCD_BGCOLOR 94, 104, 84 /* bkgnd color of LCD (no backlight) */ | 313 | #define UI_LCD_BGCOLOR 94, 104, 84 /* bkgnd color of LCD (no backlight) */ |
303 | #define UI_LCD_BGCOLORLIGHT 60, 160, 230 /* bkgnd color of LCD (backlight) */ | 314 | #define UI_LCD_BGCOLORLIGHT 60, 160, 230 /* bkgnd color of LCD (backlight) */ |
304 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 315 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
316 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
305 | #define UI_LCD_POSX 115 /* x position of lcd */ | 317 | #define UI_LCD_POSX 115 /* x position of lcd */ |
306 | #define UI_LCD_POSY 54 /* y position of lcd */ | 318 | #define UI_LCD_POSY 54 /* y position of lcd */ |
307 | #define UI_LCD_WIDTH LCD_WIDTH /* * 1.5 */ | 319 | #define UI_LCD_WIDTH LCD_WIDTH /* * 1.5 */ |
@@ -318,15 +330,17 @@ | |||
318 | #define UI_LCD_HEIGHT 240 | 330 | #define UI_LCD_HEIGHT 240 |
319 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ | 331 | #define UI_LCD_BGCOLOR 90, 145, 90 /* bkgnd color of LCD (no backlight) */ |
320 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ | 332 | #define UI_LCD_BGCOLORLIGHT 173, 216, 230 /* bkgnd color of LCD (backlight) */ |
321 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 333 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
334 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
322 | 335 | ||
323 | #elif defined(MROBE_100) | 336 | #elif defined(MROBE_100) |
324 | #define UI_TITLE "Olympus M:Robe 100" | 337 | #define UI_TITLE "Olympus M:Robe 100" |
325 | #define UI_WIDTH 247 /* width of GUI window */ | 338 | #define UI_WIDTH 247 /* width of GUI window */ |
326 | #define UI_HEIGHT 416 /* height of GUI window */ | 339 | #define UI_HEIGHT 416 /* height of GUI window */ |
327 | #define UI_LCD_BGCOLOR 94, 2, 2 /* bkgnd color of LCD (no backlight) */ | 340 | #define UI_LCD_BGCOLOR 0, 0, 0 /* bkgnd color of LCD (no backlight) */ |
328 | #define UI_LCD_BGCOLORLIGHT 241, 6, 3 /* bkgnd color of LCD (backlight) */ | 341 | #define UI_LCD_BGCOLORLIGHT 94, 2, 2 /* bkgnd color of LCD (backlight) */ |
329 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 342 | #define UI_LCD_FGCOLOR 50, 50, 50 /* foreground color of LCD (no backlight) */ |
343 | #define UI_LCD_FGCOLORLIGHT 241, 6, 3 /* foreground color of LCD (backlight) */ | ||
330 | #define UI_LCD_POSX 43 /* x position of lcd */ | 344 | #define UI_LCD_POSX 43 /* x position of lcd */ |
331 | #define UI_LCD_POSY 25 /* y position of lcd */ | 345 | #define UI_LCD_POSY 25 /* y position of lcd */ |
332 | #define UI_LCD_WIDTH 160 | 346 | #define UI_LCD_WIDTH 160 |
@@ -342,7 +356,8 @@ | |||
342 | #define UI_LCD_HEIGHT 240 | 356 | #define UI_LCD_HEIGHT 240 |
343 | #define UI_LCD_BGCOLOR 32, 32, 32 /* bkgnd color of LCD (no backlight) */ | 357 | #define UI_LCD_BGCOLOR 32, 32, 32 /* bkgnd color of LCD (no backlight) */ |
344 | #define UI_LCD_BGCOLORLIGHT 192, 192, 192 /* bkgnd color of LCD (backlight) */ | 358 | #define UI_LCD_BGCOLORLIGHT 192, 192, 192 /* bkgnd color of LCD (backlight) */ |
345 | #define UI_LCD_BLACK 0, 0, 0 /* black */ | 359 | #define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */ |
360 | #define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */ | ||
346 | 361 | ||
347 | #endif | 362 | #endif |
348 | extern SDL_Surface *gui_surface; | 363 | extern SDL_Surface *gui_surface; |