Preparations for implementing the new graphics api: Ordered lcd bitmap driver defines, variables and functions by function groups. Centralised some definitions, code cleanup.

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

1 files changed, 397 insertions, 435 deletions

diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index ea28e5cc2f..52455a1ff5 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -18,8 +18,6 @@
  ****************************************************************************/
 #include "config.h"
 
-#ifdef HAVE_LCD_BITMAP
-
 #include "lcd.h"
 #include "kernel.h"
 #include "thread.h"
@@ -73,32 +71,12 @@
 #define LCD_CNTL_HIGHCOL        0x10    /* Upper column address */
 #define LCD_CNTL_LOWCOL         0x00    /* Lower column address */
 
-#define SCROLL_SPACING 3
-
 #define SCROLLABLE_LINES 13
 
-struct scrollinfo {
-    char line[MAX_PATH + LCD_WIDTH/2 + SCROLL_SPACING + 2];
-    int len;    /* length of line in chars */
-    int width;  /* length of line in pixels */
-    int offset;
-    int startx;
-    bool backward; /* scroll presently forward or backward? */
-    bool bidir;
-    bool invert; /* invert the scrolled text */
-    long start_tick;
-};
+/*** globals ***/
 
-static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */
+unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
 
-static void scroll_thread(void);
-static char scroll_stack[DEFAULT_STACK_SIZE];
-static const char scroll_name[] = "scroll";
-static char scroll_ticks = 12; /* # of ticks between updates*/
-static int scroll_delay = HZ/2; /* ticks delay before start */
-static char scroll_step = 6;  /* pixels per scroll step */
-static int bidir_limit = 50;  /* percent */
-static struct scrollinfo scroll[SCROLLABLE_LINES];
 static int xmargin = 0;
 static int ymargin = 0;
 static int curfont = FONT_SYSFIXED;
@@ -106,18 +84,36 @@ static int curfont = FONT_SYSFIXED;
 static int xoffset; /* needed for flip */
 #endif
 
-unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
-
 /* All zeros and ones bitmaps for area filling */
 static const unsigned char zeros[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 static const unsigned char ones[8]  = { 0xff, 0xff, 0xff, 0xff,
                                         0xff, 0xff, 0xff, 0xff};
 
+/* scrolling */
+static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */
+static void scroll_thread(void);
+static char scroll_stack[DEFAULT_STACK_SIZE];
+static const char scroll_name[] = "scroll";
+static char scroll_ticks = 12; /* # of ticks between updates*/
+static int scroll_delay = HZ/2; /* ticks delay before start */
+static char scroll_step = 6;  /* pixels per scroll step */
+static int bidir_limit = 50;  /* percent */
+static struct scrollinfo scroll[SCROLLABLE_LINES];
+
+static const char scroll_tick_table[16] = {
+ /* Hz values:
+    1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */
+    100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
+};
+
+/*** driver routines ***/
+
+/* optimised archos recorder code is in lcd.S */
 
 #if CONFIG_CPU == TCC730
 /* Optimization opportunity:
    In the following I do exactly as in the archos firmware.
-   There is probably is a better way (ie. do only one mask operation)
+   There is probably a better way (ie. do only one mask operation)
 */
 void lcd_write_command(int cmd) {
     P2 &= 0xF7;
@@ -143,6 +139,7 @@ void lcd_write_data( const unsigned char* data, int count ) {
 }
 #endif
 
+/*** hardware configuration ***/
 
 int lcd_default_contrast(void)
 {
@@ -155,6 +152,73 @@ int lcd_default_contrast(void)
 #endif
 }
 
+#ifndef SIMULATOR
+
+void lcd_set_contrast(int val)
+{
+    lcd_write_command(LCD_CNTL_CONTRAST);
+    lcd_write_command(val);
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    if (yesno) 
+        lcd_write_command(LCD_SET_REVERSE_DISPLAY);
+    else 
+        lcd_write_command(LCD_SET_NORMAL_DISPLAY);
+}
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+#ifdef HAVE_DISPLAY_FLIPPED
+    if (!yesno) 
+#else
+    if (yesno) 
+#endif
+#if CONFIG_LCD == LCD_GMINI100
+    {
+        lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
+        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
+        xoffset = 132 - LCD_WIDTH;
+    } 
+    else 
+    {
+        lcd_write_command(LCD_SET_SEGMENT_REMAP);
+        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
+        xoffset = 0;
+    }
+#else
+
+    {
+        lcd_write_command(LCD_SET_SEGMENT_REMAP);
+        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION);
+        xoffset = 132 - LCD_WIDTH; /* 132 colums minus the 112 we have */
+    }
+    else 
+    {
+        lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
+        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
+        xoffset = 0;
+    }
+#endif
+}
+
+/* Rolls up the lcd display by the specified amount of lines.
+ * Lines that are rolled out over the top of the screen are
+ * rolled in from the bottom again. This is a hardware 
+ * remapping only and all operations on the lcd are affected.
+ * -> 
+ * @param int lines - The number of lines that are rolled. 
+ *  The value must be 0 <= pixels < LCD_HEIGHT. */
+void lcd_roll(int lines)
+{
+    lcd_write_command(LCD_SET_DISPLAY_START_LINE | (lines & (LCD_HEIGHT-1)));
+}
+
+#endif /* !SIMULATOR */
+
+/* LCD init */
 #ifdef SIMULATOR
 
 void lcd_init(void)
