diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/lcd.h | 8 | ||||
-rw-r--r-- | firmware/export/scroll_engine.h | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index ac0aea8664..2ea9906a2a 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -27,6 +27,8 @@ | |||
27 | #define STYLE_DEFAULT 0x00000000 | 27 | #define STYLE_DEFAULT 0x00000000 |
28 | #define STYLE_INVERT 0x20000000 | 28 | #define STYLE_INVERT 0x20000000 |
29 | #define STYLE_COLORED 0x10000000 | 29 | #define STYLE_COLORED 0x10000000 |
30 | #define STYLE_COLORBAR 0x40000000 | ||
31 | #define STYLE_GRADIENT 0x80000000 | ||
30 | #define STYLE_COLOR_MASK 0x0000FFFF | 32 | #define STYLE_COLOR_MASK 0x0000FFFF |
31 | 33 | ||
32 | #ifdef SIMULATOR | 34 | #ifdef SIMULATOR |
@@ -233,6 +235,7 @@ static inline unsigned lcd_color_to_native(unsigned color) | |||
233 | #define LCD_WHITE LCD_RGBPACK(255, 255, 255) | 235 | #define LCD_WHITE LCD_RGBPACK(255, 255, 255) |
234 | #define LCD_DEFAULT_FG LCD_BLACK | 236 | #define LCD_DEFAULT_FG LCD_BLACK |
235 | #define LCD_DEFAULT_BG LCD_RGBPACK(182, 198, 229) /* rockbox blue */ | 237 | #define LCD_DEFAULT_BG LCD_RGBPACK(182, 198, 229) /* rockbox blue */ |
238 | #define LCD_DEFAULT_LS LCD_WHITE | ||
236 | 239 | ||
237 | #elif LCD_DEPTH > 1 /* greyscale */ | 240 | #elif LCD_DEPTH > 1 /* greyscale */ |
238 | 241 | ||
@@ -355,6 +358,11 @@ extern void lcd_set_foreground(unsigned foreground); | |||
355 | extern unsigned lcd_get_foreground(void); | 358 | extern unsigned lcd_get_foreground(void); |
356 | extern void lcd_set_background(unsigned background); | 359 | extern void lcd_set_background(unsigned background); |
357 | extern unsigned lcd_get_background(void); | 360 | extern unsigned lcd_get_background(void); |
361 | #ifdef HAVE_LCD_COLOR | ||
362 | extern void lcd_set_selector_start(unsigned selector); | ||
363 | extern void lcd_set_selector_end(unsigned selector); | ||
364 | extern void lcd_set_selector_text(unsigned selector_text); | ||
365 | #endif | ||
358 | extern void lcd_set_drawinfo(int mode, unsigned foreground, | 366 | extern void lcd_set_drawinfo(int mode, unsigned foreground, |
359 | unsigned background); | 367 | unsigned background); |
360 | void lcd_set_backdrop(fb_data* backdrop); | 368 | void lcd_set_backdrop(fb_data* backdrop); |
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index aa11a9ba1f..f40a00f96c 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -43,8 +43,12 @@ struct scrollinfo | |||
43 | int startx; | 43 | int startx; |
44 | #ifdef HAVE_LCD_BITMAP | 44 | #ifdef HAVE_LCD_BITMAP |
45 | int width; /* length of line in pixels */ | 45 | int width; /* length of line in pixels */ |
46 | bool invert; /* invert the scrolled text */ | 46 | #ifdef HAVE_LCD_COLOR |
47 | int invert; /* invert the scrolled text */ | ||
48 | #else | ||
49 | bool invert; | ||
47 | #endif | 50 | #endif |
51 | #endif/* HAVE_LCD_BITMAP */ | ||
48 | bool backward; /* scroll presently forward or backward? */ | 52 | bool backward; /* scroll presently forward or backward? */ |
49 | bool bidir; | 53 | bool bidir; |
50 | long start_tick; | 54 | long start_tick; |