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, 409 insertions, 423 deletions

diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index 04a4b7f7a0..4798a51743 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "cpu.h"
+#include "lcd.h"
 #include "lcd-remote.h"
 #include "kernel.h"
 #include "thread.h"
@@ -29,18 +30,41 @@
 #include "system.h"
 #include "font.h"
 
-/* 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
-};
+/*** definitions ***/
 
-static int curfont = FONT_SYSFIXED;
-static int xmargin = 0;
-static int ymargin = 0;
-#ifndef SIMULATOR
-static int xoffset; /* needed for flip */
-#endif
+#define LCD_REMOTE_CNTL_ADC_NORMAL          0xa0
+#define LCD_REMOTE_CNTL_ADC_REVERSE         0xa1
+#define LCD_REMOTE_CNTL_SHL_NORMAL          0xc0
+#define LCD_REMOTE_CNTL_SHL_REVERSE         0xc8
+#define LCD_REMOTE_CNTL_DISPLAY_ON_OFF      0xae
+#define LCD_REMOTE_CNTL_ENTIRE_ON_OFF       0xa4
+#define LCD_REMOTE_CNTL_REVERSE_ON_OFF      0xa6
+#define LCD_REMOTE_CNTL_NOP                 0xe3
+#define LCD_REMOTE_CNTL_POWER_CONTROL       0x2b
+#define LCD_REMOTE_CNTL_SELECT_REGULATOR    0x20
+#define LCD_REMOTE_CNTL_SELECT_BIAS         0xa2
+#define LCD_REMOTE_CNTL_SELECT_VOLTAGE      0x81
+#define LCD_REMOTE_CNTL_INIT_LINE           0x40
+#define LCD_REMOTE_CNTL_SET_PAGE_ADDRESS    0xB0
+
+#define LCD_REMOTE_CNTL_HIGHCOL             0x10    /* Upper column address */
+#define LCD_REMOTE_CNTL_LOWCOL              0x00    /* Lower column address */
+
+#define CS_LO       GPIO1_OUT &= ~0x00000004
+#define CS_HI       GPIO1_OUT |= 0x00000004
+#define CLK_LO      GPIO_OUT &= ~0x10000000
+#define CLK_HI      GPIO_OUT |= 0x10000000
+#define DATA_LO     GPIO1_OUT &= ~0x00040000
+#define DATA_HI     GPIO1_OUT |= 0x00040000
+#define RS_LO       GPIO_OUT &= ~0x00010000
+#define RS_HI       GPIO_OUT |= 0x00010000
+
+/* delay loop */
+#define DELAY   do { int _x; for(_x=0;_x<3;_x++);} while (0)
+
+#define SCROLLABLE_LINES 13
+
+/*** globals ***/
 
 unsigned char lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH]
 #ifndef SIMULATOR
@@ -48,38 +72,34 @@ unsigned char lcd_remote_framebuffer[LCD_REMOTE_HEIGHT/8][LCD_REMOTE_WIDTH]
 #endif  
                 ;
                 
-#define SCROLL_SPACING 3
-#define SCROLLABLE_LINES 26
-
-struct scrollinfo {
-    char line[MAX_PATH + LCD_REMOTE_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;
-};
-
-static volatile int scrolling_lines=0; /* Bitpattern of which lines are scrolling */
-
+static int curfont = FONT_SYSFIXED;
+static int xmargin = 0;
+static int ymargin = 0;
 #ifndef SIMULATOR
-static int countdown;                   /* for remote plugging debounce */
+static int xoffset; /* needed for flip */
+
+/* remote hotplug */
+static int countdown;  /* for remote plugging debounce */
 static bool last_remote_status = false;
-static bool init_remote = false;        /* scroll thread should init lcd */
+static bool init_remote = false;  /* scroll thread should init lcd */
 static bool remote_initialized = false;
-
-/* cached settings values, for hotplug init */
+/* cached settings values */
 static bool cached_invert = false;
 static bool cached_flip = false;
 static int cached_contrast = 32;
 static int cached_roll = 0;
+#endif
 
+/* 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 long scroll_stack[DEFAULT_STACK_SIZE/sizeof(long)];
-#endif
 static const char scroll_name[] = "remote_scroll";
 static char scroll_ticks = 12; /* # of ticks between updates*/
 static int scroll_delay = HZ/2; /* ticks delay before start */
@@ -87,18 +107,13 @@ 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
+};
 