@@ -162,13 +226,9 @@ void lcd_init(void)
     create_thread(scroll_thread, scroll_stack,
                   sizeof(scroll_stack), scroll_name);
 }
-
 #else
 
-/*
- * Initialize LCD
- */
-void lcd_init (void)
+void lcd_init(void)
 {
 #if CONFIG_CPU == TCC730
     /* Initialise P0 & some P2 output pins:
@@ -188,7 +248,8 @@ void lcd_init (void)
     lcd_write_command(LCD_SOFTWARE_RESET);
     lcd_write_command(LCD_SET_INTERNAL_REGULATOR_RESISTOR_RATIO + 4);
     lcd_write_command(LCD_SET_1OVER4_BIAS_RATIO + 0); /* force 1/4 bias: 0 */
-    lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); /* power control register: op-amp=1, regulator=1, booster=1 */
+    lcd_write_command(LCD_SET_POWER_CONTROL_REGISTER + 7); 
+               /* power control register: op-amp=1, regulator=1, booster=1 */
     lcd_write_command(LCD_SET_DISPLAY_ON);
     lcd_write_command(LCD_SET_NORMAL_DISPLAY);
     lcd_set_flip(false);
@@ -200,15 +261,17 @@ void lcd_init (void)
 
     lcd_clear_display();
     lcd_update();
+
     create_thread(scroll_thread, scroll_stack,
                   sizeof(scroll_stack), scroll_name);
 }
 
+/*** Update functions ***/
 
 /* Performance function that works with an external buffer
    note that y and height are in 8-pixel units! */
-void lcd_blit (const unsigned char* p_data, int x, int y, int width,
-               int height, int stride)
+void lcd_blit(const unsigned char* p_data, int x, int y, int width,
+              int height, int stride)
 {
     /* Copy display bitmap to hardware */
     while (height--)
@@ -223,12 +286,10 @@ void lcd_blit (const unsigned char* p_data, int x, int y, int width,
 }
 
 
-/*
- * Update the display.
- * This must be called after all other LCD functions that change the display.
- */
-void lcd_update (void) __attribute__ ((section (".icode")));
-void lcd_update (void)
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void) __attribute__ ((section (".icode")));
+void lcd_update(void)
 {
     int y;
 
@@ -243,12 +304,9 @@ void lcd_update (void)
     }
 }
 
-/*
- * Update a fraction of the display.
- */
-void lcd_update_rect (int, int, int, int) __attribute__ ((section (".icode")));
-void lcd_update_rect (int x_start, int y,
-                      int width, int height)
+/* Update a fraction of the display. */
+void lcd_update_rect(int, int, int, int) __attribute__ ((section (".icode")));
+void lcd_update_rect(int x_start, int y, int width, int height)
 {
     int ymax;
 
@@ -273,76 +331,9 @@ void lcd_update_rect (int x_start, int y,
         lcd_write_data (&lcd_framebuffer[y][x_start], width);
     }
 }
+#endif /* !SIMULATOR */
 
