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/plugin.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'apps/plugin.c') diff --git a/apps/plugin.c b/apps/plugin.c index 48f9dac487..4a50c2b3a3 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -194,9 +194,7 @@ static const struct plugin_api rockbox_api = { lcd_putsf, lcd_puts_scroll, lcd_scroll_stop, - &lcd_framebuffer, lcd_set_viewport, - lcd_set_framebuffer, lcd_bmp_part, lcd_update_rect, lcd_set_drawmode, @@ -281,7 +279,6 @@ static const struct plugin_api rockbox_api = { lcd_remote_mono_bitmap_part, lcd_remote_mono_bitmap, lcd_remote_putsxy, - &lcd_remote_framebuffer; lcd_remote_update, lcd_remote_update_rect, #if (LCD_REMOTE_DEPTH > 1) @@ -303,6 +300,7 @@ static const struct plugin_api rockbox_api = { viewportmanager_theme_enable, viewportmanager_theme_undo, viewport_set_fullscreen, + viewport_set_buffer, #ifdef HAVE_BACKLIGHT /* lcd backlight */ @@ -869,11 +867,12 @@ int plugin_load(const char* plugin, const void* parameter) #endif *(p_hdr->api) = &rockbox_api; - + lcd_set_viewport(NULL); lcd_clear_display(); lcd_update(); #ifdef HAVE_REMOTE_LCD + lcd_remote_set_viewport(NULL); lcd_remote_clear_display(); lcd_remote_update(); #endif @@ -914,7 +913,8 @@ int plugin_load(const char* plugin, const void* parameter) #ifdef HAVE_TOUCHSCREEN touchscreen_set_mode(global_settings.touch_mode); #endif - + /* restore default vp */ + lcd_set_viewport(NULL); screen_helper_setfont(FONT_UI); #if LCD_DEPTH > 1 #ifdef HAVE_LCD_COLOR @@ -928,6 +928,8 @@ int plugin_load(const char* plugin, const void* parameter) #endif /* LCD_DEPTH */ #ifdef HAVE_REMOTE_LCD + lcd_remote_set_viewport(NULL); + #if LCD_REMOTE_DEPTH > 1 lcd_remote_set_drawinfo(DRMODE_SOLID, LCD_REMOTE_DEFAULT_FG, LCD_REMOTE_DEFAULT_BG); -- cgit v1.2.3