Horizontal screen scrolling part 3 (by Shachar Liberman)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8414 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 61 insertions, 57 deletions

diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index a28cd2f..3be907a 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -1138,7 +1138,7 @@ void lcd_remote_putsxy(int x, int y, const unsigned char *str)
 /* put a string at a given char position */
 void lcd_remote_puts(int x, int y, const unsigned char *str)
 {
-    lcd_remote_puts_style(x, y, str, STYLE_DEFAULT);
+    lcd_remote_puts_style_offset(x, y, str, STYLE_DEFAULT, 0);
 }
 
 void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style)
@@ -1151,7 +1151,8 @@ void lcd_remote_puts_offset(int x, int y, const unsigned char *str, int offset)
     lcd_remote_puts_style_offset(x, y, str, STYLE_DEFAULT, offset);
 }
 
-/* put a string at a given char position at a given style and with a given offset */
+/* put a string at a given char position, style, and pixel position,
+ * skipping first offset pixel columns */
 void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, int style, int offset)
 {
     int xpos,ypos,w,h;
@@ -1223,16 +1224,16 @@ void lcd_remote_puts_scroll(int x, int y, const unsigned char *string)
 
 void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *string, int style)
 {
-    lcd_remote_puts_scroll_style_offset(x, y, string, style, 0);
+     lcd_remote_puts_scroll_style_offset(x, y, string, style, 0);
 }
- 
+
 void lcd_remote_puts_scroll_offset(int x, int y, const unsigned char *string, int offset)
 {
      lcd_remote_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset);
-}
-                                                
+}          
+   
 void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *string,
-                                                int style, int offset)
+                                         int style, int offset)
 {
     struct scrollinfo* s;
     int w, h;
@@ -1289,7 +1290,6 @@ void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *stri
         scrolling_lines &= ~(1<<y);
 }
 
-
 static void scroll_thread(void)
 {
     struct font* pf;
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c
index 0df1a3c..6859845 100644
--- a/firmware/drivers/lcd-h100.c
+++ b/firmware/drivers/lcd-h100.c
@@ -1057,9 +1057,26 @@ void lcd_putsxy(int x, int y, const unsigned char *str)
 
 /*** line oriented text output ***/
 
-/* put a string at a given char position at a given style and with a given pixel position */
-void lcd_puts_style_offset(int x, int y, const unsigned char *str, int style,
-                                                                   int offset)
+/* put a string at a given char position */
+void lcd_puts(int x, int y, const unsigned char *str)
+{
+    lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, 0);
+}
+
+void lcd_puts_style(int x, int y, const unsigned char *str, int style)
+{
+    lcd_puts_style_offset(x, y, str, style, 0);
+}
+
+void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
+{
+    lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, offset);
+}
+
+/* put a string at a given char position, style, and pixel position,
+ * skipping first offset pixel columns */
+void lcd_puts_style_offset(int x, int y, const unsigned char *str,
+                           int style, int offset)
 {
     int xpos,ypos,w,h;
     int lastmode = drawmode;
@@ -1083,22 +1100,6 @@ void lcd_puts_style_offset(int x, int y, const unsigned char *str, int style,
     }
     drawmode = lastmode;
 }
-void lcd_puts_style(int x, int y, const unsigned char *str, int style)
-{
-    lcd_puts_style_offset(x, y, str, style, 0);
-}
-
-/* put a string at a given char position at a given offset mark */
-void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
-{
-     lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, offset);
-}
-
-/* put a string at a given char position */
-void lcd_puts(int x, int y, const unsigned char *str)
-{
-    lcd_puts_style(x, y, str, STYLE_DEFAULT);
-}
 
 /*** scrolling ***/
 
@@ -1226,7 +1227,7 @@ static void scroll_thread(void)
     while ( 1 ) {
         for ( index = 0; index < SCROLLABLE_LINES; index++ ) {
             /* really scroll? */
-            if ( !(scrolling_lines&(1<<index)))
+            if ( !(scrolling_lines&(1<<index)) )
                 continue;
 
             s = &scroll[index];
@@ -1269,7 +1270,8 @@ static void scroll_thread(void)
             lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
             drawmode = DRMODE_SOLID;
             lcd_putsxyofs(xpos, ypos, s->offset, (unsigned char *)s->line);
-            if (s->invert) {
+            if (s->invert)
+            {
                 drawmode = DRMODE_COMPLEMENT;
                 lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
             }
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index 9f8a2b6..b7bcd02 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -917,9 +917,26 @@ void lcd_putsxy(int x, int y, const unsigned char *str)
 
 /*** Line oriented text output ***/
 
-/* put a string at a given char position at a given style and with a given pixel position */
-void lcd_puts_style_offset(int x, int y, const unsigned char *str, int style,
-                                                                   int offset)
+/* put a string at a given char position */
+void lcd_puts(int x, int y, const unsigned char *str)
+{
+    lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, 0);
+}
+
+void lcd_puts_style(int x, int y, const unsigned char *str, int style)
+{
+    lcd_puts_style_offset(x, y, str, style, 0);
+}
+
+void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
+{
+    lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, offset);
+}
+
+/* put a string at a given char position, style, and pixel position,
+ * skipping first offset pixel columns */
+void lcd_puts_style_offset(int x, int y, const unsigned char *str,
+                           int style, int offset)
 {
     int xpos,ypos,w,h;
     int lastmode = drawmode;
@@ -944,23 +961,6 @@ void lcd_puts_style_offset(int x, int y, const unsigned char *str, int style,
     drawmode = lastmode;
 }
 
-void lcd_puts_style(int x, int y, const unsigned char *str, int style)
-{
-    lcd_puts_style_offset(x, y, str, style, 0);
-}
-
-/* put a string at a given char position at a given offset mark */
-void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
-{
-     lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, offset);
-}
-
-/* put a string at a given char position */
-void lcd_puts(int x, int y, const unsigned char *str)
-{
-    lcd_puts_style_offset(x, y, str, STYLE_DEFAULT, 0);
-}
-
 /*** scrolling ***/
 
 /* Reverse the invert setting of the scrolling line (if any) at given char
@@ -1002,20 +1002,21 @@ void lcd_bidir_scroll(int percent)
 
 void lcd_puts_scroll(int x, int y, const unsigned char *string)
 {
-    lcd_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, 0);
+    lcd_puts_scroll_style(x, y, string, STYLE_DEFAULT);
 }
 
-void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, int offset)
-{
-     lcd_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset);
-}  
-
 void lcd_puts_scroll_style(int x, int y, const unsigned char *string, int style)
 {
      lcd_puts_scroll_style_offset(x, y, string, style, 0);
 }
 
-void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, 
+void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
+                            int offset)
+{
+     lcd_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset);
+}          
+   
+void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string,
                                   int style, int offset)
 {
     struct scrollinfo* s;
@@ -1130,7 +1131,8 @@ static void scroll_thread(void)
             lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
             drawmode = DRMODE_SOLID;
             lcd_putsxyofs(xpos, ypos, s->offset, s->line);
-            if (s->invert) {
+            if (s->invert)
+            {
                 drawmode = DRMODE_COMPLEMENT;
                 lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, pf->height);
             }