-void lcd_set_contrast(int val)
-{
-    lcd_write_command(LCD_CNTL_CONTRAST);
-    lcd_write_command(val);
-}
-
-void lcd_set_invert_display(bool yesno)
-{
-    if (yesno) 
-        lcd_write_command(LCD_SET_REVERSE_DISPLAY);
-    else 
-        lcd_write_command(LCD_SET_NORMAL_DISPLAY);
-}
-
-/* turn the display upside down (call lcd_update() afterwards) */
-void lcd_set_flip(bool yesno)
-{
-#ifdef HAVE_DISPLAY_FLIPPED
-    if (!yesno) 
-#else
-    if (yesno) 
-#endif
-#if CONFIG_LCD == LCD_GMINI100
-    {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
-        xoffset = 132 - LCD_WIDTH;
-    } else {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
-        xoffset = 0;
-    }
-#else
-
-    {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION);
-        xoffset = 132 - LCD_WIDTH; /* 132 colums minus the 112 we have */
-    }
-    else 
-    {
-        lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01);
-        lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08);
-        xoffset = 0;
-    }
-#endif
-}
-
-/**
- * Rolls up the lcd display by the specified amount of lines.
- * Lines that are rolled out over the top of the screen are
- * rolled in from the bottom again. This is a hardware 
- * remapping only and all operations on the lcd are affected.
- * -> 
- * @param int lines - The number of lines that are rolled. 
- *  The value must be 0 <= pixels < LCD_HEIGHT.
- */
-void lcd_roll(int lines)
-{
-    lcd_write_command(LCD_SET_DISPLAY_START_LINE | (lines & (LCD_HEIGHT-1)));
-}
-
-#endif /* SIMULATOR */
-
-void lcd_clear_display (void)
-{
-    memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
-    scrolling_lines = 0;
-}
+/*** parameter handling ***/
 
 void lcd_setmargins(int x, int y)
 {
@@ -370,111 +361,237 @@ int lcd_getstringsize(const unsigned char *str, int *w, int *h)
     return font_getstringsize(str, w, h, curfont);
 }
 
-/* put a string at a given char position */
-void lcd_puts(int x, int y, const unsigned char *str)
+/*** drawing functions ***/
+
+void lcd_clear_display(void)
 {
-    lcd_puts_style(x, y, str, STYLE_DEFAULT);
+    memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
+    scrolling_lines = 0;
 }
 
-void lcd_puts_style(int x, int y, const unsigned char *str, int style)
+/* Set a single pixel */
+void lcd_drawpixel(int x, int y)
 {
-    int xpos,ypos,w,h;
+    DRAW_PIXEL(x,y);
+}
+
+/* Clear a single pixel */
+void lcd_clearpixel(int x, int y)
+{
+    CLEAR_PIXEL(x,y);
+}
+
+/* Invert a single pixel */
+void lcd_invertpixel(int x, int y)
+{
+    INVERT_PIXEL(x,y);
+}
+
+void lcd_drawline(int x1, int y1, int x2, int y2)
+{
+    int numpixels;
+    int i;
+    int deltax, deltay;
+    int d, dinc1, dinc2;
+    int x, xinc1, xinc2;
+    int y, yinc1, yinc2;
 
-#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
-    /* We make the simulator truncate the string if it reaches the right edge,
-       as otherwise it'll wrap. The real target doesn't wrap. */
+    deltax = abs(x2 - x1);
+    deltay = abs(y2 - y1);
 
-    char buffer[12];
-    if(strlen(str)+x > 11 ) {
-        strncpy(buffer, str, sizeof buffer);
-        buffer[11-x]=0;
-        str = buffer;
+    if(deltax >= deltay)
+    {
+        numpixels = deltax;
+        d = 2 * deltay - deltax;
+        dinc1 = deltay * 2;
+        dinc2 = (deltay - deltax) * 2;
+        xinc1 = 1;
+        xinc2 = 1;
+        yinc1 = 0;
+        yinc2 = 1;
     }
-    xmargin = 0;
-    ymargin = 8;
-#endif
+    else
+    {
+        numpixels = deltay;
+        d = 2 * deltax - deltay;
+        dinc1 = deltax * 2;
+        dinc2 = (deltax - deltay) * 2;
+        xinc1 = 0;
+        xinc2 = 1;
+        yinc1 = 1;
+        yinc2 = 1;
+    }
+    numpixels++; /* include endpoints */
 
-    /* make sure scrolling is turned off on the line we are updating */
-    scrolling_lines &= ~(1 << y);
+    if(x1 > x2)
+    {
+        xinc1 = -xinc1;
+        xinc2 = -xinc2;
+    }
 
-    if(!str || !str[0])
-        return;
+    if(y1 > y2)
+    {
+        yinc1 = -yinc1;
+        yinc2 = -yinc2;
+    }
 
-    lcd_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / strlen(str);
-    ypos = ymargin + y*h;
-    lcd_putsxy(xpos, ypos, str);
-    lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
-    if (style & STYLE_INVERT)
-        lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h);
+    x = x1;
+    y = y1;
 
-#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
-    lcd_update();
-#endif
+    for(i=0; i<numpixels; i++)
+    {
+        DRAW_PIXEL(x,y);
+
+        if(d < 0)
+        {
+            d += dinc1;
+            x += xinc1;
+            y += yinc1;
+        }
+        else
+        {
+            d += dinc2;
+            x += xinc2;
+            y += yinc2;
+        }
+    }
 }
 
