X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fbitmap.c;h=fd534375d0a309415ca260975d039a295ba17cbd;hb=a5c68f1e55ab389a3472f761664021fe684935f2;hp=ccc6f0bece6930a6465e31726dc2890722c2885a;hpb=4d062df20ce3b853319899469adbc37457b15499;p=bertos.git

diff --git a/gfx/bitmap.c b/gfx/bitmap.c
index ccc6f0be..fd534375 100755
--- a/gfx/bitmap.c
+++ b/gfx/bitmap.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
@@ -16,6 +16,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.12  2006/08/01 12:23:39  bernie
+ *#* gfx_setClipRect(): Also define when CONFIG_GFX_VCOORDS is enabled; Extend documentation.
+ *#*
+ *#* Revision 1.11  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.10  2006/05/27 17:21:15  bernie
+ *#* Factor out, simplify and document clipping.
+ *#*
+ *#* Revision 1.9  2006/05/25 23:35:40  bernie
+ *#* Cleanup.
+ *#*
+ *#* Revision 1.8  2006/03/27 04:48:56  bernie
+ *#* gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug.
+ *#*
+ *#* Revision 1.7  2006/03/07 22:18:04  bernie
+ *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
+ *#*
  *#* Revision 1.6  2006/02/23 11:17:16  bernie
  *#* Documentation fixes.
  *#*
@@ -51,7 +69,7 @@
 #endif
 
 
-/*!
+/**
  * Initialize a Bitmap structure with the provided parameters.
  *
  * \note The pen position is reset to the origin.
@@ -73,6 +91,7 @@ void gfx_bitmapInit(Bitmap *bm, uint8_t *raster, coord_t w, coord_t h)
 
 #if CONFIG_GFX_TEXT
 	gfx_setFont(bm, &default_font);
+	bm->styles = 0;
 #endif
 
 #if CONFIG_GFX_CLIPPING
@@ -84,10 +103,11 @@ 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)
 {
@@ -99,7 +119,7 @@ void gfx_bitmapClear(Bitmap *bm)
 
 #include <avr/pgmspace.h> /* 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.
  *
@@ -111,6 +131,34 @@ void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster)
 }
 #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.
  *
@@ -134,22 +182,19 @@ void gfx_blit(Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, co
 	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)
@@ -157,28 +202,26 @@ void gfx_blit(Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, co
 			BM_DRAWPIXEL(dst, dx, dy, BM_READPIXEL(src, sx, sy));
 }
 
-
-void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, const uint8_t *raster, coord_t w, coord_t h, coord_t stride)
+/**
+ * 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, dymax;
+	coord_t dxmax = dxmin + w, dymax = dymin + h;
 	coord_t sxmin = 0, symin = 0;
 	coord_t dx, dy, sx, sy;
 
-	/*
-	 * Clip coordinates inside dst->cr.
-	 */
-	if (dxmin < dst->cr.xmin)
-	{
-		sxmin += dst->cr.xmin - dxmin;
-		dxmin = dst->cr.xmin;
-	}
-	if (dymin < 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);
+	/* 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)
@@ -186,16 +229,36 @@ void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, const uint8_t *ra
 			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)
 {
@@ -211,8 +274,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 */
+