-#define CS_LO       GPIO1_OUT &= ~0x00000004
-#define CS_HI       GPIO1_OUT |= 0x00000004
-#define CLK_LO      GPIO_OUT &= ~0x10000000
-#define CLK_HI      GPIO_OUT |= 0x10000000
-#define DATA_LO     GPIO1_OUT &= ~0x00040000
-#define DATA_HI     GPIO1_OUT |= 0x00040000
-#define RS_LO       GPIO_OUT &= ~0x00010000
-#define RS_HI       GPIO_OUT |= 0x00010000
-
-/* delay loop */
-#define DELAY   do { int _x; for(_x=0;_x<3;_x++);} while (0)
+/*** driver routines ***/
 
 #ifndef SIMULATOR
 void lcd_remote_backlight_on(void)
@@ -115,8 +130,8 @@ void lcd_remote_write_command(int cmd)
 {
     int i;
     
-    CS_LO;
     RS_LO;
+    CS_LO;
     
     for (i = 0; i < 8; i++)
     {
@@ -140,8 +155,8 @@ void lcd_remote_write_data(const unsigned char* p_bytes, int count)
     int i, j;
     int data;
     
-    CS_LO;
     RS_HI;
+    CS_LO;
     
     for (i = 0; i < count; i++)
     {
@@ -202,24 +217,16 @@ void lcd_remote_write_command_ex(int cmd, int data)
     
     CS_HI;
 }
+#endif /* !SIMULATOR */
 
-#define LCD_REMOTE_CNTL_ADC_NORMAL          0xa0
-#define LCD_REMOTE_CNTL_ADC_REVERSE         0xa1
-#define LCD_REMOTE_CNTL_SHL_NORMAL          0xc0
-#define LCD_REMOTE_CNTL_SHL_REVERSE         0xc8
-#define LCD_REMOTE_CNTL_DISPLAY_ON_OFF      0xae
-#define LCD_REMOTE_CNTL_ENTIRE_ON_OFF       0xa4
-#define LCD_REMOTE_CNTL_REVERSE_ON_OFF      0xa6
-#define LCD_REMOTE_CNTL_NOP                 0xe3
-#define LCD_REMOTE_CNTL_POWER_CONTROL       0x2b
-#define LCD_REMOTE_CNTL_SELECT_REGULATOR    0x20
-#define LCD_REMOTE_CNTL_SELECT_BIAS         0xa2
-#define LCD_REMOTE_CNTL_SELECT_VOLTAGE      0x81
-#define LCD_REMOTE_CNTL_INIT_LINE           0x40
-#define LCD_REMOTE_CNTL_SET_PAGE_ADDRESS    0xB0
+/*** hardware configuration ***/
 
-#define LCD_REMOTE_CNTL_HIGHCOL             0x10    /* Upper column address */
-#define LCD_REMOTE_CNTL_LOWCOL              0x00    /* Lower column address */
+int lcd_remote_default_contrast(void)
+{
+    return 32;
+}
+
+#ifndef SIMULATOR
 
 void lcd_remote_powersave(bool on)
 {
@@ -268,161 +275,31 @@ void lcd_remote_set_flip(bool yesno)
     }
 }
 
-int lcd_remote_default_contrast(void)
-{
-    return 32;
-}
-
-#endif
-
-void lcd_remote_bitmap(const unsigned char *src, int x, int y, int nx, int ny, bool clear) __attribute__ ((section (".icode")));
-void lcd_remote_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;
-    unsigned int data, mask1, mask2, mask3, mask4;
-    int stride, shift;
-    
-    if (((unsigned) x >= LCD_REMOTE_WIDTH) || ((unsigned) y >= LCD_REMOTE_HEIGHT))
-    {
-        return;
-    }
-    
-    stride = nx;    /* otherwise right-clipping will destroy the image */
-
-    if (((unsigned) (x + nx)) >= LCD_REMOTE_WIDTH)
-    {
-        nx = LCD_REMOTE_WIDTH - x;
-    }
-    
-    if (((unsigned) (y + ny)) >= LCD_REMOTE_HEIGHT)
-    {
-        ny = LCD_REMOTE_HEIGHT - y;
-    }
-        
-    dst = &lcd_remote_framebuffer[y >> 3][x];
-    shift = y & 7;
-    
-    if (!shift && clear)  /* shortcut for byte aligned match with clear */
-    {
-        while (ny >= 8)   /* all full rows */
-        {
-            memcpy(dst, src, nx);
-            src += stride;
-            dst += LCD_REMOTE_WIDTH;
-            ny -= 8;
-        }
-        if (ny == 0)     /* nothing left to do? */
-        {
-            return;
-        }
-        /* last partial row to do by default routine */
-    }
-
-    ny += shift;
-
-    /* Calculate bit masks */
-    mask4 = ~(0xfe << ((ny-1) & 7));  /* data mask for last partial row */
-    
-    if (clear)
-    {
-        mask1 = ~(0xff << shift); /* clearing of first partial row */
-        mask2 = 0;                /* clearing of intermediate (full) rows */
-        mask3 = ~mask4;           /* clearing of last partial row */
-        if (ny <= 8)
-        {
-            mask3 |= mask1;
-        }
-    }
-    else
-    {
-        mask1 = mask2 = mask3 = 0xff;
-    }
-
-    /* Loop for each column */
-    for (x = 0; x < nx; x++)
-    {
-        src_col = src++;
-        dst_col = dst++;
-        data = 0;
-        y = 0;
-
-        if (ny > 8)
-        {
-            /* First partial row */
-            data = *src_col << shift;
-            *dst_col = (*dst_col & mask1) | data;
-            src_col += stride;
-            dst_col += LCD_REMOTE_WIDTH;
-            data >>= 8;
-
-            /* Intermediate rows */
-            for (y = 8; y < ny-8; y += 8)
-            {
-                data |= *src_col << shift;
-                *dst_col = (*dst_col & mask2) | data;
-                src_col += stride;
-                dst_col += LCD_REMOTE_WIDTH;
-                data >>= 8;
-            }
-        }
-
-        /* Last partial row */
-        if (y + shift < ny)
-        {
-            data |= *src_col << shift;
-        }
-        
-        *dst_col = (*dst_col & mask3) | (data & mask4);
-    }
-}
-
-void lcd_remote_drawrect(int x, int y, int nx, int ny)
+/* 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_REMOTE_HEIGHT. */
+void lcd_remote_roll(int lines)
 {
-    int i;
-
-    if (x > LCD_REMOTE_WIDTH)
-    {
-        return;
-    }
+    char data[2];
     
-    if (y > LCD_REMOTE_HEIGHT)
-    {
-        return;
-    }
+    cached_roll = lines;
 
-    if (x + nx > LCD_REMOTE_WIDTH)
+    if (remote_initialized)
     {
-        nx = LCD_REMOTE_WIDTH - x;
-    }
+        lines &= LCD_REMOTE_HEIGHT-1;
+        data[0] = lines & 0xff;
+        data[1] = lines >> 8;
     
-    if (y + ny > LCD_REMOTE_HEIGHT)
-    {
-        ny = LCD_REMOTE_HEIGHT - y;
-    }
-
-    /* vertical lines */
-    for (i = 0; i < ny; i++)
-    {
-        REMOTE_DRAW_PIXEL(x, (y + i));
-        REMOTE_DRAW_PIXEL((x + nx - 1), (y + i));
-    }
-
-    /* horizontal lines */
-    for (i = 0; i < nx; i++)
-    {
-        REMOTE_DRAW_PIXEL((x + i),y);
-        REMOTE_DRAW_PIXEL((x + i),(y + ny - 1));
+        lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line
+        lcd_remote_write_data(data, 2);
     }
 }
 