-/* put a string at a given pixel position, skipping first ofs pixel columns */
-static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
+void lcd_clearline(int x1, int y1, int x2, int y2)
 {
-    int ch;
-    struct font* pf = font_get(curfont);
+    int numpixels;
+    int i;
+    int deltax, deltay;
+    int d, dinc1, dinc2;
+    int x, xinc1, xinc2;
+    int y, yinc1, yinc2;
 
-    while ((ch = *str++) != '\0' && x < LCD_WIDTH)
+    deltax = abs(x2 - x1);
+    deltay = abs(y2 - y1);
+
+    if(deltax >= deltay)
     {
-        int gwidth, width;
+        numpixels = deltax;
+        d = 2 * deltay - deltax;
+        dinc1 = deltay * 2;
+        dinc2 = (deltay - deltax) * 2;
+        xinc1 = 1;
+        xinc2 = 1;
+        yinc1 = 0;
+        yinc2 = 1;
+    }
+    else
+    {
+        numpixels = deltay;
+        d = 2 * deltax - deltay;
+        dinc1 = deltax * 2;
+        dinc2 = (deltax - deltay) * 2;
+        xinc1 = 0;
+        xinc2 = 1;
+        yinc1 = 1;
+        yinc2 = 1;
+    }
+    numpixels++; /* include endpoints */
 
-        /* check input range */
-        if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
-            ch = pf->defaultchar;
-        ch -= pf->firstchar;
+    if(x1 > x2)
+    {
+        xinc1 = -xinc1;
+        xinc2 = -xinc2;
+    }
 
-        /* get proportional width and glyph bits */
-        gwidth = pf->width ? pf->width[ch] : pf->maxwidth;
-        width = MIN (gwidth, LCD_WIDTH - x);
+    if(y1 > y2)
+    {
+        yinc1 = -yinc1;
+        yinc2 = -yinc2;
+    }
 
-        if (ofs != 0)
+    x = x1;
+    y = y1;
+
+    for(i=0; i<numpixels; i++)
+    {
+        CLEAR_PIXEL(x,y);
+
+        if(d < 0)
         {
-            if (ofs > width)
-            {
-                ofs -= width;
-                continue;
-            }
-            width -= ofs;
+            d += dinc1;
+            x += xinc1;
+            y += yinc1;
         }
-
-        if (width > 0)
+        else
         {
-            unsigned int i;
-            const unsigned char* bits = pf->bits +
-                (pf->offset ? pf->offset[ch] 
-                            : ((pf->height + 7) / 8 * pf->maxwidth * ch));
-
-            if (ofs != 0)
-            {
-                for (i = 0; i < pf->height; i += 8)
-                {
-                    lcd_bitmap (bits + ofs, x, y + i, width,
-                                MIN(8, pf->height - i), true);
-                    bits += gwidth;
-                }
-            }
-            else
-                lcd_bitmap ((unsigned char*) bits, x, y, gwidth,
-                            pf->height, true);
-            x += width;
+            d += dinc2;
+            x += xinc2;
+            y += yinc2;
         }
-        ofs = 0;
     }
 }
 
-/* put a string at a given pixel position */
-void lcd_putsxy(int x, int y, const unsigned char *str)
+/* Draw a rectangle with upper left corner at (x, y) and size (nx, ny) */
+void lcd_drawrect(int x, int y, int nx, int ny)
 {
-    lcd_putsxyofs(x, y, 0, str);
+    int i;
+
+    if (x > LCD_WIDTH)
+        return;
+    if (y > LCD_HEIGHT)
+        return;
+
+    if (x + nx > LCD_WIDTH)
+        nx = LCD_WIDTH - x;
+    if (y + ny > LCD_HEIGHT)
+        ny = LCD_HEIGHT - y;
+
+    /* vertical lines */
+    for (i = 0; i < ny; i++) {
+        DRAW_PIXEL(x, (y + i));
+        DRAW_PIXEL((x + nx - 1), (y + i));
+    }
+
+    /* horizontal lines */
+    for (i = 0; i < nx; i++) {
+        DRAW_PIXEL((x + i),y);
+        DRAW_PIXEL((x + i),(y + ny - 1));
+    }
 }
 
