diff options
Diffstat (limited to 'apps/gui/viewport.c')
-rw-r--r-- | apps/gui/viewport.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index fad3255cdb..db58b5d72d 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -54,9 +54,7 @@ | |||
54 | #include "statusbar.h" | 54 | #include "statusbar.h" |
55 | #include "appevents.h" | 55 | #include "appevents.h" |
56 | #include "panic.h" | 56 | #include "panic.h" |
57 | #ifdef HAVE_LCD_BITMAP | ||
58 | #include "language.h" | 57 | #include "language.h" |
59 | #endif | ||
60 | #include "statusbar-skinned.h" | 58 | #include "statusbar-skinned.h" |
61 | #include "skin_engine/skin_engine.h" | 59 | #include "skin_engine/skin_engine.h" |
62 | #include "debug.h" | 60 | #include "debug.h" |
@@ -68,7 +66,6 @@ struct viewport_stack_item | |||
68 | bool enabled; | 66 | bool enabled; |
69 | }; | 67 | }; |
70 | 68 | ||
71 | #ifdef HAVE_LCD_BITMAP | ||
72 | static void viewportmanager_redraw(unsigned short id, void* data); | 69 | static void viewportmanager_redraw(unsigned short id, void* data); |
73 | 70 | ||
74 | static int theme_stack_top[NB_SCREENS]; /* the last item added */ | 71 | static int theme_stack_top[NB_SCREENS]; /* the last item added */ |
@@ -218,16 +215,10 @@ static bool is_theme_enabled(enum screen_type screen) | |||
218 | int top = theme_stack_top[screen]; | 215 | int top = theme_stack_top[screen]; |
219 | return theme_stack[screen][top].enabled; | 216 | return theme_stack[screen][top].enabled; |
220 | } | 217 | } |
221 | #endif /* HAVE_LCD_BITMAP */ | ||
222 | 218 | ||
223 | int viewport_get_nb_lines(const struct viewport *vp) | 219 | int viewport_get_nb_lines(const struct viewport *vp) |
224 | { | 220 | { |
225 | #ifdef HAVE_LCD_BITMAP | ||
226 | return vp->height/font_get(vp->font)->height; | 221 | return vp->height/font_get(vp->font)->height; |
227 | #else | ||
228 | (void)vp; | ||
229 | return 2; | ||
230 | #endif | ||
231 | } | 222 | } |
232 | 223 | ||
233 | static void viewportmanager_redraw(unsigned short id, void* data) | 224 | static void viewportmanager_redraw(unsigned short id, void* data) |
@@ -235,31 +226,21 @@ static void viewportmanager_redraw(unsigned short id, void* data) | |||
235 | (void)id; | 226 | (void)id; |
236 | FOR_NB_SCREENS(i) | 227 | FOR_NB_SCREENS(i) |
237 | { | 228 | { |
238 | #ifdef HAVE_LCD_BITMAP | ||
239 | if (is_theme_enabled(i)) | 229 | if (is_theme_enabled(i)) |
240 | sb_skin_update(i, NULL != data); | 230 | sb_skin_update(i, NULL != data); |
241 | #else | ||
242 | (void)data; | ||
243 | gui_statusbar_draw(&statusbars.statusbars[i], NULL, NULL); | ||
244 | #endif | ||
245 | } | 231 | } |
246 | } | 232 | } |
247 | 233 | ||
248 | void viewportmanager_init() | 234 | void viewportmanager_init() |
249 | { | 235 | { |
250 | #ifdef HAVE_LCD_BITMAP | ||
251 | FOR_NB_SCREENS(i) | 236 | FOR_NB_SCREENS(i) |
252 | { | 237 | { |
253 | theme_stack_top[i] = -1; /* the next call fixes this to 0 */ | 238 | theme_stack_top[i] = -1; /* the next call fixes this to 0 */ |
254 | /* We always want the theme enabled by default... */ | 239 | /* We always want the theme enabled by default... */ |
255 | viewportmanager_theme_enable(i, true, NULL); | 240 | viewportmanager_theme_enable(i, true, NULL); |
256 | } | 241 | } |
257 | #else | ||
258 | add_event(GUI_EVENT_ACTIONUPDATE, viewportmanager_redraw); | ||
259 | #endif | ||
260 | } | 242 | } |
261 | 243 | ||
262 | #ifdef HAVE_LCD_BITMAP | ||
263 | void viewportmanager_theme_changed(const int which) | 244 | void viewportmanager_theme_changed(const int which) |
264 | { | 245 | { |
265 | if (which & THEME_LANGUAGE) | 246 | if (which & THEME_LANGUAGE) |
@@ -296,7 +277,6 @@ static void set_default_align_flags(struct viewport *vp) | |||
296 | vp->flags |= VP_FLAG_ALIGN_RIGHT; | 277 | vp->flags |= VP_FLAG_ALIGN_RIGHT; |
297 | } | 278 | } |
298 | 279 | ||
299 | #endif /* HAVE_LCD_BITMAP */ | ||
300 | #endif /* __PCTOOL__ */ | 280 | #endif /* __PCTOOL__ */ |
301 | 281 | ||
302 | void viewport_set_fullscreen(struct viewport *vp, | 282 | void viewport_set_fullscreen(struct viewport *vp, |
@@ -307,7 +287,6 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
307 | vp->width = screens[screen].lcdwidth; | 287 | vp->width = screens[screen].lcdwidth; |
308 | vp->height = screens[screen].lcdheight; | 288 | vp->height = screens[screen].lcdheight; |
309 | 289 | ||
310 | #ifdef HAVE_LCD_BITMAP | ||
311 | #ifndef __PCTOOL__ | 290 | #ifndef __PCTOOL__ |
312 | set_default_align_flags(vp); | 291 | set_default_align_flags(vp); |
313 | #endif | 292 | #endif |
@@ -331,13 +310,12 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
331 | vp->bg_pattern = LCD_REMOTE_DEFAULT_BG; | 310 | vp->bg_pattern = LCD_REMOTE_DEFAULT_BG; |
332 | } | 311 | } |
333 | #endif | 312 | #endif |
334 | #endif | ||
335 | } | 313 | } |
336 | 314 | ||
337 | void viewport_set_defaults(struct viewport *vp, | 315 | void viewport_set_defaults(struct viewport *vp, |
338 | const enum screen_type screen) | 316 | const enum screen_type screen) |
339 | { | 317 | { |
340 | #if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__) | 318 | #if !defined(__PCTOOL__) |
341 | struct viewport *sbs_area = NULL; | 319 | struct viewport *sbs_area = NULL; |
342 | if (!is_theme_enabled(screen)) | 320 | if (!is_theme_enabled(screen)) |
343 | { | 321 | { |
@@ -349,13 +327,11 @@ void viewport_set_defaults(struct viewport *vp, | |||
349 | if (sbs_area) | 327 | if (sbs_area) |
350 | *vp = *sbs_area; | 328 | *vp = *sbs_area; |
351 | else | 329 | else |
352 | #endif /* HAVE_LCD_BITMAP */ | 330 | #endif /* !__PCTOOL__ */ |
353 | viewport_set_fullscreen(vp, screen); | 331 | viewport_set_fullscreen(vp, screen); |
354 | } | 332 | } |
355 | 333 | ||
356 | 334 | ||
357 | #ifdef HAVE_LCD_BITMAP | ||
358 | |||
359 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour) | 335 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour) |
360 | { | 336 | { |
361 | (void)screen; (void)fgcolour; | 337 | (void)screen; (void)fgcolour; |
@@ -392,5 +368,3 @@ int get_viewport_default_colour(enum screen_type screen, bool fgcolour) | |||
392 | return 0; | 368 | return 0; |
393 | #endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */ | 369 | #endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */ |
394 | } | 370 | } |
395 | |||
396 | #endif | ||