diff options
Diffstat (limited to 'apps/screen_access.c')
-rw-r--r-- | apps/screen_access.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c index 44e90742b0..390fb2ad4e 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include "backlight.h" | 35 | #include "backlight.h" |
36 | #include "screen_access.h" | 36 | #include "screen_access.h" |
37 | #include "backdrop.h" | 37 | #include "backdrop.h" |
38 | #include "viewport.h" | ||
38 | 39 | ||
39 | /* some helper functions to calculate metrics on the fly */ | 40 | /* some helper functions to calculate metrics on the fly */ |
40 | static int screen_helper_getcharwidth(void) | 41 | static int screen_helper_getcharwidth(void) |
@@ -87,7 +88,17 @@ static void screen_helper_put_line(int x, int y, struct line_desc *line, | |||
87 | va_end(ap); | 88 | va_end(ap); |
88 | } | 89 | } |
89 | 90 | ||
91 | void screen_helper_lcd_viewport_set_buffer(struct viewport *vp, struct frame_buffer_t *buffer) | ||
92 | { | ||
93 | viewport_set_buffer(vp, buffer, SCREEN_MAIN); | ||
94 | } | ||
95 | |||
90 | #if NB_SCREENS == 2 | 96 | #if NB_SCREENS == 2 |
97 | void screen_helper_lcd_remote_viewport_set_buffer(struct viewport *vp, struct frame_buffer_t *buffer) | ||
98 | { | ||
99 | viewport_set_buffer(vp, buffer, SCREEN_REMOTE); | ||
100 | } | ||
101 | |||
91 | static int screen_helper_remote_getcharwidth(void) | 102 | static int screen_helper_remote_getcharwidth(void) |
92 | { | 103 | { |
93 | return font_get(lcd_remote_getfont())->maxwidth; | 104 | return font_get(lcd_remote_getfont())->maxwidth; |
@@ -156,7 +167,11 @@ struct screen screens[NB_SCREENS] = | |||
156 | .has_disk_led=true, | 167 | .has_disk_led=true, |
157 | #endif | 168 | #endif |
158 | .set_drawmode=&screen_helper_set_drawmode, | 169 | .set_drawmode=&screen_helper_set_drawmode, |
170 | .init_viewport=&lcd_init_viewport, | ||
159 | .set_viewport=&lcd_set_viewport, | 171 | .set_viewport=&lcd_set_viewport, |
172 | .set_viewport_ex=&lcd_set_viewport_ex, | ||
173 | .viewport_set_buffer = &screen_helper_lcd_viewport_set_buffer, | ||
174 | .current_viewport = &lcd_current_viewport, | ||
160 | .getwidth=&lcd_getwidth, | 175 | .getwidth=&lcd_getwidth, |
161 | .getheight=&lcd_getheight, | 176 | .getheight=&lcd_getheight, |
162 | .getstringsize=&lcd_getstringsize, | 177 | .getstringsize=&lcd_getstringsize, |
@@ -221,7 +236,6 @@ struct screen screens[NB_SCREENS] = | |||
221 | .backdrop_load=&backdrop_load, | 236 | .backdrop_load=&backdrop_load, |
222 | .backdrop_show=&backdrop_show, | 237 | .backdrop_show=&backdrop_show, |
223 | #endif | 238 | #endif |
224 | .set_framebuffer = (void*)lcd_set_framebuffer, | ||
225 | #if defined(HAVE_LCD_COLOR) | 239 | #if defined(HAVE_LCD_COLOR) |
226 | .gradient_fillrect = lcd_gradient_fillrect, | 240 | .gradient_fillrect = lcd_gradient_fillrect, |
227 | .gradient_fillrect_part = lcd_gradient_fillrect_part, | 241 | .gradient_fillrect_part = lcd_gradient_fillrect_part, |
@@ -241,7 +255,11 @@ struct screen screens[NB_SCREENS] = | |||
241 | .getcharheight=screen_helper_remote_getcharheight, | 255 | .getcharheight=screen_helper_remote_getcharheight, |
242 | .has_disk_led=false, | 256 | .has_disk_led=false, |
243 | .set_drawmode=&lcd_remote_set_drawmode, | 257 | .set_drawmode=&lcd_remote_set_drawmode, |
258 | .init_viewport=&lcd_remote_init_viewport, | ||
244 | .set_viewport=&lcd_remote_set_viewport, | 259 | .set_viewport=&lcd_remote_set_viewport, |
260 | .set_viewport_ex=&lcd_remote_set_viewport_ex, | ||
261 | .viewport_set_buffer = &screen_helper_lcd_remote_viewport_set_buffer, | ||
262 | .current_viewport = &lcd_remote_current_viewport, | ||
245 | .getwidth=&lcd_remote_getwidth, | 263 | .getwidth=&lcd_remote_getwidth, |
246 | .getheight=&lcd_remote_getheight, | 264 | .getheight=&lcd_remote_getheight, |
247 | .getstringsize=&lcd_remote_getstringsize, | 265 | .getstringsize=&lcd_remote_getstringsize, |
@@ -307,7 +325,6 @@ struct screen screens[NB_SCREENS] = | |||
307 | .backdrop_load=&remote_backdrop_load, | 325 | .backdrop_load=&remote_backdrop_load, |
308 | .backdrop_show=&remote_backdrop_show, | 326 | .backdrop_show=&remote_backdrop_show, |
309 | #endif | 327 | #endif |
310 | .set_framebuffer = (void*)lcd_remote_set_framebuffer, | ||
311 | .put_line = screen_helper_remote_put_line, | 328 | .put_line = screen_helper_remote_put_line, |
312 | } | 329 | } |
313 | #endif /* NB_SCREENS == 2 */ | 330 | #endif /* NB_SCREENS == 2 */ |