-/*
- * About Rockbox' internal bitmap format:
+/* Clear a rectangular area at (x, y), size (nx, ny) */
+void lcd_clearrect(int x, int y, int nx, int ny)
+{
+    int i;
+    for (i = 0; i < nx; i++)
+        lcd_bitmap(zeros, x+i, y, 1, ny, true);
+}
+
+/* Fill a rectangular area at (x, y), size (nx, ny) */
+void lcd_fillrect(int x, int y, int nx, int ny)
+{
+    int i;
+    for (i = 0; i < nx; i++)
+        lcd_bitmap(ones, x+i, y, 1, ny, true);
+}
+
+/* Invert a rectangular area at (x, y), size (nx, ny) */
+void lcd_invertrect(int x, int y, int nx, int ny)
+{
+    int i, j;
+
+    if (x > LCD_WIDTH)
+        return;
+    if (y > LCD_HEIGHT)
+        return;
+
+    if (x + nx > LCD_WIDTH)
+        nx = LCD_WIDTH - x;
+    if (y + ny > LCD_HEIGHT)
+        ny = LCD_HEIGHT - y;
+
+    for (i = 0; i < nx; i++)
+        for (j = 0; j < ny; j++)
+            INVERT_PIXEL((x + i), (y + j));
+}
+
+/* About Rockbox' internal bitmap format:
  *
  * A bitmap contains one bit for every pixel that defines if that pixel is
  * black (1) or white (0). Bits within a byte are arranged vertically, LSB
@@ -483,17 +600,14 @@ void lcd_putsxy(int x, int y, const unsigned char *str)
  * byte 1 2nd from left etc. The first row of bytes defines pixel rows
  * 0..7, the second row defines pixel row 8..15 etc.
  *
- * This is the same as the internal lcd hw format.
- */
-
-/*
- * Draw a bitmap at (x, y), size (nx, ny)
- * if 'clear' is true, clear destination area first
- */
-void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
-                 bool clear) __attribute__ ((section (".icode")));
-void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
-                 bool clear)
+ * This is the same as the internal lcd hw format. */
+
+/* Draw a bitmap at (x, y), size (nx, ny)
+   if 'clear' is true, clear destination area first */
+void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny,
+                bool clear) __attribute__ ((section (".icode")));
+void lcd_bitmap(const unsigned char *src, int x, int y, int nx, int ny,
+                bool clear)
 {
     const unsigned char *src_col;
     unsigned char *dst, *dst_col;
@@ -577,77 +691,95 @@ void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
     }
 }
 