-void lcd_remote_clear_display(void)
-{
-    memset(lcd_remote_framebuffer, 0, sizeof lcd_remote_framebuffer);
-}
-
-#ifndef SIMULATOR
-
+/* The actual LCD init */
 static void remote_lcd_init(void)
 {
     lcd_remote_write_command(LCD_REMOTE_CNTL_SELECT_BIAS | 0x0);
@@ -451,6 +328,7 @@ static void remote_lcd_init(void)
     lcd_remote_roll(cached_roll);
 }
 
+/* Monitor remote hotswap */
 static void remote_tick(void)
 {
     bool current_status;
@@ -485,6 +363,7 @@ static void remote_tick(void)
     }
 }
 
+/* Initialise ports and kick off monitor */
 void lcd_remote_init(void)
 {
     GPIO_FUNCTION   |= 0x10010800;  /* GPIO11: Backlight
@@ -503,13 +382,12 @@ void lcd_remote_init(void)
                   sizeof(scroll_stack), scroll_name);
 }
 
+/*** update functions ***/
 
-/*
- * Update the display.
- * This must be called after all other LCD functions that change the display.
- */
-void lcd_remote_update (void) __attribute__ ((section (".icode")));
-void lcd_remote_update (void)
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_remote_update(void) __attribute__ ((section (".icode")));
+void lcd_remote_update(void)
 {
     int y;
     
@@ -526,12 +404,9 @@ void lcd_remote_update (void)
     }
 }
 
