1 files changed, 24 insertions, 369 deletions

diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c
index dcf5e49504..77eb4ab2a1 100644
--- a/firmware/drivers/lcd-1bit-vert.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -83,7 +83,7 @@ static void *LCDFN(frameaddress_default)(int x, int y)
 {
     /* the default expects a buffer the same size as the screen */
     struct frame_buffer_t *fb = CURRENT_VP->buffer;
-#if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
+#if defined(MAIN_LCD) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
     size_t element = (x * LCDM(NATIVE_STRIDE)(fb->stride)) + y;
 #else
     size_t element = (y * LCDM(NATIVE_STRIDE)(fb->stride)) + x;
@@ -92,6 +92,8 @@ static void *LCDFN(frameaddress_default)(int x, int y)
     return fb->FBFN(ptr) + element;/*(element % fb->elems);*/
 }
 
+#include "lcd-bitmap-common.c"
+
 /* LCD init */
 void LCDFN(init)(void)
 {
@@ -106,43 +108,6 @@ void LCDFN(init)(void)
 
 }
 
-/*** parameter handling ***/
-
-void LCDFN(set_drawmode)(int mode)
-{
-    CURRENT_VP->drawmode = mode & (DRMODE_SOLID|DRMODE_INVERSEVID);
-}
-
-int LCDFN(get_drawmode)(void)
-{
-    return CURRENT_VP->drawmode;
-}
-
-int LCDFN(getwidth)(void)
-{
-    return CURRENT_VP->width;
-}
-
-int LCDFN(getheight)(void)
-{
-    return CURRENT_VP->height;
-}
-
-void LCDFN(setfont)(int newfont)
-{
-    CURRENT_VP->font = newfont;
-}
-
-int LCDFN(getfont)(void)
-{
-    return CURRENT_VP->font;
-}
-
-int LCDFN(getstringsize)(const unsigned char *str, int *w, int *h)
-{
-    return font_getstringsize(str, w, h, CURRENT_VP->font);
-}
-
 /*** low-level drawing functions ***/
 
 static void setpixel(int x, int y)
@@ -238,188 +203,24 @@ void LCDFN(clear_display)(void)
     unsigned bits = (CURRENT_VP->drawmode & DRMODE_INVERSEVID) ? 0xFFu : 0;
 
     memset(LCDFB(0, 0), bits, FBSIZE);
