summaryrefslogtreecommitdiff
path: root/apps/plugins/test_viewports.c
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-10-07 02:01:35 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2020-10-26 12:28:48 -0400
commit3237ae4a4ff9296a377ff9194a11038da161208f (patch)
treeaf4338c78467b9b0845d76c39da1fbe10f25e23e /apps/plugins/test_viewports.c
parent12f3ed1699d6bef25bed90ba95cbcc1a6bb4934a (diff)
downloadrockbox-3237ae4a4ff9296a377ff9194a11038da161208f.tar.gz
rockbox-3237ae4a4ff9296a377ff9194a11038da161208f.zip
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
Diffstat (limited to 'apps/plugins/test_viewports.c')
-rw-r--r--apps/plugins/test_viewports.c27
1 files changed, 26 insertions, 1 deletions
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 =
35{ 35{
36 .x = 0, 36 .x = 0,
37 .y = 0, 37 .y = 0,
38 .width = LCD_WIDTH, 38 .width = LCD_WIDTH/ 2 + LCD_WIDTH / 3,
39 .height = 20, 39 .height = 20,
40 .font = FONT_UI, 40 .font = FONT_UI,
41 .drawmode = DRMODE_SOLID, 41 .drawmode = DRMODE_SOLID,
@@ -120,15 +120,37 @@ static struct viewport rvp1 =
120 120
121#endif 121#endif
122 122
123static void *test_address_fn(int x, int y)
124{
125 struct frame_buffer_t *fb = vp0.buffer;
126
127#if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
128 size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y;
129#else
130 size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x;
131#endif
132 return fb->fb_ptr + (element % fb->elems);
133}
123 134
124enum plugin_status plugin_start(const void* parameter) 135enum plugin_status plugin_start(const void* parameter)
125{ 136{
126 (void)parameter; 137 (void)parameter;
127 char buf[80]; 138 char buf[80];
128 int i,y; 139 int i,y;
140 fb_data vp_buffer[LCD_NBELEMS(vp0.width, vp0.height)];
129 141
142 struct frame_buffer_t fb;
143
144 fb.stride = STRIDE_MAIN(vp0.width, vp0.height);
145
146 fb.fb_ptr = vp_buffer;
147 fb.elems = LCD_NBELEMS(vp0.width, vp0.height);
148 fb.get_address_fn = &test_address_fn;
149
150 rb->viewport_set_buffer(&vp0, &fb, SCREEN_MAIN);
130 rb->screens[SCREEN_MAIN]->set_viewport(&vp0); 151 rb->screens[SCREEN_MAIN]->set_viewport(&vp0);
131 rb->screens[SCREEN_MAIN]->clear_viewport(); 152 rb->screens[SCREEN_MAIN]->clear_viewport();
153
132 rb->screens[SCREEN_MAIN]->puts_scroll(0,0,"Viewport testing plugin - this is a scrolling title"); 154 rb->screens[SCREEN_MAIN]->puts_scroll(0,0,"Viewport testing plugin - this is a scrolling title");
133 155
134 rb->screens[SCREEN_MAIN]->set_viewport(&vp1); 156 rb->screens[SCREEN_MAIN]->set_viewport(&vp1);
@@ -192,6 +214,9 @@ enum plugin_status plugin_start(const void* parameter)
192 214
193 rb->screens[SCREEN_REMOTE]->update(); 215 rb->screens[SCREEN_REMOTE]->update();
194#endif 216#endif
217 rb->button_clear_queue();
218 while(rb->button_get(true) <= BUTTON_NONE)
219 ;;
195 220
196 rb->button_get(true); 221 rb->button_get(true);
197 222