-/*
- * Update a fraction of the display.
- */
-void lcd_remote_update_rect (int, int, int, int) __attribute__ ((section (".icode")));
-void lcd_remote_update_rect (int x_start, int y,
-                      int width, int height)
+/* Update a fraction of the display. */
+void lcd_remote_update_rect(int, int, int, int) __attribute__ ((section (".icode")));
+void lcd_remote_update_rect(int x_start, int y, int width, int height)
 {
     int ymax;
     
@@ -560,35 +435,9 @@ void lcd_remote_update_rect (int x_start, int y,
         lcd_remote_write_data(&lcd_remote_framebuffer[y][x_start], width);
     }
 }
+#endif /* !SIMULATOR */
 
-/**
- * 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_REMOTE_HEIGHT.
- */
-void lcd_remote_roll(int lines)
-{
-    char data[2];
-    
-    cached_roll = lines;
-
-    if (remote_initialized)
-    {
-        lines &= LCD_REMOTE_HEIGHT-1;
-        data[0] = lines & 0xff;
-        data[1] = lines >> 8;
-    
-        lcd_remote_write_command(LCD_REMOTE_CNTL_INIT_LINE | 0x0); // init line
-        lcd_remote_write_data(data, 2);
-    }
-}
-
-#endif
-
+/*** parameter handling ***/
 
 void lcd_remote_setmargins(int x, int y)
 {
@@ -617,146 +466,32 @@ int lcd_remote_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_remote_puts(int x, int y, const unsigned char *str)
-{
-    lcd_remote_puts_style(x, y, str, STYLE_DEFAULT);
-}
-
-void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style)
-{
-    int xpos,ypos,w,h;
-
-    /* make sure scrolling is turned off on the line we are updating */
-    //scrolling_lines &= ~(1 << y);
-
-    if(!str || !str[0])
-        return;
-
-    lcd_remote_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / strlen(str);
-    ypos = ymargin + y*h;
-    lcd_remote_putsxy(xpos, ypos, str);
-    lcd_remote_clearrect(xpos + w, ypos, LCD_REMOTE_WIDTH - (xpos + w), h);
-    if (style & STYLE_INVERT)
-        lcd_remote_invertrect(xpos, ypos, LCD_REMOTE_WIDTH - xpos, h);
-
-}
-
-/* put a string at a given pixel position, skipping first ofs pixel columns */
-static void lcd_remote_putsxyofs(int x, int y, int ofs, const unsigned char *str)
-{
-    int ch;
-    struct font* pf = font_get(curfont);
-
-    while ((ch = *str++) != '\0' && x < LCD_REMOTE_WIDTH)
-    {
-        int gwidth, width;
-
-        /* check input range */
-        if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
-            ch = pf->defaultchar;
-        ch -= pf->firstchar;
-
-        /* get proportional width and glyph bits */
-        gwidth = pf->width ? pf->width[ch] : pf->maxwidth;
-        width = MIN (gwidth, LCD_REMOTE_WIDTH - x);
-
-        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_remote_bitmap (bits + ofs, x, y + i, width,
-                                MIN(8, pf->height - i), true);
-                    bits += gwidth;
-                }
-            }
-            else
-                lcd_remote_bitmap ((unsigned char*) bits, x, y, gwidth,
-                            pf->height, true);
-            x += width;
-        }
-        ofs = 0;
-    }
-}
-
-/* put a string at a given pixel position */
-void lcd_remote_putsxy(int x, int y, const unsigned char *str)
-{
-    lcd_remote_putsxyofs(x, y, 0, str);
-}
-
+/*** drawing functions ***/
 
