diff options
Diffstat (limited to 'apps/screen_access.c')
-rw-r--r-- | apps/screen_access.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c index cdb02a6546..44e90742b0 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -39,43 +39,30 @@ | |||
39 | /* some helper functions to calculate metrics on the fly */ | 39 | /* some helper functions to calculate metrics on the fly */ |
40 | static int screen_helper_getcharwidth(void) | 40 | static int screen_helper_getcharwidth(void) |
41 | { | 41 | { |
42 | #ifdef HAVE_LCD_BITMAP | ||
43 | return font_get(lcd_getfont())->maxwidth; | 42 | return font_get(lcd_getfont())->maxwidth; |
44 | #else | ||
45 | return 1; | ||
46 | #endif | ||
47 | } | 43 | } |
48 | 44 | ||
49 | static int screen_helper_getcharheight(void) | 45 | static int screen_helper_getcharheight(void) |
50 | { | 46 | { |
51 | #ifdef HAVE_LCD_BITMAP | ||
52 | return font_get(lcd_getfont())->height; | 47 | return font_get(lcd_getfont())->height; |
53 | #else | ||
54 | return 1; | ||
55 | #endif | ||
56 | } | 48 | } |
57 | 49 | ||
58 | static int screen_helper_getnblines(void) | 50 | static int screen_helper_getnblines(void) |
59 | { | 51 | { |
60 | int height=screens[0].lcdheight; | 52 | int height=screens[0].lcdheight; |
61 | #ifdef HAVE_LCD_BITMAP | ||
62 | if(global_settings.statusbar != STATUSBAR_OFF) | 53 | if(global_settings.statusbar != STATUSBAR_OFF) |
63 | height -= STATUSBAR_HEIGHT; | 54 | height -= STATUSBAR_HEIGHT; |
64 | #endif | ||
65 | return height / screens[0].getcharheight(); | 55 | return height / screens[0].getcharheight(); |
66 | } | 56 | } |
67 | 57 | ||
68 | void screen_helper_setfont(int font) | 58 | void screen_helper_setfont(int font) |
69 | { | 59 | { |
70 | (void)font; | 60 | (void)font; |
71 | #ifdef HAVE_LCD_BITMAP | ||
72 | if (font == FONT_UI) | 61 | if (font == FONT_UI) |
73 | font = global_status.font_id[SCREEN_MAIN]; | 62 | font = global_status.font_id[SCREEN_MAIN]; |
74 | lcd_setfont(font); | 63 | lcd_setfont(font); |
75 | #endif | ||
76 | } | 64 | } |
77 | 65 | ||
78 | #ifdef HAVE_LCD_BITMAP | ||
79 | static int screen_helper_getuifont(void) | 66 | static int screen_helper_getuifont(void) |
80 | { | 67 | { |
81 | return global_status.font_id[SCREEN_MAIN]; | 68 | return global_status.font_id[SCREEN_MAIN]; |
@@ -85,15 +72,10 @@ static void screen_helper_setuifont(int font) | |||
85 | { | 72 | { |
86 | global_status.font_id[SCREEN_MAIN] = font; | 73 | global_status.font_id[SCREEN_MAIN] = font; |
87 | } | 74 | } |
88 | #endif | ||
89 | 75 | ||
90 | static void screen_helper_set_drawmode(int mode) | 76 | static void screen_helper_set_drawmode(int mode) |
91 | { | 77 | { |
92 | #ifdef HAVE_LCD_BITMAP | ||
93 | lcd_set_drawmode(mode); | 78 | lcd_set_drawmode(mode); |
94 | #else | ||
95 | (void) mode; | ||
96 | #endif | ||
97 | } | 79 | } |
98 | 80 | ||
99 | static void screen_helper_put_line(int x, int y, struct line_desc *line, | 81 | static void screen_helper_put_line(int x, int y, struct line_desc *line, |
@@ -108,29 +90,19 @@ static void screen_helper_put_line(int x, int y, struct line_desc *line, | |||
108 | #if NB_SCREENS == 2 | 90 | #if NB_SCREENS == 2 |
109 | static int screen_helper_remote_getcharwidth(void) | 91 | static int screen_helper_remote_getcharwidth(void) |
110 | { | 92 | { |
111 | #ifdef HAVE_LCD_BITMAP | ||
112 | return font_get(lcd_remote_getfont())->maxwidth; | 93 | return font_get(lcd_remote_getfont())->maxwidth; |
113 | #else | ||
114 | return 1; | ||
115 | #endif | ||
116 | } | 94 | } |
117 | 95 | ||
118 | static int screen_helper_remote_getcharheight(void) | 96 | static int screen_helper_remote_getcharheight(void) |
119 | { | 97 | { |
120 | #ifdef HAVE_LCD_BITMAP | ||
121 | return font_get(lcd_remote_getfont())->height; | 98 | return font_get(lcd_remote_getfont())->height; |
122 | #else | ||
123 | return 1; | ||
124 | #endif | ||
125 | } | 99 | } |
126 | 100 | ||
127 | static int screen_helper_remote_getnblines(void) | 101 | static int screen_helper_remote_getnblines(void) |
128 | { | 102 | { |
129 | int height=screens[1].lcdheight; | 103 | int height=screens[1].lcdheight; |
130 | #ifdef HAVE_LCD_BITMAP | ||
131 | if(global_settings.statusbar != STATUSBAR_OFF) | 104 | if(global_settings.statusbar != STATUSBAR_OFF) |
132 | height -= STATUSBAR_HEIGHT; | 105 | height -= STATUSBAR_HEIGHT; |
133 | #endif | ||
134 | return height / screens[1].getcharheight(); | 106 | return height / screens[1].getcharheight(); |
135 | } | 107 | } |
136 | 108 | ||
@@ -143,18 +115,12 @@ void screen_helper_remote_setfont(int font) | |||
143 | 115 | ||
144 | static int screen_helper_remote_getuifont(void) | 116 | static int screen_helper_remote_getuifont(void) |
145 | { | 117 | { |
146 | #ifdef HAVE_LCD_BITMAP | ||
147 | return global_status.font_id[SCREEN_REMOTE]; | 118 | return global_status.font_id[SCREEN_REMOTE]; |
148 | #else | ||
149 | return FONT_SYSFIXED; | ||
150 | #endif | ||
151 | } | 119 | } |
152 | 120 | ||
153 | static void screen_helper_remote_setuifont(int font) | 121 | static void screen_helper_remote_setuifont(int font) |
154 | { | 122 | { |
155 | #ifdef HAVE_LCD_BITMAP | ||
156 | global_status.font_id[SCREEN_REMOTE] = font; | 123 | global_status.font_id[SCREEN_REMOTE] = font; |
157 | #endif | ||
158 | } | 124 | } |
159 | 125 | ||
160 | static void screen_helper_remote_put_line(int x, int y, struct line_desc *line, | 126 | static void screen_helper_remote_put_line(int x, int y, struct line_desc *line, |
@@ -181,9 +147,7 @@ struct screen screens[NB_SCREENS] = | |||
181 | #else | 147 | #else |
182 | .is_color=false, | 148 | .is_color=false, |
183 | #endif | 149 | #endif |
184 | #ifdef HAVE_LCD_BITMAP | ||
185 | .pixel_format=LCD_PIXELFORMAT, | 150 | .pixel_format=LCD_PIXELFORMAT, |
186 | #endif | ||
187 | .getcharwidth=screen_helper_getcharwidth, | 151 | .getcharwidth=screen_helper_getcharwidth, |
188 | .getcharheight=screen_helper_getcharheight, | 152 | .getcharheight=screen_helper_getcharheight, |
189 | #if (CONFIG_LED == LED_VIRTUAL) | 153 | #if (CONFIG_LED == LED_VIRTUAL) |
@@ -196,7 +160,6 @@ struct screen screens[NB_SCREENS] = | |||
196 | .getwidth=&lcd_getwidth, | 160 | .getwidth=&lcd_getwidth, |
197 | .getheight=&lcd_getheight, | 161 | .getheight=&lcd_getheight, |
198 | .getstringsize=&lcd_getstringsize, | 162 | .getstringsize=&lcd_getstringsize, |
199 | #ifdef HAVE_LCD_BITMAP | ||
200 | .setfont=screen_helper_setfont, | 163 | .setfont=screen_helper_setfont, |
201 | .getuifont=screen_helper_getuifont, | 164 | .getuifont=screen_helper_getuifont, |
202 | .setuifont=screen_helper_setuifont, | 165 | .setuifont=screen_helper_setuifont, |
@@ -235,7 +198,6 @@ struct screen screens[NB_SCREENS] = | |||
235 | .vline=&lcd_vline, | 198 | .vline=&lcd_vline, |
236 | .hline=&lcd_hline, | 199 | .hline=&lcd_hline, |
237 | .scroll_step=&lcd_scroll_step, | 200 | .scroll_step=&lcd_scroll_step, |
238 | #endif /* HAVE_LCD_BITMAP */ | ||
239 | 201 | ||
240 | .putsxy=&lcd_putsxy, | 202 | .putsxy=&lcd_putsxy, |
241 | .puts=&lcd_puts, | 203 | .puts=&lcd_puts, |
@@ -259,13 +221,11 @@ struct screen screens[NB_SCREENS] = | |||
259 | .backdrop_load=&backdrop_load, | 221 | .backdrop_load=&backdrop_load, |
260 | .backdrop_show=&backdrop_show, | 222 | .backdrop_show=&backdrop_show, |
261 | #endif | 223 | #endif |
262 | #if defined(HAVE_LCD_BITMAP) | ||
263 | .set_framebuffer = (void*)lcd_set_framebuffer, | 224 | .set_framebuffer = (void*)lcd_set_framebuffer, |
264 | #if defined(HAVE_LCD_COLOR) | 225 | #if defined(HAVE_LCD_COLOR) |
265 | .gradient_fillrect = lcd_gradient_fillrect, | 226 | .gradient_fillrect = lcd_gradient_fillrect, |
266 | .gradient_fillrect_part = lcd_gradient_fillrect_part, | 227 | .gradient_fillrect_part = lcd_gradient_fillrect_part, |
267 | #endif | 228 | #endif |
268 | #endif | ||
269 | .put_line = screen_helper_put_line, | 229 | .put_line = screen_helper_put_line, |
270 | }, | 230 | }, |
271 | #if NB_SCREENS == 2 | 231 | #if NB_SCREENS == 2 |
@@ -347,15 +307,12 @@ struct screen screens[NB_SCREENS] = | |||
347 | .backdrop_load=&remote_backdrop_load, | 307 | .backdrop_load=&remote_backdrop_load, |
348 | .backdrop_show=&remote_backdrop_show, | 308 | .backdrop_show=&remote_backdrop_show, |
349 | #endif | 309 | #endif |
350 | #if defined(HAVE_LCD_BITMAP) | ||
351 | .set_framebuffer = (void*)lcd_remote_set_framebuffer, | 310 | .set_framebuffer = (void*)lcd_remote_set_framebuffer, |
352 | #endif | ||
353 | .put_line = screen_helper_remote_put_line, | 311 | .put_line = screen_helper_remote_put_line, |
354 | } | 312 | } |
355 | #endif /* NB_SCREENS == 2 */ | 313 | #endif /* NB_SCREENS == 2 */ |
356 | }; | 314 | }; |
357 | 315 | ||
358 | #ifdef HAVE_LCD_BITMAP | ||
359 | void screen_clear_area(struct screen * display, int xstart, int ystart, | 316 | void screen_clear_area(struct screen * display, int xstart, int ystart, |
360 | int width, int height) | 317 | int width, int height) |
361 | { | 318 | { |
@@ -363,4 +320,3 @@ void screen_clear_area(struct screen * display, int xstart, int ystart, | |||
363 | display->fillrect(xstart, ystart, width, height); | 320 | display->fillrect(xstart, ystart, width, height); |
364 | display->set_drawmode(DRMODE_SOLID); | 321 | display->set_drawmode(DRMODE_SOLID); |
365 | } | 322 | } |
366 | #endif | ||