diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/screen_access.c | 13 | ||||
-rw-r--r-- | apps/screen_access.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c index dd8b16e3fd..7f44cf5305 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -91,6 +91,15 @@ static void screen_helper_setuifont(int font) | |||
91 | } | 91 | } |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | static void screen_helper_set_drawmode(int mode) | ||
95 | { | ||
96 | #ifdef HAVE_LCD_BITMAP | ||
97 | lcd_set_drawmode(mode); | ||
98 | #else | ||
99 | (void) mode; | ||
100 | #endif | ||
101 | } | ||
102 | |||
94 | #if NB_SCREENS == 2 | 103 | #if NB_SCREENS == 2 |
95 | static int screen_helper_remote_getcharwidth(void) | 104 | static int screen_helper_remote_getcharwidth(void) |
96 | { | 105 | { |
@@ -172,6 +181,7 @@ struct screen screens[NB_SCREENS] = | |||
172 | #elif defined(HAVE_REMOTE_LCD) | 181 | #elif defined(HAVE_REMOTE_LCD) |
173 | .has_disk_led=true, | 182 | .has_disk_led=true, |
174 | #endif | 183 | #endif |
184 | .set_drawmode=&screen_helper_set_drawmode, | ||
175 | .set_viewport=&lcd_set_viewport, | 185 | .set_viewport=&lcd_set_viewport, |
176 | .getwidth=&lcd_getwidth, | 186 | .getwidth=&lcd_getwidth, |
177 | .getheight=&lcd_getheight, | 187 | .getheight=&lcd_getheight, |
@@ -182,7 +192,6 @@ struct screen screens[NB_SCREENS] = | |||
182 | .setuifont=screen_helper_setuifont, | 192 | .setuifont=screen_helper_setuifont, |
183 | .mono_bitmap=&lcd_mono_bitmap, | 193 | .mono_bitmap=&lcd_mono_bitmap, |
184 | .mono_bitmap_part=&lcd_mono_bitmap_part, | 194 | .mono_bitmap_part=&lcd_mono_bitmap_part, |
185 | .set_drawmode=&lcd_set_drawmode, | ||
186 | .bitmap=(screen_bitmap_func*)&lcd_bitmap, | 195 | .bitmap=(screen_bitmap_func*)&lcd_bitmap, |
187 | .bitmap_part=(screen_bitmap_part_func*)&lcd_bitmap_part, | 196 | .bitmap_part=(screen_bitmap_part_func*)&lcd_bitmap_part, |
188 | #if LCD_DEPTH <= 2 | 197 | #if LCD_DEPTH <= 2 |
@@ -284,6 +293,7 @@ struct screen screens[NB_SCREENS] = | |||
284 | .getcharwidth=screen_helper_remote_getcharwidth, | 293 | .getcharwidth=screen_helper_remote_getcharwidth, |
285 | .getcharheight=screen_helper_remote_getcharheight, | 294 | .getcharheight=screen_helper_remote_getcharheight, |
286 | .has_disk_led=false, | 295 | .has_disk_led=false, |
296 | .set_drawmode=&lcd_remote_set_drawmode, | ||
287 | .set_viewport=&lcd_remote_set_viewport, | 297 | .set_viewport=&lcd_remote_set_viewport, |
288 | .getwidth=&lcd_remote_getwidth, | 298 | .getwidth=&lcd_remote_getwidth, |
289 | .getheight=&lcd_remote_getheight, | 299 | .getheight=&lcd_remote_getheight, |
@@ -296,7 +306,6 @@ struct screen screens[NB_SCREENS] = | |||
296 | .mono_bitmap_part=&lcd_remote_mono_bitmap_part, | 306 | .mono_bitmap_part=&lcd_remote_mono_bitmap_part, |
297 | .bitmap=(screen_bitmap_func*)&lcd_remote_bitmap, | 307 | .bitmap=(screen_bitmap_func*)&lcd_remote_bitmap, |
298 | .bitmap_part=(screen_bitmap_part_func*)&lcd_remote_bitmap_part, | 308 | .bitmap_part=(screen_bitmap_part_func*)&lcd_remote_bitmap_part, |
299 | .set_drawmode=&lcd_remote_set_drawmode, | ||
300 | #if LCD_REMOTE_DEPTH <= 2 | 309 | #if LCD_REMOTE_DEPTH <= 2 |
301 | /* No transparency yet for grayscale and mono lcd */ | 310 | /* No transparency yet for grayscale and mono lcd */ |
302 | .transparent_bitmap=(screen_bitmap_func*)&lcd_remote_bitmap, | 311 | .transparent_bitmap=(screen_bitmap_func*)&lcd_remote_bitmap, |
diff --git a/apps/screen_access.h b/apps/screen_access.h index d5bcd7e095..26c9977bf2 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -66,6 +66,7 @@ struct screen | |||
66 | #ifdef HAVE_BUTTONBAR | 66 | #ifdef HAVE_BUTTONBAR |
67 | bool has_buttonbar; | 67 | bool has_buttonbar; |
68 | #endif | 68 | #endif |
69 | void (*set_drawmode)(int mode); | ||
69 | void (*set_viewport)(struct viewport* vp); | 70 | void (*set_viewport)(struct viewport* vp); |
70 | int (*getwidth)(void); | 71 | int (*getwidth)(void); |
71 | int (*getheight)(void); | 72 | int (*getheight)(void); |
@@ -101,7 +102,6 @@ struct screen | |||
101 | void (*bmp)(const struct bitmap *bm, int x, int y); | 102 | void (*bmp)(const struct bitmap *bm, int x, int y); |
102 | void (*bmp_part)(const struct bitmap* bm, int src_x, int src_y, | 103 | void (*bmp_part)(const struct bitmap* bm, int src_x, int src_y, |
103 | int x, int y, int width, int height); | 104 | int x, int y, int width, int height); |
104 | void (*set_drawmode)(int mode); | ||
105 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 | 105 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 |
106 | unsigned (*color_to_native)(unsigned color); | 106 | unsigned (*color_to_native)(unsigned color); |
107 | #endif | 107 | #endif |