X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fbitmap.c;h=b7ed197c66dcb14f74fb3f5f4364df3c500e775e;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=f0681ea4238f71917ff7dfedfeb0cf42cdf8cc75;hpb=03d72c14a213544bfe50fd9145fe0e4c9f9229c8;p=bertos.git diff --git a/gfx/bitmap.c b/gfx/bitmap.c old mode 100755 new mode 100644 index f0681ea4..b7ed197c --- a/gfx/bitmap.c +++ b/gfx/bitmap.c @@ -1,4 +1,4 @@ -/*! +/** * \file * * - * \version $Id$ - * * \author Bernardo Innocenti * \author Stefano Fedrigo * * \brief Bitmap manipulation routines. */ -/*#* - *#* $Log$ - *#* Revision 1.1 2006/01/24 02:17:49 bernie - *#* Split out gfx.c into bitmap.c and line.c. - *#* - *#*/ - #include "gfx.h" #include "gfx_p.h" @@ -31,7 +22,12 @@ #include /* memset() */ -/*! +#if CONFIG_GFX_TEXT +#include /* default_font */ +#endif + + +/** * Initialize a Bitmap structure with the provided parameters. * * \note The pen position is reset to the origin. @@ -51,6 +47,11 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h) bm->penX = 0; bm->penY = 0; +#if CONFIG_GFX_TEXT + gfx_setFont(bm, &default_font); + bm->styles = 0; +#endif + #if CONFIG_GFX_CLIPPING bm->cr.xmin = 0; bm->cr.ymin = 0; @@ -60,14 +61,15 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h) } -/*! +/** * Clear the whole bitmap surface to the background color. * * \note This function does \b not update the current pen position. + * \note This function bypasses the current clipping area. */ void gfx_bitmapClear(Bitmap *bm) { - memset(bm->raster, 0, RASTER_SIZE(bm->width, bm->height)); + memset(bm->raster, 0, RAST_SIZE(bm->width, bm->height)); } @@ -75,7 +77,7 @@ void gfx_bitmapClear(Bitmap *bm) #include /* FIXME: memcpy_P() */ -/*! +/** * Copy a raster picture located in program memory in the bitmap. * The size of the raster to copy *must* be the same of the raster bitmap. * @@ -83,10 +85,38 @@ void gfx_bitmapClear(Bitmap *bm) */ void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster) { - memcpy_P(bm->raster, raster, (bm->height / 8) * bm->width); + memcpy_P(bm->raster, raster, RAST_SIZE(bm->width, bm->height)); } #endif /* CPU_HARVARD */ +#if CONFIG_GFX_CLIPPING + /** + * Clip destination coordinates inside a clipping range. + * + * This macro helps a drawing operation to adjust its + * destination X and Y coordinates inside the destination + * clipping range. + * + * The source start coordinate is adjusted as well + * when destination start clipping occurs. + */ + #define gfx_clip(dmin, dmax, smin, cmin, cmax) \ + do { \ + if ((dmin) < (cmin)) \ + { \ + (smin) += (cmin) - (dmin); \ + (dmin) = (cmin); \ + } \ + (dmax) = MIN((dmax), (cmax)); \ + } while(0) + +#else /* !CONFIG_GFX_CLIPPING */ + + #define gfx_clip(dmin, dmax, smin, cmin, cmax) do { } while (0) + +#endif /* !CONFIG_GFX_CLIPPING */ + + /** * Copy a rectangular area of a bitmap on another bitmap. * @@ -96,31 +126,33 @@ void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster) * * \note Using the same bitmap for \a src and \a dst is unsupported. * - * \param dst Bitmap where the operation writes - * + * \param dst Bitmap where the operation writes. + * \param rect The (xmin;ymin) coordinates provide the top/left offset + * for drawing in the destination bitmap. If the source + * bitmap is larger than the rectangle, drawing is clipped. + * \param src Bitmap containing the source pixels. + * \param srcx Starting X offset in the source bitmap. + * \param srcy Starting Y offset in the source bitmap. */ -void gfx_blit(Bitmap *dst, Rect *rect, Bitmap *src, coord_t srcx, coord_t srcy) +void gfx_blit(Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, coord_t srcy) { coord_t dxmin, dymin, dxmax, dymax; coord_t dx, dy, sx, sy; /* - * Clip coordinates inside dst->cr and src->width/height. + * Pre-clip coordinates inside src->width/height. */ dxmin = rect->xmin; - if (dxmin < dst->cr.xmin) - { - srcx += dst->cr.xmin - dxmin; - dxmin = dst->cr.xmin; - } dymin = rect->ymin; - if (dymin < dst->cr.ymin) - { - srcy += dst->cr.ymin - dymin; - dymin = dst->cr.ymin; - } - dxmax = MIN(MIN(rect->xmax, rect->xmin + src->width), dst->cr.xmax); - dymax = MIN(MIN(rect->ymax, rect->ymin + src->height), dst->cr.ymax); + dxmax = MIN(rect->xmax, rect->xmin + src->width); + dymax = MIN(rect->ymax, rect->ymin + src->height); + + /* Perform regular clipping */ + gfx_clip(dxmin, dxmax, srcx, dst->cr.xmin, dst->cr.xmax); + gfx_clip(dymin, dymax, srcy, dst->cr.ymin, dst->cr.ymax); + + //kprintf("dxmin=%d, sxmin=%d, dxmax=%d; ", dxmin, sxmin, dxmax); + //kprintf("dymin=%d, symin=%d, dymax=%d\n", dymin, symin, dymax); /* TODO: make it not as dog slow as this */ for (dx = dxmin, sx = srcx; dx < dxmax; ++dx, ++sx) @@ -128,16 +160,63 @@ void gfx_blit(Bitmap *dst, Rect *rect, Bitmap *src, coord_t srcx, coord_t srcy) BM_DRAWPIXEL(dst, dx, dy, BM_READPIXEL(src, sx, sy)); } +/** + * Blit a raster to a Bitmap. + * + * \todo Merge this function into gfx_blit() + * + * \see gfx_blit() + */ +void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, + const uint8_t *raster, coord_t w, coord_t h, coord_t stride) +{ + coord_t dxmax = dxmin + w, dymax = dymin + h; + coord_t sxmin = 0, symin = 0; + coord_t dx, dy, sx, sy; + + /* Perform regular clipping */ + gfx_clip(dxmin, dxmax, sxmin, dst->cr.xmin, dst->cr.xmax); + gfx_clip(dymin, dymax, symin, dst->cr.ymin, dst->cr.ymax); + + //kprintf("dxmin=%d, sxmin=%d, dxmax=%d; ", dxmin, sxmin, dxmax); + //kprintf("dymin=%d, symin=%d, dymax=%d\n", dymin, symin, dymax); + + /* TODO: make it not as dog slow as this */ + for (dx = dxmin, sx = sxmin; dx < dxmax; ++dx, ++sx) + for (dy = dymin, sy = symin; dy < dymax; ++dy, ++sy) + BM_DRAWPIXEL(dst, dx, dy, RAST_READPIXEL(raster, sx, sy, stride)); +} + +/** + * Blit an Image to a Bitmap. + * + * \see gfx_blit() + */ +void gfx_blitImage(Bitmap *dst, coord_t dxmin, coord_t dymin, const Image *image) +{ + ASSERT(image); + + gfx_blitRaster(dst, dxmin, dymin, + image->raster, image->width, image->height, image->stride); +} -/*! + +#if CONFIG_GFX_CLIPPING || CONFIG_GFX_VCOORDS + +/** * Set the bitmap clipping rectangle to the specified coordinates. * * All drawing performed on the bitmap will be clipped inside this * rectangle. * - * \note Following the convention used in all other operations, the + * The clipping rectangle is also used as a bounding box for the + * logical view of the virtual coordinate system. + * + * \note Following the convention used for all other operations, the * top-left pixels of the rectangle are included, while the * bottom-right pixels are considered outside the clipping region. + * + * \see gfx_setViewRect */ void gfx_setClipRect(Bitmap *bm, coord_t minx, coord_t miny, coord_t maxx, coord_t maxy) { @@ -153,7 +232,9 @@ void gfx_setClipRect(Bitmap *bm, coord_t minx, coord_t miny, coord_t maxx, coord bm->cr.xmax = maxx; bm->cr.ymax = maxy; -/* kprintf("cr.xmin = %d, cr.ymin = %d, cr.xmax = %d, cr.ymax = %d\n", - bm->cr.xMin, bm->cr.ymin, bm->cr.xmax, bm->cr.ymax); -*/ +// kprintf("cr.xmin = %d, cr.ymin = %d, cr.xmax = %d, cr.ymax = %d\n", +// bm->cr.xMin, bm->cr.ymin, bm->cr.xmax, bm->cr.ymax); } + +#endif /* CONFIG_GFX_CLIPPING */ +