-/*
- * Draw a rectangle with upper left corner at (x, y)
- * and size (nx, ny)
- */
-void lcd_drawrect (int x, int y, int nx, int ny)
+/* put a string at a given pixel position, skipping first ofs pixel columns */
+static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
 {
-    int i;
+    int ch;
+    struct font* pf = font_get(curfont);
 
-    if (x > LCD_WIDTH)
-        return;
-    if (y > LCD_HEIGHT)
-        return;
+    while ((ch = *str++) != '\0' && x < LCD_WIDTH)
+    {
+        int gwidth, width;
 
-    if (x + nx > LCD_WIDTH)
-        nx = LCD_WIDTH - x;
-    if (y + ny > LCD_HEIGHT)
-        ny = LCD_HEIGHT - y;
+        /* check input range */
+        if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
+            ch = pf->defaultchar;
+        ch -= pf->firstchar;
 
-    /* vertical lines */
-    for (i = 0; i < ny; i++) {
-        DRAW_PIXEL(x, (y + i));
-        DRAW_PIXEL((x + nx - 1), (y + i));
-    }
+        /* get proportional width and glyph bits */
+        gwidth = pf->width ? pf->width[ch] : pf->maxwidth;
+        width = MIN (gwidth, LCD_WIDTH - x);
 
-    /* horizontal lines */
-    for (i = 0; i < nx; i++) {
-        DRAW_PIXEL((x + i),y);
-        DRAW_PIXEL((x + i),(y + ny - 1));
+        if (ofs != 0)
+        {
+            if (ofs > width)
+            {
+                ofs -= width;
+                continue;
+            }
+            width -= ofs;
+        }
+
+        if (width > 0)
+        {
+            unsigned int i;
+            const unsigned char* bits = pf->bits +
+                (pf->offset ? pf->offset[ch] 
+                            : ((pf->height + 7) / 8 * pf->maxwidth * ch));
+
+            if (ofs != 0)
+            {
+                for (i = 0; i < pf->height; i += 8)
+                {
+                    lcd_bitmap (bits + ofs, x, y + i, width,
+                                MIN(8, pf->height - i), true);
+                    bits += gwidth;
+                }
+            }
+            else
+                lcd_bitmap ((unsigned char*) bits, x, y, gwidth,
+                            pf->height, true);
+            x += width;
+        }
+        ofs = 0;
     }
 }
 
-/*
- * Clear a rectangular area at (x, y), size (nx, ny)
- */
-void lcd_clearrect (int x, int y, int nx, int ny)
+/* put a string at a given pixel position */
+void lcd_putsxy(int x, int y, const unsigned char *str)
 {
-    int i;
-    for (i = 0; i < nx; i++)
-        lcd_bitmap (zeros, x+i, y, 1, ny, true);
+    lcd_putsxyofs(x, y, 0, str);
 }
 
-/*
- * Fill a rectangular area at (x, y), size (nx, ny)
- */
-void lcd_fillrect (int x, int y, int nx, int ny)
-{
-    int i;
-    for (i = 0; i < nx; i++)
-        lcd_bitmap (ones, x+i, y, 1, ny, true);
-}
+/*** Line oriented text output ***/
 
-/* Invert a rectangular area at (x, y), size (nx, ny) */
-void lcd_invertrect (int x, int y, int nx, int ny)
+void lcd_puts_style(int x, int y, const unsigned char *str, int style)
 {
-    int i, j;
+    int xpos,ypos,w,h;
 
-    if (x > LCD_WIDTH)
-        return;
-    if (y > LCD_HEIGHT)
+    /* make sure scrolling is turned off on the line we are updating */
+    scrolling_lines &= ~(1 << y);
+
+    if(!str || !str[0])
         return;
 
-    if (x + nx > LCD_WIDTH)
-        nx = LCD_WIDTH - x;
-    if (y + ny > LCD_HEIGHT)
-        ny = LCD_HEIGHT - y;
+    lcd_getstringsize(str, &w, &h);
+    xpos = xmargin + x*w / strlen(str);
+    ypos = ymargin + y*h;
+    lcd_putsxy(xpos, ypos, str);
+    lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
+    if (style & STYLE_INVERT)
+        lcd_invertrect(xpos, ypos, LCD_WIDTH - xpos, h);
+}
 
-    for (i = 0; i < nx; i++)
-        for (j = 0; j < ny; j++)
-            INVERT_PIXEL((x + i), (y + j));
+/* 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 ***/
+
 /* Reverse the invert setting of the scrolling line (if any) at given char
    position.  Setting will go into affect next time line scrolls. */
 void lcd_invertscroll(int x, int y)
@@ -660,168 +792,29 @@ void lcd_invertscroll(int x, int y)
     s->invert = !s->invert;
 }
 
-void lcd_drawline( int x1, int y1, int x2, int y2 )
+void lcd_stop_scroll(void)
 {
-    int numpixels;
-    int i;
-    int deltax, deltay;
-    int d, dinc1, dinc2;
-    int x, xinc1, xinc2;
-    int y, yinc1, yinc2;
-
-    deltax = abs(x2 - x1);
-    deltay = abs(y2 - y1);
-
-    if(deltax >= deltay)
-    {
-        numpixels = deltax;
-        d = 2 * deltay - deltax;
-        dinc1 = deltay * 2;
-        dinc2 = (deltay - deltax) * 2;
-        xinc1 = 1;
-        xinc2 = 1;
-        yinc1 = 0;
-        yinc2 = 1;
-    }
-    else
-    {
-        numpixels = deltay;
-        d = 2 * deltax - deltay;
-        dinc1 = deltax * 2;
-        dinc2 = (deltax - deltay) * 2;
-        xinc1 = 0;
-        xinc2 = 1;
-        yinc1 = 1;
-        yinc2 = 1;
-    }
-    numpixels++; /* include endpoints */
-
-    if(x1 > x2)
-    {
-        xinc1 = -xinc1;
-        xinc2 = -xinc2;
-    }
-
-    if(y1 > y2)
-    {
-        yinc1 = -yinc1;
-        yinc2 = -yinc2;
-    }
-
-    x = x1;
-    y = y1;
-
-    for(i=0; i<numpixels; i++)
-    {
-        DRAW_PIXEL(x,y);
-
-        if(d < 0)
-        {
-            d += dinc1;
-            x += xinc1;
-            y += yinc1;
-        }
-        else
-        {
-            d += dinc2;
-            x += xinc2;
-            y += yinc2;
-        }
-    }
+    scrolling_lines=0;
 }
 
