From 945c8a221ade41c462a93f8452320a806e5645b3 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Mon, 7 Jan 2008 20:34:11 +0000 Subject: Add viewport capabilities to all the LCD drivers, and adapt scrolling code. This is the firmware/ part of FS#8385 - the changes to the WPS code still need more work and will be committed at a later date. NOTE: There are no user-visible changes with this commit - just the infrastructure. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16018 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/scroll_engine.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'firmware/export/scroll_engine.h') diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 5e39990129..48d5c5cb8c 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h @@ -23,9 +23,17 @@ #ifndef __SCROLL_ENGINE_H__ #define __SCROLL_ENGINE_H__ +#include + void scroll_init(void); +void lcd_scroll_stop(struct viewport* vp); +void lcd_scroll_stop_line(struct viewport* vp, int y); void lcd_scroll_fn(void); +#ifdef HAVE_REMOTE_LCD void lcd_remote_scroll_fn(void); +void lcd_remote_scroll_stop(struct viewport* vp); +void lcd_remote_scroll_stop_line(struct viewport* vp, int y); +#endif /* internal usage, but in multiple drivers */ #define SCROLL_SPACING 3 @@ -37,8 +45,10 @@ void lcd_remote_scroll_fn(void); struct scrollinfo { + struct viewport* vp; char line[SCROLL_LINE_SIZE]; int len; /* length of line in chars */ + int y; /* Position of the line on the screen (char co-ordinates) */ int offset; int startx; #ifdef HAVE_LCD_BITMAP @@ -54,7 +64,7 @@ struct scroll_screen_info { struct scrollinfo * const scroll; const int num_scroll; /* number of scrollable lines (also number of scroll structs) */ - int lines; /* Bitpattern of which lines are scrolling */ + int lines; /* Number of currently scrolling lines */ long ticks; /* # of ticks between updates*/ long delay; /* ticks delay before start */ int bidir_limit; /* percent */ @@ -74,7 +84,7 @@ struct scroll_screen_info #ifdef HAVE_LCD_BITMAP #define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32) #else -#define LCD_SCROLLABLE_LINES LCD_HEIGHT +#define LCD_SCROLLABLE_LINES LCD_HEIGHT * 2 #endif extern struct scroll_screen_info lcd_scroll_info; -- cgit v1.2.3