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/gui/skin_engine/skin_parser.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/gui/skin_engine/skin_parser.c')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, | |||
259 | } | 259 | } |
260 | else | 260 | else |
261 | { | 261 | { |
262 | struct skin_viewport *default_vp = SKINOFFSETTOPTR(skin_buffer, first_viewport->data); | 262 | struct skin_viewport *skin_default = SKINOFFSETTOPTR(skin_buffer, first_viewport->data); |
263 | if (first_viewport->params_count == 0) | 263 | if (first_viewport->params_count == 0) |
264 | { | 264 | { |
265 | wps_data->wps_sb_tag = true; | 265 | wps_data->wps_sb_tag = true; |
@@ -267,11 +267,11 @@ static int parse_statusbar_tags(struct skin_element* element, | |||
267 | } | 267 | } |
268 | if (wps_data->show_sb_on_wps) | 268 | if (wps_data->show_sb_on_wps) |
269 | { | 269 | { |
270 | viewport_set_defaults(&default_vp->vp, curr_screen); | 270 | viewport_set_defaults(&skin_default->vp, curr_screen); |
271 | } | 271 | } |
272 | else | 272 | else |
273 | { | 273 | { |
274 | viewport_set_fullscreen(&default_vp->vp, curr_screen); | 274 | viewport_set_fullscreen(&skin_default->vp, curr_screen); |
275 | } | 275 | } |
276 | #ifdef HAVE_REMOTE_LCD | 276 | #ifdef HAVE_REMOTE_LCD |
277 | /* This parser requires viewports which will use the settings font to | 277 | /* This parser requires viewports which will use the settings font to |
@@ -279,7 +279,7 @@ static int parse_statusbar_tags(struct skin_element* element, | |||
279 | * the current real font id. So force 1 here it will be set correctly | 279 | * the current real font id. So force 1 here it will be set correctly |
280 | * at the end | 280 | * at the end |
281 | */ | 281 | */ |
282 | default_vp->vp.font = 1; | 282 | skin_default->vp.font = 1; |
283 | #endif | 283 | #endif |
284 | } | 284 | } |
285 | return 0; | 285 | return 0; |