-void lcd_clearline( int x1, int y1, int x2, int y2 )
+void lcd_scroll_speed(int speed)
 {
-    int numpixels;
-    int i;
-    int deltax, deltay;
-    int d, dinc1, dinc2;
-    int x, xinc1, xinc2;
-    int y, yinc1, yinc2;
-
-    deltax = abs(x2 - x1);
-    deltay = abs(y2 - y1);
-
-    if(deltax >= deltay)
-    {
-        numpixels = deltax;
-        d = 2 * deltay - deltax;
-        dinc1 = deltay * 2;
-        dinc2 = (deltay - deltax) * 2;
-        xinc1 = 1;
-        xinc2 = 1;
-        yinc1 = 0;
-        yinc2 = 1;
-    }
-    else
-    {
-        numpixels = deltay;
-        d = 2 * deltax - deltay;
-        dinc1 = deltax * 2;
-        dinc2 = (deltax - deltay) * 2;
-        xinc1 = 0;
-        xinc2 = 1;
-        yinc1 = 1;
-        yinc2 = 1;
-    }
-    numpixels++; /* include endpoints */
-
-    if(x1 > x2)
-    {
-        xinc1 = -xinc1;
-        xinc2 = -xinc2;
-    }
-
-    if(y1 > y2)
-    {
-        yinc1 = -yinc1;
-        yinc2 = -yinc2;
-    }
-
-    x = x1;
-    y = y1;
-
-    for(i=0; i<numpixels; i++)
-    {
-        CLEAR_PIXEL(x,y);
-
-        if(d < 0)
-        {
-            d += dinc1;
-            x += xinc1;
-            y += yinc1;
-        }
-        else
-        {
-            d += dinc2;
-            x += xinc2;
-            y += yinc2;
-        }
-    }
+    scroll_ticks = scroll_tick_table[speed];
 }
 
-/*
- * Set a single pixel
- */
-void lcd_drawpixel(int x, int y)
+void lcd_scroll_step(int step)
 {
-    DRAW_PIXEL(x,y);
+    scroll_step = step;
 }
 
-/*
- * Clear a single pixel
- */
-void lcd_clearpixel(int x, int y)
+void lcd_scroll_delay(int ms)
 {
-    CLEAR_PIXEL(x,y);
+    scroll_delay = ms / (HZ / 10);
 }
 
-/*
- * Invert a single pixel
- */
-void lcd_invertpixel(int x, int y)
+void lcd_bidir_scroll(int percent)
 {
-    INVERT_PIXEL(x,y);
+    bidir_limit = percent;
 }
 
 void lcd_puts_scroll(int x, int y, const unsigned char *string)
@@ -886,36 +879,6 @@ void lcd_puts_scroll_style(int x, int y, const unsigned char *string, int style)
         scrolling_lines &= ~(1<<y);
 }
 
-void lcd_stop_scroll(void)
-{
-    scrolling_lines=0;
-}
-
-static const char scroll_tick_table[16] = {
- /* Hz values:
-    1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */
-    100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
-};
-
-void lcd_scroll_speed(int speed)
-{
-    scroll_ticks = scroll_tick_table[speed];
-}
-
-void lcd_scroll_step(int step)
-{
-    scroll_step = step;
-}
-
-void lcd_scroll_delay(int ms)
-{
-    scroll_delay = ms / (HZ / 10);
-}
-
-void lcd_bidir_scroll(int percent)
-{
-    bidir_limit = percent;
-}
 static void scroll_thread(void)
 {
     struct font* pf;
@@ -978,4 +941,3 @@ static void scroll_thread(void)
     }
 }
 
-#endif