-/*
- * Clear a rectangular area at (x, y), size (nx, ny)
- */
-void lcd_remote_clearrect (int x, int y, int nx, int ny)
+void lcd_remote_clear_display(void)
 {
-    int i;
-    for (i = 0; i < nx; i++)
-        lcd_remote_bitmap (zeros, x+i, y, 1, ny, true);
+    memset(lcd_remote_framebuffer, 0, sizeof lcd_remote_framebuffer);
 }
 
-/*
- * Fill a rectangular area at (x, y), size (nx, ny)
- */
-void lcd_remote_fillrect (int x, int y, int nx, int ny)
+/* Set a single pixel */
+void lcd_remote_drawpixel(int x, int y)
 {
-    int i;
-    for (i = 0; i < nx; i++)
-        lcd_remote_bitmap (ones, x+i, y, 1, ny, true);
+    REMOTE_DRAW_PIXEL(x,y);
 }
 
-/* Invert a rectangular area at (x, y), size (nx, ny) */
-void lcd_remote_invertrect (int x, int y, int nx, int ny)
+/* Clear a single pixel */
+void lcd_remote_clearpixel(int x, int y)
 {
-    int i, j;
-
-    if (x > LCD_REMOTE_WIDTH)
-        return;
-    if (y > LCD_REMOTE_HEIGHT)
-        return;
-
-    if (x + nx > LCD_REMOTE_WIDTH)
-        nx = LCD_REMOTE_WIDTH - x;
-    if (y + ny > LCD_REMOTE_HEIGHT)
-        ny = LCD_REMOTE_HEIGHT - y;
-
-    for (i = 0; i < nx; i++)
-        for (j = 0; j < ny; j++)
-            REMOTE_INVERT_PIXEL((x + i), (y + j));
+    REMOTE_CLEAR_PIXEL(x,y);
 }
 
-/* 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_remote_invertscroll(int x, int y)
+/* Invert a single pixel */
+void lcd_remote_invertpixel(int x, int y)
 {
-    struct scrollinfo* s;
-
-    (void)x;
-
-    s = &scroll[y];
-    s->invert = !s->invert;
+    REMOTE_INVERT_PIXEL(x,y);
 }
 
-void lcd_remote_drawline( int x1, int y1, int x2, int y2 )
+void lcd_remote_drawline(int x1, int y1, int x2, int y2)
 {
     int numpixels;
     int i;
@@ -826,7 +561,7 @@ void lcd_remote_drawline( int x1, int y1, int x2, int y2 )
     }
 }
 
-void lcd_remote_clearline( int x1, int y1, int x2, int y2 )
+void lcd_remote_clearline(int x1, int y1, int x2, int y2)
 {
     int numpixels;
     int i;
@@ -896,28 +631,310 @@ void lcd_remote_clearline( int x1, int y1, int x2, int y2 )
     }
 }
 
-/*
- * Set a single pixel
- */
-void lcd_remote_drawpixel(int x, int y)
+void lcd_remote_drawrect(int x, int y, int nx, int ny)
 {
-    REMOTE_DRAW_PIXEL(x,y);
+    int i;
+
+    if (x > LCD_REMOTE_WIDTH)
+    {
+        return;
+    }
+    
+    if (y > LCD_REMOTE_HEIGHT)
+    {
+        return;
+    }
+
+    if (x + nx > LCD_REMOTE_WIDTH)
+    {
+        nx = LCD_REMOTE_WIDTH - x;
+    }
+    
+    if (y + ny > LCD_REMOTE_HEIGHT)
+    {
+        ny = LCD_REMOTE_HEIGHT - y;
+    }
+
+    /* vertical lines */
+    for (i = 0; i < ny; i++)
+    {
+        REMOTE_DRAW_PIXEL(x, (y + i));
+        REMOTE_DRAW_PIXEL((x + nx - 1), (y + i));
+    }
+
+    /* horizontal lines */
+    for (i = 0; i < nx; i++)
+    {
+        REMOTE_DRAW_PIXEL((x + i),y);
+        REMOTE_DRAW_PIXEL((x + i),(y + ny - 1));
+    }
 }
 
