summaryrefslogtreecommitdiff
path: root/firmware/drivers/lcd-scroll.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 /firmware/drivers/lcd-scroll.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 'firmware/drivers/lcd-scroll.c')
-rw-r--r--firmware/drivers/lcd-scroll.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c
index 5d66788093..d8bfd72dde 100644
--- a/firmware/drivers/lcd-scroll.c
+++ b/firmware/drivers/lcd-scroll.c
@@ -156,8 +156,9 @@ bool LCDFN(scroll_now)(struct scrollinfo *s)
156 } 156 }
157 } 157 }
158 158
159 /* Stash and restore these three, so that the scroll_func 159 /* Stash and restore these four, so that the scroll_func
160 * can do whatever it likes without destroying the state */ 160 * can do whatever it likes without destroying the state */
161 struct frame_buffer_t *framebuf = s->vp->buffer;
161 unsigned drawmode; 162 unsigned drawmode;
162#if LCD_DEPTH > 1 163#if LCD_DEPTH > 1
163 unsigned fg_pattern, bg_pattern; 164 unsigned fg_pattern, bg_pattern;
@@ -174,6 +175,7 @@ bool LCDFN(scroll_now)(struct scrollinfo *s)
174 s->vp->bg_pattern = bg_pattern; 175 s->vp->bg_pattern = bg_pattern;
175#endif 176#endif
176 s->vp->drawmode = drawmode; 177 s->vp->drawmode = drawmode;
178 s->vp->buffer = framebuf;
177 179
178 return ended; 180 return ended;
179} 181}
@@ -205,7 +207,7 @@ static void LCDFN(scroll_worker)(void)
205 * be switched early so that lcd_getstringsize() picks the 207 * be switched early so that lcd_getstringsize() picks the
206 * correct font */ 208 * correct font */
207 vp = LCDFN(get_viewport)(&is_default); 209 vp = LCDFN(get_viewport)(&is_default);
208 LCDFN(set_viewport)(s->vp); 210 LCDFN(set_viewport_ex)(s->vp, 0); /* don't mark the last vp as dirty */
209 211
210 makedelay = false; 212 makedelay = false;
211 step = si->step; 213 step = si->step;
@@ -218,7 +220,7 @@ static void LCDFN(scroll_worker)(void)
218 /* put the line onto the display now */ 220 /* put the line onto the display now */
219 makedelay = LCDFN(scroll_now(s)); 221 makedelay = LCDFN(scroll_now(s));
220 222
221 LCDFN(set_viewport)(vp); 223 LCDFN(set_viewport_ex)(vp, 0); /* don't mark the last vp as dirty */
222 224
223 if (makedelay) 225 if (makedelay)
224 s->start_tick += si->delay + si->ticks; 226 s->start_tick += si->delay + si->ticks;