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/yesno.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/yesno.c')
-rw-r--r-- | apps/gui/yesno.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 1a1645047a..d70b66f230 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -78,8 +78,9 @@ static void gui_yesno_draw(struct gui_yesno * yn) | |||
78 | struct screen * display=yn->display; | 78 | struct screen * display=yn->display; |
79 | struct viewport *vp = yn->vp; | 79 | struct viewport *vp = yn->vp; |
80 | int nb_lines, vp_lines, line_shift=0; | 80 | int nb_lines, vp_lines, line_shift=0; |
81 | struct viewport *last_vp; | ||
81 | 82 | ||
82 | display->set_viewport(vp); | 83 | last_vp = display->set_viewport(vp); |
83 | display->clear_viewport(); | 84 | display->clear_viewport(); |
84 | nb_lines = yn->main_message->nb_lines; | 85 | nb_lines = yn->main_message->nb_lines; |
85 | vp_lines = viewport_get_nb_lines(vp); | 86 | vp_lines = viewport_get_nb_lines(vp); |
@@ -116,7 +117,7 @@ static void gui_yesno_draw(struct gui_yesno * yn) | |||
116 | } | 117 | } |
117 | #endif | 118 | #endif |
118 | display->update_viewport(); | 119 | display->update_viewport(); |
119 | display->set_viewport(NULL); | 120 | display->set_viewport(last_vp); |
120 | } | 121 | } |
121 | 122 | ||
122 | /* | 123 | /* |
@@ -133,11 +134,11 @@ static bool gui_yesno_draw_result(struct gui_yesno * yn, enum yesno_res result) | |||
133 | struct screen * display=yn->display; | 134 | struct screen * display=yn->display; |
134 | if(message==NULL) | 135 | if(message==NULL) |
135 | return false; | 136 | return false; |
136 | display->set_viewport(vp); | 137 | struct viewport *last_vp = display->set_viewport(vp); |
137 | display->clear_viewport(); | 138 | display->clear_viewport(); |
138 | put_message(yn->display, message, 0, viewport_get_nb_lines(vp)); | 139 | put_message(yn->display, message, 0, viewport_get_nb_lines(vp)); |
139 | display->update_viewport(); | 140 | display->update_viewport(); |
140 | display->set_viewport(NULL); | 141 | display->set_viewport(last_vp); |
141 | return(true); | 142 | return(true); |
142 | } | 143 | } |
143 | 144 | ||