-    LCDFN(scroll_info).lines = 0;
-}
-
-/* Clear the current viewport */
-void LCDFN(clear_viewport)(void)
-{
-    int oldmode;
-
-    if (CURRENT_VP == &default_vp &&
-              default_vp.buffer == &LCDFN(framebuffer_default))
-    {
-        LCDFN(clear_display)();
-    }
-    else
-    {
-        oldmode = CURRENT_VP->drawmode;
-
-        /* Invert the INVERSEVID bit and set basic mode to SOLID */
-        CURRENT_VP->drawmode = (~CURRENT_VP->drawmode & DRMODE_INVERSEVID) |
-                               DRMODE_SOLID;
-
-        LCDFN(fillrect)(0, 0, CURRENT_VP->width, CURRENT_VP->height);
-
-        CURRENT_VP->drawmode = oldmode;
-
-        LCDFN(scroll_stop_viewport)(CURRENT_VP);
-    }
-
-    CURRENT_VP->flags &= ~(VP_FLAG_VP_SET_CLEAN);
-}
-
-/* Set a single pixel */
-void LCDFN(drawpixel)(int x, int y)
-{
-    if (   ((unsigned)x < (unsigned)CURRENT_VP->width)
-        && ((unsigned)y < (unsigned)CURRENT_VP->height)
-#if defined(HAVE_VIEWPORT_CLIP)
-        && ((unsigned)x < (unsigned)LCDM(WIDTH))
-        && ((unsigned)y < (unsigned)LCDM(HEIGHT))
-#endif
-        )
-        LCDFN(pixelfuncs)[CURRENT_VP->drawmode](CURRENT_VP->x + x, CURRENT_VP->y + y);
-}
-
-/* Draw a line */
-void LCDFN(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;
-    LCDFN(pixelfunc_type) *pfunc = LCDFN(pixelfuncs)[CURRENT_VP->drawmode];
-
-    deltax = abs(x2 - x1);
-    if (deltax == 0)
-    {
-        /* DEBUGF(LCDNAME "drawline() called for vertical line - optimisation.\n"); */
-        LCDFN(vline)(x1, y1, y2);
-        return;
-    }
-    deltay = abs(y2 - y1);
-    if (deltay == 0)
-    {
-        /* DEBUGF(LCDNAME "drawline() called for horizontal line - optimisation.\n"); */
-        LCDFN(hline)(x1, x2, y1);
-        return;
-    }
-    xinc2 = 1;
-    yinc2 = 1;
-
-    if (deltax >= deltay)
-    {
-        numpixels = deltax;
-        d = 2 * deltay - deltax;
-        dinc1 = deltay * 2;
-        dinc2 = (deltay - deltax) * 2;
-        xinc1 = 1;
-        yinc1 = 0;
-    }
-    else
-    {
-        numpixels = deltay;
-        d = 2 * deltax - deltay;
-        dinc1 = deltax * 2;
-        dinc2 = (deltax - deltay) * 2;
-        xinc1 = 0;
-        yinc1 = 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++)
-    {
-        if (   ((unsigned)x < (unsigned)CURRENT_VP->width)
-            && ((unsigned)y < (unsigned)CURRENT_VP->height)
-#if defined(HAVE_VIEWPORT_CLIP)
-            && ((unsigned)x < (unsigned)LCDM(WIDTH))
-            && ((unsigned)y < (unsigned)LCDM(HEIGHT))
-#endif
-            )
-            pfunc(CURRENT_VP->x + x, CURRENT_VP->y + y);
-
-        if (d < 0)
-        {
-            d += dinc1;
-            x += xinc1;
-            y += yinc1;
-        }
-        else
-        {
-            d += dinc2;
-            x += xinc2;
-            y += yinc2;
-        }
-    }
+    LCDFN(scroll_stop)();
 }
 
 /* Draw a horizontal line (optimised) */
 void LCDFN(hline)(int x1, int x2, int y)
 {
-    int x, width;
+    struct viewport *vp = CURRENT_VP;
+    int width;
     unsigned char *dst, *dst_end;
     unsigned mask;
     LCDFN(blockfunc_type) *bfunc;
 
-    /* direction flip */
-    if (x2 < x1)
-    {
-        x = x1;
-        x1 = x2;
-        x2 = x;
-    }
-
-    /******************** In viewport clipping **********************/
-    /* nothing to draw? */
-    if (((unsigned)y >= (unsigned)CURRENT_VP->height) || (x1 >= CURRENT_VP->width)
-        || (x2 < 0))
-        return;
-
-    if (x1 < 0)
-        x1 = 0;
-    if (x2 >= CURRENT_VP->width)
-        x2 = CURRENT_VP->width-1;
-
-    /* adjust to viewport */
-    x1 += CURRENT_VP->x;
-    x2 += CURRENT_VP->x;
-    y += CURRENT_VP->y;
-
-#if defined(HAVE_VIEWPORT_CLIP)
-    /********************* Viewport on screen clipping ********************/
-    /* nothing to draw? */
-    if (((unsigned)y >= (unsigned) LCDM(HEIGHT)) || (x1 >= LCDM(WIDTH))
-        || (x2 < 0))
+    if (!clip_viewport_hline(vp, &x1, &x2, &y))
         return;
 
-    /* clipping */
-    if (x1 < 0)
-        x1 = 0;
-    if (x2 >= LCDM(WIDTH))
-        x2 = LCDM(WIDTH)-1;
-#endif
-
     width = x2 - x1 + 1;
 
-    bfunc = LCDFN(blockfuncs)[CURRENT_VP->drawmode];
+    bfunc = LCDFN(blockfuncs)[vp->drawmode];
     dst   = LCDFB(x1,y>>3);
     mask  = BIT_N(y & 7);
 
@@ -432,56 +233,22 @@ void LCDFN(hline)(int x1, int x2, int y)
 /* Draw a vertical line (optimised) */
 void LCDFN(vline)(int x, int y1, int y2)
 {
+    struct viewport *vp = CURRENT_VP;
     int ny;
     FBFN(data) *dst;
     int stride_dst;
     unsigned mask, mask_bottom;
     LCDFN(blockfunc_type) *bfunc;
 
-    /* direction flip */
-    if (y2 < y1)
-    {
-        ny = y1;
-        y1 = y2;
-        y2 = ny;
-    }
-
-    /******************** In viewport clipping **********************/
-    /* nothing to draw? */
-    if (((unsigned)x >= (unsigned)CURRENT_VP->width) || (y1 >= CURRENT_VP->height)
-        || (y2 < 0))
-        return;
-
-    if (y1 < 0)
-        y1 = 0;
-    if (y2 >= CURRENT_VP->height)
-        y2 = CURRENT_VP->height-1;
-
-    /* adjust for viewport */
-    y1 += CURRENT_VP->y;
-    y2 += CURRENT_VP->y;
-    x += CURRENT_VP->x;
-
-#if defined(HAVE_VIEWPORT_CLIP)
-    /********************* Viewport on screen clipping ********************/
-    /* nothing to draw? */
-    if (( (unsigned) x >= (unsigned)LCDM(WIDTH)) || (y1 >= LCDM(HEIGHT))
-        || (y2 < 0))
+    if (!clip_viewport_vline(vp, &x, &y1, &y2))
         return;
 
-    /* clipping */
-    if (y1 < 0)
-        y1 = 0;
-    if (y2 >= LCDM(HEIGHT))
-        y2 = LCDM(HEIGHT)-1;
-#endif
-
-    bfunc = LCDFN(blockfuncs)[CURRENT_VP->drawmode];
+    bfunc = LCDFN(blockfuncs)[vp->drawmode];
     dst   = LCDFB(x,y1>>3);
     ny    = y2 - (y1 & ~7);
     mask  = 0xFFu << (y1 & 7);
     mask_bottom = 0xFFu >> (~ny & 7);
-    stride_dst = CURRENT_VP->buffer->stride;
+    stride_dst = vp->buffer->stride;
 
     for (; ny >= 8; ny -= 8)
     {
@@ -493,24 +260,10 @@ void LCDFN(vline)(int x, int y1, int y2)
     bfunc(dst, mask, 0xFFu);
 }
 
-/* Draw a rectangular box */
-void LCDFN(drawrect)(int x, int y, int width, int height)
-{
-    if ((width <= 0) || (height <= 0))
-        return;
-
-    int x2 = x + width - 1;
-    int y2 = y + height - 1;
-
-    LCDFN(vline)(x, y, y2);
-    LCDFN(vline)(x2, y, y2);
-    LCDFN(hline)(x, x2, y);
-    LCDFN(hline)(x, x2, y2);
-}
-
 /* Fill a rectangular area */
 void LCDFN(fillrect)(int x, int y, int width, int height)
 {
+    struct viewport *vp = CURRENT_VP;
     int ny;
     FBFN(data) *dst, *dst_end;
     int stride_dst;
@@ -519,76 +272,30 @@ void LCDFN(fillrect)(int x, int y, int width, int height)
     LCDFN(blockfunc_type) *bfunc;
     bool fillopt = false;
 
-    /******************** In viewport clipping **********************/
-    /* nothing to draw? */
-    if ((width <= 0) || (height <= 0) || (x >= CURRENT_VP->width)
-        || (y >= CURRENT_VP->height) || (x + width <= 0) || (y + height <= 0))
+    if (!clip_viewport_rect(vp, &x, &y, &width, &height, NULL, NULL))
         return;
 
-    if (x < 0)
-    {
-        width += x;
-        x = 0;
-    }
-    if (y < 0)
-    {
-        height += y;
-        y = 0;
-    }
-    if (x + width > CURRENT_VP->width)
-        width = CURRENT_VP->width - x;
-    if (y + height > CURRENT_VP->height)
-        height = CURRENT_VP->height - y;
-
-    /* adjust for viewport */
-    x += CURRENT_VP->x;
-    y += CURRENT_VP->y;
-
-#if defined(HAVE_VIEWPORT_CLIP)
-    /********************* Viewport on screen clipping ********************/
-    /* nothing to draw? */
-    if ((x >= LCDM(WIDTH)) || (y >= LCDM(HEIGHT))
-        || (x + width <= 0) || (y + height <= 0))
-        return;
-
-    /* clip image in viewport in screen */
-    if (x < 0)
-    {
-        width += x;
-        x = 0;
-    }
-    if (y < 0)
-    {
-        height += y;
-        y = 0;
-    }
-    if (x + width > LCDM(WIDTH))
-        width = LCDM(WIDTH) - x;
-    if (y + height > LCDM(HEIGHT))
-        height = LCDM(HEIGHT) - y;
-#endif
-
-    if (CURRENT_VP->drawmode & DRMODE_INVERSEVID)
+    if (vp->drawmode & DRMODE_INVERSEVID)
     {
-        if (CURRENT_VP->drawmode & DRMODE_BG)
+        if (vp->drawmode & DRMODE_BG)
         {
             fillopt = true;
         }
     }
     else
     {
-        if (CURRENT_VP->drawmode & DRMODE_FG)
+        if (vp->drawmode & DRMODE_FG)
         {
             fillopt = true;
             bits = 0xFFu;
         }
     }
-    bfunc = LCDFN(blockfuncs)[CURRENT_VP->drawmode];
+    bfunc = LCDFN(blockfuncs)[vp->drawmode];
     dst   = LCDFB(x,y>>3);
     ny    = height - 1 + (y & 7);
     mask  = 0xFFu << (y & 7);
     mask_bottom = 0xFFu >> (~ny & 7);
-    stride_dst = CURRENT_VP->buffer->stride;
+    stride_dst = vp->buffer->stride;
 
     for (; ny >= 8; ny -= 8)
     {
@@ -636,81 +343,31 @@ void ICODE_ATTR LCDFN(bitmap_part)(const unsigned char *src, int src_x,
                                    int src_y, int stride, int x, int y,
                                    int width, int height)
 {
+    struct viewport *vp = CURRENT_VP;
     int shift, ny;
     FBFN(data) *dst, *dst_end;
     int stride_dst;
     unsigned mask, mask_bottom;
     LCDFN(blockfunc_type) *bfunc;
 
-    /******************** Image in viewport clipping **********************/
-    /* nothing to draw? */
-    if ((width <= 0) || (height <= 0) || (x >= CURRENT_VP->width)
-        || (y >= CURRENT_VP->height) || (x + width <= 0) || (y + height <= 0))
-        return;
-
-    /* clip image in viewport */
-    if (x < 0)
-    {
-        width += x;
-        src_x -= x;
-        x = 0;
-    }
-    if (y < 0)
-    {
-        height += y;
-        src_y -= y;
-        y = 0;
-    }
-    if (x + width > CURRENT_VP->width)
-        width = CURRENT_VP->width - x;
-    if (y + height > CURRENT_VP->height)
-        height = CURRENT_VP->height - y;
-
-    /* adjust for viewport */
-    x += CURRENT_VP->x;
-    y += CURRENT_VP->y;
-
-#if defined(HAVE_VIEWPORT_CLIP)
-    /********************* Viewport on screen clipping ********************/
-    /* nothing to draw? */
-    if ((x >= LCDM(WIDTH)) || (y >= LCDM(HEIGHT))
-        || (x + width <= 0) || (y + height <= 0))
+    if (!clip_viewport_rect(vp, &x, &y, &width, &height, &src_x, &src_y))
         return;
 
-    /* clip image in viewport in screen */
-    if (x < 0)
-    {
-        width += x;
-        src_x -= x;
-        x = 0;
-    }
-    if (y < 0)
-    {
-        height += y;
-        src_y -= y;
-        y = 0;
-    }
-    if (x + width > LCDM(WIDTH))
-        width = LCDM(WIDTH) - x;
-    if (y + height > LCDM(HEIGHT))
-        height = LCDM(HEIGHT) - y;
-#endif
-
     src    += stride * (src_y >> 3) + src_x; /* move starting point */
     src_y  &= 7;
     y      -= src_y;
     dst    = LCDFB(x,y>>3);
-    stride_dst = CURRENT_VP->buffer->stride;
+    stride_dst = vp->buffer->stride;
     shift  = y & 7;
     ny     = height - 1 + shift + src_y;
 
-    bfunc  = LCDFN(blockfuncs)[CURRENT_VP->drawmode];
+    bfunc  = LCDFN(blockfuncs)[vp->drawmode];
     mask   = 0xFFu << (shift + src_y);
     mask_bottom = 0xFFu >> (~ny & 7);
 
     if (shift == 0)
     {
-        bool copyopt = (CURRENT_VP->drawmode == DRMODE_SOLID);
+        bool copyopt = (vp->drawmode == DRMODE_SOLID);
 
         for (; ny >= 8; ny -= 8)
         {
@@ -782,5 +439,3 @@ void LCDFN(bitmap)(const unsigned char *src, int x, int y, int width,
 {
     LCDFN(bitmap_part)(src, 0, 0, width, x, y, width, height);
 }
-
-#include "lcd-bitmap-common.c"