-/*
- * Clear a single pixel
- */
-void lcd_remote_clearpixel(int x, int y)
+/* Clear a rectangular area at (x, y), size (nx, ny) */
+void lcd_remote_clearrect(int x, int y, int nx, int ny)
 {
-    REMOTE_CLEAR_PIXEL(x,y);
+    int i;
+    for (i = 0; i < nx; i++)
+        lcd_remote_bitmap(zeros, x+i, y, 1, ny, true);
 }
 
-/*
- * Invert a single pixel
- */
-void lcd_remote_invertpixel(int x, int y)
+/* Fill a rectangular area at (x, y), size (nx, ny) */
+void lcd_remote_fillrect(int x, int y, int nx, int ny)
 {
-    REMOTE_INVERT_PIXEL(x,y);
+    int i;
+    for (i = 0; i < nx; i++)
+        lcd_remote_bitmap(ones, x+i, y, 1, ny, true);
+}
+
+/* Invert a rectangular area at (x, y), size (nx, ny) */
+void lcd_remote_invertrect(int x, int y, int nx, int ny)
+{
+    int i, j;
+
+    if (x > LCD_REMOTE_WIDTH)
+        return;
+    if (y > LCD_REMOTE_HEIGHT)
+        return;
+
+    if (x + nx > LCD_REMOTE_WIDTH)
+        nx = LCD_REMOTE_WIDTH - x;
+    if (y + ny > LCD_REMOTE_HEIGHT)
+        ny = LCD_REMOTE_HEIGHT - y;
+
+    for (i = 0; i < nx; i++)
+        for (j = 0; j < ny; j++)
+            REMOTE_INVERT_PIXEL((x + i), (y + j));
+}
+
+void lcd_remote_bitmap(const unsigned char *src, int x, int y, int nx, int ny,
+                       bool clear) __attribute__ ((section (".icode")));
+void lcd_remote_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;
+    unsigned int data, mask1, mask2, mask3, mask4;
+    int stride, shift;
+    
+    if (((unsigned) x >= LCD_REMOTE_WIDTH) || ((unsigned) y >= LCD_REMOTE_HEIGHT))
+    {
+        return;
+    }
+    
+    stride = nx;    /* otherwise right-clipping will destroy the image */
+
+    if (((unsigned) (x + nx)) >= LCD_REMOTE_WIDTH)
+    {
+        nx = LCD_REMOTE_WIDTH - x;
+    }
+    
+    if (((unsigned) (y + ny)) >= LCD_REMOTE_HEIGHT)
+    {
+        ny = LCD_REMOTE_HEIGHT - y;
+    }
+        
+    dst = &lcd_remote_framebuffer[y >> 3][x];
+    shift = y & 7;
+    
+    if (!shift && clear)  /* shortcut for byte aligned match with clear */
+    {
+        while (ny >= 8)   /* all full rows */
+        {
+            memcpy(dst, src, nx);
+            src += stride;
+            dst += LCD_REMOTE_WIDTH;
+            ny -= 8;
+        }
+        if (ny == 0)     /* nothing left to do? */
+        {
+            return;
+        }
+        /* last partial row to do by default routine */
+    }
+
+    ny += shift;
+
+    /* Calculate bit masks */
+    mask4 = ~(0xfe << ((ny-1) & 7));  /* data mask for last partial row */
+    
+    if (clear)
+    {
+        mask1 = ~(0xff << shift); /* clearing of first partial row */
+        mask2 = 0;                /* clearing of intermediate (full) rows */
+        mask3 = ~mask4;           /* clearing of last partial row */
+        if (ny <= 8)
+        {
+            mask3 |= mask1;
+        }
+    }
+    else
+    {
+        mask1 = mask2 = mask3 = 0xff;
+    }
+
+    /* Loop for each column */
+    for (x = 0; x < nx; x++)
+    {
+        src_col = src++;
+        dst_col = dst++;
+        data = 0;
+        y = 0;
+
+        if (ny > 8)
+        {
+            /* First partial row */
+            data = *src_col << shift;
+            *dst_col = (*dst_col & mask1) | data;
+            src_col += stride;
+            dst_col += LCD_REMOTE_WIDTH;
+            data >>= 8;
+
+            /* Intermediate rows */
+            for (y = 8; y < ny-8; y += 8)
+            {
+                data |= *src_col << shift;
+                *dst_col = (*dst_col & mask2) | data;
+                src_col += stride;
+                dst_col += LCD_REMOTE_WIDTH;
+                data >>= 8;
+            }
+        }
+
+        /* Last partial row */
+        if (y + shift < ny)
+        {
+            data |= *src_col << shift;
+        }
+        
+        *dst_col = (*dst_col & mask3) | (data & mask4);
+    }
+}
+
+/* put a string at a given pixel position, skipping first ofs pixel columns */
+static void lcd_remote_putsxyofs(int x, int y, int ofs, const unsigned char *str)
+{
+    int ch;
+    struct font* pf = font_get(curfont);
+
+    while ((ch = *str++) != '\0' && x < LCD_REMOTE_WIDTH)
+    {
+        int gwidth, width;
+
+        /* check input range */
+        if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
+            ch = pf->defaultchar;
+        ch -= pf->firstchar;
+
+        /* get proportional width and glyph bits */
+        gwidth = pf->width ? pf->width[ch] : pf->maxwidth;
+        width = MIN (gwidth, LCD_REMOTE_WIDTH - x);
+
+        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_remote_bitmap (bits + ofs, x, y + i, width,
+                                MIN(8, pf->height - i), true);
+                    bits += gwidth;
+                }
+            }
+            else
+                lcd_remote_bitmap ((unsigned char*) bits, x, y, gwidth,
+                            pf->height, true);
+            x += width;
+        }
+        ofs = 0;
+    }
+}
+
+/* put a string at a given pixel position */
+void lcd_remote_putsxy(int x, int y, const unsigned char *str)
+{
+    lcd_remote_putsxyofs(x, y, 0, str);
+}
+
+/*** line oriented text output ***/
+
+/* 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);
+}
+
+void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style)
+{
+    int xpos,ypos,w,h;
+
+    /* make sure scrolling is turned off on the line we are updating */
+    //scrolling_lines &= ~(1 << y);
+
+    if(!str || !str[0])
+        return;
+
+    lcd_remote_getstringsize(str, &w, &h);
+    xpos = xmargin + x*w / strlen(str);
+    ypos = ymargin + y*h;
+    lcd_remote_putsxy(xpos, ypos, str);
+    lcd_remote_clearrect(xpos + w, ypos, LCD_REMOTE_WIDTH - (xpos + w), h);
+    if (style & STYLE_INVERT)
+        lcd_remote_invertrect(xpos, ypos, LCD_REMOTE_WIDTH - xpos, h);
+
+}
+
+/*** 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_remote_invertscroll(int x, int y)
+{
+    struct scrollinfo* s;
+
+    (void)x;
+
+    s = &scroll[y];
+    s->invert = !s->invert;
+}
+
+void lcd_remote_stop_scroll(void)
+{
+    scrolling_lines=0;
+}
+
+void lcd_remote_scroll_speed(int speed)
+{
+    scroll_ticks = scroll_tick_table[speed];
+}
+
+void lcd_remote_scroll_step(int step)
+{
+    scroll_step = step;
+}
+
+void lcd_remote_scroll_delay(int ms)
+{
+    scroll_delay = ms / (HZ / 10);
+}
+
+void lcd_remote_bidir_scroll(int percent)
+{
+    bidir_limit = percent;
 }
 
 void lcd_remote_puts_scroll(int x, int y, const unsigned char *string)
@@ -982,37 +999,6 @@ void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *string, int
         scrolling_lines &= ~(1<<y);
 }
 
-void lcd_remote_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_remote_scroll_speed(int speed)
-{
-    scroll_ticks = scroll_tick_table[speed];
-}
-
-void lcd_remote_scroll_step(int step)
-{
-    scroll_step = step;
-}
-
-void lcd_remote_scroll_delay(int ms)
-{
-    scroll_delay = ms / (HZ / 10);
-}
-
-void lcd_remote_bidir_scroll(int percent)
-{
-    bidir_limit = percent;
-}
-
 #ifndef SIMULATOR
 static void scroll_thread(void)
 {