diff options
author | William Wilgus <wilgus.william@gmail.com> | 2020-10-07 02:01:35 -0400 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2020-10-26 12:28:48 -0400 |
commit | 3237ae4a4ff9296a377ff9194a11038da161208f (patch) | |
tree | af4338c78467b9b0845d76c39da1fbe10f25e23e /apps/screens.c | |
parent | 12f3ed1699d6bef25bed90ba95cbcc1a6bb4934a (diff) | |
download | rockbox-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/screens.c')
-rw-r--r-- | apps/screens.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/screens.c b/apps/screens.c index 020d0a3021..fde99912d5 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -207,12 +207,13 @@ bool set_time_screen(const char* title, struct tm *tm) | |||
207 | /* 6 possible cursor possitions, 2 values stored for each: x, y */ | 207 | /* 6 possible cursor possitions, 2 values stored for each: x, y */ |
208 | unsigned int cursor[6][2]; | 208 | unsigned int cursor[6][2]; |
209 | struct viewport *vp = &viewports[s]; | 209 | struct viewport *vp = &viewports[s]; |
210 | struct viewport *last_vp; | ||
210 | struct screen *screen = &screens[s]; | 211 | struct screen *screen = &screens[s]; |
211 | static unsigned char rtl_idx[] = | 212 | static unsigned char rtl_idx[] = |
212 | { IDX_SECONDS, IDX_MINUTES, IDX_HOURS, IDX_DAY, IDX_MONTH, IDX_YEAR }; | 213 | { IDX_SECONDS, IDX_MINUTES, IDX_HOURS, IDX_DAY, IDX_MONTH, IDX_YEAR }; |
213 | 214 | ||
214 | viewport_set_defaults(vp, s); | 215 | viewport_set_defaults(vp, s); |
215 | screen->set_viewport(vp); | 216 | last_vp = screen->set_viewport(vp); |
216 | nb_lines = viewport_get_nb_lines(vp); | 217 | nb_lines = viewport_get_nb_lines(vp); |
217 | 218 | ||
218 | /* minimum lines needed is 2 + title line */ | 219 | /* minimum lines needed is 2 + title line */ |
@@ -283,7 +284,7 @@ bool set_time_screen(const char* title, struct tm *tm) | |||
283 | if (nb_lines > 5) | 284 | if (nb_lines > 5) |
284 | screen->puts(0, 5, str(LANG_TIME_REVERT)); | 285 | screen->puts(0, 5, str(LANG_TIME_REVERT)); |
285 | screen->update_viewport(); | 286 | screen->update_viewport(); |
286 | screen->set_viewport(NULL); | 287 | screen->set_viewport(last_vp); |
287 | } | 288 | } |
288 | 289 | ||
289 | /* set the most common numbers */ | 290 | /* set the most common numbers */ |