From 3237ae4a4ff9296a377ff9194a11038da161208f Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Wed, 7 Oct 2020 02:01:35 -0400 Subject: LCD core move buf ptr and address look up function viewport struct I'm currently running up against the limitations of the lcd_draw functions I want these functions to be able to be used on any size buffer not just buffers with a stride matching the underlying device [DONE] allow the framebuffer to be decoupled from the device framebuffer [DONE need examples] allow for some simple blit like transformations [DONE] remove the device framebuffer from the plugin api [DONE}ditto remote framebuffer [DONE] remove _viewport_get_framebuffer you can call struct *vp = lcd_set_viewport(NULL) and vp->buffer->fb_ptr while remote lcds may compile (and work in the sim) its not been tested on targets [FIXED] backdrops need work to be screen agnostic [FIXED] screen statusbar is not being combined into the main viewport correctly yet [FIXED] screen elements are displayed incorrectly after switch to void* [FIXED] core didn't restore proper viewport on splash etc. [NEEDS TESTING] remote lcd garbled data [FIXED] osd lib garbled screen on bmp_part [FIXED] grey_set_vp needs to return old viewport like lcd_set_viewport [FIXED] Viewport update now handles viewports with differing buffers/strides by copying to the main buffer [FIXED] splash on top of WPS leaves old framebuffer data (doesn't redraw) [UPDATE] refined this a bit more to have clear_viewport set the clean bit and have skin_render do its own screen clear scrolling viewports no longer trigger wps refresh also fixed a bug where guisyncyesno was displaying and then disappearing [ADDED!] New LCD macros that allow you to create properly size frame buffers in you desired size without wasting bytes (LCD_ and LCD_REMOTE_) LCD_STRIDE(w, h) same as STRIDE_MAIN LCD_FBSTRIDE(w, h) returns target specific stride for a buffer W x H LCD_NBELEMS(w, h) returns the number of fb_data sized elemenst needed for a buffer W x H LCD_NATIVE_STRIDE(s) conversion between rockbox native vertical and lcd native stride (2bitH) test_viewports.c has an example of usage [FIXED!!] 2bit targets don't respect non-native strides [FIXED] Few define snags Change-Id: I0d04c3834e464eca84a5a715743a297a0cefd0af --- apps/gui/skin_engine/skin_backdrops.c | 25 +++++++++++++++---- apps/gui/skin_engine/skin_engine.c | 6 ++++- apps/gui/skin_engine/skin_engine.h | 2 +- apps/gui/skin_engine/skin_parser.c | 8 +++---- apps/gui/skin_engine/skin_render.c | 45 +++++++++++++++++++++++------------ apps/gui/skin_engine/wps_internals.h | 1 + 6 files changed, 62 insertions(+), 25 deletions(-) (limited to 'apps/gui/skin_engine') diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c index 243fc30a3a..caf705af54 100644 --- a/apps/gui/skin_engine/skin_backdrops.c +++ b/apps/gui/skin_engine/skin_backdrops.c @@ -204,11 +204,28 @@ bool skin_backdrops_preload(void) return retval; } -void* skin_backdrop_get_buffer(int backdrop_id) +void skin_backdrop_set_buffer(int backdrop_id, struct skin_viewport *svp) { - if (backdrop_id < 0) - return NULL; - return backdrops[backdrop_id].buffer; + if (UNLIKELY(!svp)) + return; + else if (backdrop_id < 0) + { + svp->vp.buffer = NULL; /*Default*/ + return; + } + + enum screen_type screen = backdrops[backdrop_id].screen; + svp->framebuf.ch_ptr = backdrops[backdrop_id].buffer; +#if defined(HAVE_REMOTE_LCD) + if (screen == SCREEN_REMOTE) + svp->framebuf.elems = REMOTE_LCD_BACKDROP_BYTES / sizeof(fb_remote_data); + else +#endif + { + svp->framebuf.elems = LCD_BACKDROP_BYTES / sizeof(fb_data); + } + svp->framebuf.get_address_fn = NULL; /*Default iterator*/ + screens[screen].viewport_set_buffer(&svp->vp, &svp->framebuf); } void skin_backdrop_show(int backdrop_id) diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index cd763def1c..049629b181 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c @@ -312,7 +312,11 @@ struct wps_state *skin_get_global_state(void) bool skin_do_full_update(enum skinnable_screens skin, enum screen_type screen) { - bool ret = skins[skin][screen].needs_full_update; + struct viewport *vp = *(screens[screen].current_viewport); + + bool vp_is_dirty = ((vp->flags & VP_FLAG_VP_SET_CLEAN) == VP_FLAG_VP_DIRTY); + + bool ret = (skins[skin][screen].needs_full_update || vp_is_dirty); skins[skin][screen].needs_full_update = false; return ret; } diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h index 55839608be..3b757a5f8b 100644 --- a/apps/gui/skin_engine/skin_engine.h +++ b/apps/gui/skin_engine/skin_engine.h @@ -70,7 +70,7 @@ void skin_backdrop_show(int backdrop_id); void skin_backdrop_load_setting(void); void skin_backdrop_unload(int backdrop_id); #define BACKDROP_BUFFERNAME "#backdrop_buffer#" -void* skin_backdrop_get_buffer(int backdrop_id); +void skin_backdrop_set_buffer(int backdrop_id, struct skin_viewport *svp); /* do the button loop as often as required for the peak meters to update * with a good refresh rate. diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index f3a23377ef..e1a8118190 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -259,7 +259,7 @@ static int parse_statusbar_tags(struct skin_element* element, } else { - struct skin_viewport *default_vp = SKINOFFSETTOPTR(skin_buffer, first_viewport->data); + struct skin_viewport *skin_default = SKINOFFSETTOPTR(skin_buffer, first_viewport->data); if (first_viewport->params_count == 0) { wps_data->wps_sb_tag = true; @@ -267,11 +267,11 @@ static int parse_statusbar_tags(struct skin_element* element, } if (wps_data->show_sb_on_wps) { - viewport_set_defaults(&default_vp->vp, curr_screen); + viewport_set_defaults(&skin_default->vp, curr_screen); } else { - viewport_set_fullscreen(&default_vp->vp, curr_screen); + viewport_set_fullscreen(&skin_default->vp, curr_screen); } #ifdef HAVE_REMOTE_LCD /* This parser requires viewports which will use the settings font to @@ -279,7 +279,7 @@ static int parse_statusbar_tags(struct skin_element* element, * the current real font id. So force 1 here it will be set correctly * at the end */ - default_vp->vp.font = 1; + skin_default->vp.font = 1; #endif } return 0; diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index 51c58fc196..00981f5b67 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c @@ -349,6 +349,8 @@ static void do_tags_in_hidden_conditional(struct skin_element* branch, { struct gui_wps *gwps = info->gwps; struct wps_data *data = gwps->data; + struct viewport *last_vp; + /* Tags here are ones which need to be "turned off" or cleared * if they are in a conditional branch which isnt being used */ if (branch->type == LINE_ALTERNATOR) @@ -420,22 +422,23 @@ static void do_tags_in_hidden_conditional(struct skin_element* branch, #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) if (skin_viewport->output_to_backdrop_buffer) { - void *backdrop = skin_backdrop_get_buffer(data->backdrop_id); - gwps->display->set_framebuffer(backdrop); + skin_backdrop_set_buffer(data->backdrop_id, skin_viewport); skin_backdrop_show(-1); } #endif - gwps->display->set_viewport(&skin_viewport->vp); + last_vp = gwps->display->set_viewport(&skin_viewport->vp); gwps->display->clear_viewport(); - gwps->display->set_viewport(&info->skin_vp->vp); + gwps->display->set_viewport_ex(&info->skin_vp->vp, 0); skin_viewport->hidden_flags |= VP_DRAW_HIDDEN; #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) if (skin_viewport->output_to_backdrop_buffer) { - gwps->display->set_framebuffer(NULL); + gwps->display->set_viewport_ex(last_vp, 0); skin_backdrop_show(data->backdrop_id); } +#else + (void)last_vp; #endif } } @@ -792,6 +795,7 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, void skin_render(struct gui_wps *gwps, unsigned refresh_mode) { + const int vp_is_appearing = (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE); struct wps_data *data = gwps->data; struct screen *display = gwps->display; @@ -801,7 +805,20 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) int old_refresh_mode = refresh_mode; skin_buffer = get_skin_buffer(gwps->data); - + + struct viewport* first_vp; + /* should already be the default buffer */ + first_vp = display->set_viewport(NULL); + + /* Framebuffer is likely dirty */ + if ((refresh_mode&SKIN_REFRESH_ALL) == SKIN_REFRESH_ALL) + { + if ((first_vp->flags & VP_FLAG_VP_SET_CLEAN) == VP_FLAG_VP_DIRTY && + get_current_activity() == ACTIVITY_WPS) /* only clear if in WPS */ + { + display->clear_viewport(); + } + } viewport = SKINOFFSETTOPTR(skin_buffer, data->tree); skin_viewport = SKINOFFSETTOPTR(skin_buffer, viewport->data); @@ -822,12 +839,12 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) if (skin_viewport->output_to_backdrop_buffer) { - display->set_framebuffer(skin_backdrop_get_buffer(data->backdrop_id)); + skin_backdrop_set_buffer(data->backdrop_id, skin_viewport); skin_backdrop_show(-1); } else { - display->set_framebuffer(NULL); + skin_backdrop_set_buffer(-1, skin_viewport); skin_backdrop_show(data->backdrop_id); } #endif @@ -842,15 +859,14 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) skin_viewport->hidden_flags |= VP_DRAW_WASHIDDEN; continue; } - else if (((skin_viewport->hidden_flags& - (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE)) - == (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE))) + else if ((skin_viewport->hidden_flags & vp_is_appearing) == vp_is_appearing) { vp_refresh_mode = SKIN_REFRESH_ALL; skin_viewport->hidden_flags = VP_DRAW_HIDEABLE; } - display->set_viewport(&skin_viewport->vp); + display->set_viewport_ex(&skin_viewport->vp, VP_FLAG_VP_SET_CLEAN); + if ((vp_refresh_mode&SKIN_REFRESH_ALL) == SKIN_REFRESH_ALL) { display->clear_viewport(); @@ -862,7 +878,6 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) refresh_mode = old_refresh_mode; } #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) - display->set_framebuffer(NULL); skin_backdrop_show(data->backdrop_id); #endif @@ -872,8 +887,8 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) * to redraw itself */ send_event(GUI_EVENT_NEED_UI_UPDATE, NULL); } - /* Restore the default viewport */ - display->set_viewport(NULL); + /* Restore the first viewport */ + display->set_viewport_ex(first_vp, VP_FLAG_VP_SET_CLEAN); display->update(); } diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index b7d7ff35d0..bf7f52bdbf 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -175,6 +175,7 @@ struct gradient_config { #define VP_DEFAULT_LABEL_STRING "|" struct skin_viewport { struct viewport vp; /* The LCD viewport struct */ + struct frame_buffer_t framebuf; char hidden_flags; bool is_infovp; OFFSETTYPE(char*) label; -- cgit v1.2.3