X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fbitmap.c;h=0cb67d4739d085a779c82d90ab909511769e5466;hb=ff16c7e3fd2184d58a87d5fe1576cd246ecb719e;hp=f0681ea4238f71917ff7dfedfeb0cf42cdf8cc75;hpb=03d72c14a213544bfe50fd9145fe0e4c9f9229c8;p=bertos.git

diff --git a/gfx/bitmap.c b/gfx/bitmap.c
index f0681ea4..0cb67d47 100755
--- a/gfx/bitmap.c
+++ b/gfx/bitmap.c
@@ -16,6 +16,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/02/10 12:32:33  bernie
+ *#* Add multiple font support in bitmaps; gfx_blitRaster(): New function.
+ *#*
+ *#* Revision 1.3  2006/01/26 00:36:48  bernie
+ *#* Const correctness for some new functions.
+ *#*
+ *#* Revision 1.2  2006/01/24 21:55:43  aleph
+ *#* gfx_blit_P(): use RASTER_SIZE() to calculate raster size
+ *#*
  *#* Revision 1.1  2006/01/24 02:17:49  bernie
  *#* Split out gfx.c into bitmap.c and line.c.
  *#*
@@ -27,10 +36,14 @@
 #include <cfg/debug.h>  /* ASSERT() */
 #include <cfg/cpu.h>    /* CPU_HARVARD */
 #include <cfg/macros.h> /* MIN() */
-#include <appconfig.h>  /* CONFIG_GFX_CLIPPING */
 
 #include <string.h>     /* memset() */
 
+#if CONFIG_GFX_TEXT
+#include <gfx/font.h>   /* default_font */
+#endif
+
+
 /*!
  * Initialize a Bitmap structure with the provided parameters.
  *
@@ -51,6 +64,10 @@ 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);
+#endif
+
 #if CONFIG_GFX_CLIPPING
 	bm->cr.xmin = 0;
 	bm->cr.ymin = 0;
@@ -83,7 +100,7 @@ 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, RASTER_SIZE(bm->width, bm->height));
 }
 #endif /* CPU_HARVARD */
 
@@ -99,7 +116,7 @@ void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster)
  * \param dst Bitmap where the operation writes
  *
  */
-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;
@@ -129,6 +146,37 @@ void gfx_blit(Bitmap *dst, Rect *rect, Bitmap *src, coord_t srcx, coord_t srcy)
 }
 
 
+void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, const uint8_t *raster, coord_t w, coord_t h)
+{
+	coord_t dxmax, dymax;
+	coord_t sxmin = 0, symin = 0;
+	coord_t dx, dy, sx, sy;
+
+	/*
+	 * Clip coordinates inside dst->cr.
+	 */
+	if (dx < dst->cr.xmin)
+	{
+		sxmin += dst->cr.xmin - dxmin;
+		dxmin = dst->cr.xmin;
+	}
+	if (dy < dst->cr.ymin)
+	{
+		symin += dst->cr.ymin - dymin;
+		dymin = dst->cr.ymin;
+	}
+	dxmax = MIN(dxmin + w, dst->cr.xmax);
+	dymax = MIN(dymin + h, dst->cr.ymax);
+
+	/* 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,
+				(raster[sy * ((w + 7) / 8) + sx / 8] & (1 << (7 - sx % 8))) ? 1 : 0
+			);
+}
+
+
 /*!
  * Set the bitmap clipping rectangle to the specified coordinates.
  *
@@ -157,3 +205,4 @@ void gfx_setClipRect(Bitmap *bm, coord_t minx, coord_t miny, coord_t maxx, coord
 		bm->cr.xMin, bm->cr.ymin, bm->cr.xmax, bm->cr.ymax);
 */
 }
+