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/plugins/test_viewports.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'apps/plugins/test_viewports.c') diff --git a/apps/plugins/test_viewports.c b/apps/plugins/test_viewports.c index 465a832399..60c6672456 100644 --- a/apps/plugins/test_viewports.c +++ b/apps/plugins/test_viewports.c @@ -35,7 +35,7 @@ static struct viewport vp0 = { .x = 0, .y = 0, - .width = LCD_WIDTH, + .width = LCD_WIDTH/ 2 + LCD_WIDTH / 3, .height = 20, .font = FONT_UI, .drawmode = DRMODE_SOLID, @@ -120,15 +120,37 @@ static struct viewport rvp1 = #endif +static void *test_address_fn(int x, int y) +{ + struct frame_buffer_t *fb = vp0.buffer; + +#if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE + size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; +#else + size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; +#endif + return fb->fb_ptr + (element % fb->elems); +} enum plugin_status plugin_start(const void* parameter) { (void)parameter; char buf[80]; int i,y; + fb_data vp_buffer[LCD_NBELEMS(vp0.width, vp0.height)]; + struct frame_buffer_t fb; + + fb.stride = STRIDE_MAIN(vp0.width, vp0.height); + + fb.fb_ptr = vp_buffer; + fb.elems = LCD_NBELEMS(vp0.width, vp0.height); + fb.get_address_fn = &test_address_fn; + + rb->viewport_set_buffer(&vp0, &fb, SCREEN_MAIN); rb->screens[SCREEN_MAIN]->set_viewport(&vp0); rb->screens[SCREEN_MAIN]->clear_viewport(); + rb->screens[SCREEN_MAIN]->puts_scroll(0,0,"Viewport testing plugin - this is a scrolling title"); rb->screens[SCREEN_MAIN]->set_viewport(&vp1); @@ -192,6 +214,9 @@ enum plugin_status plugin_start(const void* parameter) rb->screens[SCREEN_REMOTE]->update(); #endif + rb->button_clear_queue(); + while(rb->button_get(true) <= BUTTON_NONE) + ;; rb->button_get(true); -- cgit v1.2.3