From d55b8fe80965724ece68c9e8467ad93ab35babe3 Mon Sep 17 00:00:00 2001 From: bernie Date: Fri, 10 Feb 2006 12:28:33 +0000 Subject: [PATCH] Add font support in bitmaps; Make bitmap formats public. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@495 38d2e660-2303-0410-9eaa-f027e97ec537 --- gfx/gfx.h | 97 +++++++++++++++++++++++++++++------------------------ gfx/gfx_p.h | 10 ++---- 2 files changed, 57 insertions(+), 50 deletions(-) diff --git a/gfx/gfx.h b/gfx/gfx.h index 80c477ab..7159cdb3 100755 --- a/gfx/gfx.h +++ b/gfx/gfx.h @@ -1,6 +1,6 @@ /*! * \file - * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/) + * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/) * Copyright 1999 Bernardo Innocenti * This file is part of DevLib - See README.devlib for information. * @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.8 2006/02/10 12:28:33 bernie + *#* Add font support in bitmaps; Make bitmap formats public. + *#* *#* Revision 1.7 2006/01/26 00:36:48 bernie *#* Const correctness for some new functions. *#* @@ -22,38 +25,33 @@ *#* *#* Revision 1.5 2006/01/17 02:31:29 bernie *#* Add bitmap format support; Improve some comments. - *#* - *#* Revision 1.4 2006/01/16 03:30:57 bernie - *#* Make header C++ friendly. - *#* - *#* Revision 1.3 2005/11/27 23:33:40 bernie - *#* Use appconfig.h instead of cfg/config.h. - *#* - *#* Revision 1.2 2005/11/04 18:17:45 bernie - *#* Fix header guards and includes for new location of gfx module. - *#* - *#* Revision 1.1 2005/11/04 18:11:35 bernie - *#* Move graphics stuff from mware/ to gfx/. - *#* - *#* Revision 1.12 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.11 2005/04/11 19:10:28 bernie - *#* Include top-level headers from cfg/ subdir. - *#* - *#* Revision 1.10 2005/03/01 23:26:45 bernie - *#* Use new CPU-neutral program-memory API. - *#* - *#* Revision 1.9 2005/01/20 18:46:31 aleph - *#* Fix progmem includes. *#*/ #ifndef GFX_GFX_H #define GFX_GFX_H -#include #include -#include +#include /* CPU_HARVARD */ + +#include /* CONFIG_GFX_* */ + +#if !defined(CONFIG_BITMAP_FMT) || (CONFIG_BITMAP_FMT != BITMAP_FMT_PLANAR_H_MSB && CONFIG_BITMAP_FMT != BITMAP_FMT_PLANAR_V_LSB) + #error CONFIG_BITMAP_FMT must be defined to either BITMAP_FMT_PLANAR_H_LSB or BITMAP_FMT_PLANAR_V_LSB +#endif +#if !defined(CONFIG_GFX_CLIPPING) || (CONFIG_GFX_CLIPPING != 0 && CONFIG_GFX_CLIPPING != 1) + #error CONFIG_GFX_CLIPPING must be defined to either 0 or 1 +#endif +#if !defined(CONFIG_GFX_TEXT) || (CONFIG_GFX_TEXT != 0 && CONFIG_GFX_TEXT != 1) + #error CONFIG_GFX_TEXT must be defined to either 0 or 1 +#endif + +/** + * \name Known pixel formats for bitmap representation. + * \{ + */ +#define BITMAP_FMT_PLANAR_H_MSB 1 /**< Planar pixels, horizontal bytes, MSB left. */ +#define BITMAP_FMT_PLANAR_V_LSB 2 /**< Planar pixels, vertical bytes, LSB top. */ +/* \} */ EXTERN_C_BEGIN @@ -104,6 +102,8 @@ typedef struct Rect { coord_t xmin, ymin, xmax, ymax; } Rect; */ #define RECT_HEIGHT(r) ((r)->ymax - (r)->ymin) +/* Fwd decl */ +struct Font; /*! * Control structure to draw in a bitmap @@ -117,6 +117,9 @@ typedef struct Bitmap Rect cr; /*!< Clip drawing inside this rectangle */ +#if CONFIG_GFX_TEXT + struct Font *font; /**< Current font for text rendering. */ +#endif #if CONFIG_GFX_VCOORDS /*! * \name Logical coordinate system @@ -148,28 +151,36 @@ typedef struct Bitmap /* Function prototypes */ -extern void gfx_bitmapInit (Bitmap *bm, uint8_t *raster, coord_t w, coord_t h); -extern void gfx_bitmapClear(Bitmap *bm); -extern void gfx_blit (Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, coord_t srcy); -extern void gfx_line (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); -extern void gfx_rectDraw (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); -extern void gfx_rectFillC (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t color); -extern void gfx_rectFill (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); -extern void gfx_rectClear (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); -extern void gfx_moveTo (Bitmap *bm, coord_t x, coord_t y); -extern void gfx_lineTo (Bitmap *bm, coord_t x, coord_t y); -extern void gfx_setClipRect(Bitmap *bm, coord_t xmin, coord_t ymin, coord_t xmax, coord_t ymax); +void gfx_bitmapInit (Bitmap *bm, uint8_t *raster, coord_t w, coord_t h); +void gfx_bitmapClear(Bitmap *bm); +void gfx_blit (Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, coord_t srcy); +void gfx_blitRaster (Bitmap *dst, coord_t dx, coord_t dy, const uint8_t *raster, coord_t w, coord_t h); +void gfx_line (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); +void gfx_rectDraw (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); +void gfx_rectFillC (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t color); +void gfx_rectFill (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); +void gfx_rectClear (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2); +void gfx_moveTo (Bitmap *bm, coord_t x, coord_t y); +void gfx_lineTo (Bitmap *bm, coord_t x, coord_t y); +void gfx_setClipRect(Bitmap *bm, coord_t xmin, coord_t ymin, coord_t xmax, coord_t ymax); #if CPU_HARVARD #include - extern void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster); + void gfx_blit_P(Bitmap *bm, const pgm_uint8_t *raster); +#endif + +#if CONFIG_GFX_TEXT +INLINE void gfx_setFont(Bitmap *bm, Font *font) +{ + bm->font = font; +} #endif #if CONFIG_GFX_VCOORDS -extern void gfx_setViewRect(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2); -extern coord_t gfx_transformX(Bitmap *bm, vcoord_t x); -extern coord_t gfx_transformY(Bitmap *bm, vcoord_t y); -extern void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2); +void gfx_setViewRect(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2); +coord_t gfx_transformX(Bitmap *bm, vcoord_t x); +coord_t gfx_transformY(Bitmap *bm, vcoord_t y); +void gfx_vline(Bitmap *bm, vcoord_t x1, vcoord_t y1, vcoord_t x2, vcoord_t y2); #endif /* CONFIG_GFX_VCOORDS */ EXTERN_C_END diff --git a/gfx/gfx_p.h b/gfx/gfx_p.h index 5afc26e4..8482d8e6 100755 --- a/gfx/gfx_p.h +++ b/gfx/gfx_p.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.2 2006/02/10 12:28:33 bernie + *#* Add font support in bitmaps; Make bitmap formats public. + *#* *#* Revision 1.1 2006/01/26 00:32:49 bernie *#* Graphics private header. *#* @@ -23,13 +26,6 @@ #ifndef GFX_GFX_P_H #define GFX_GFX_P_H -/** - * \name Known pixel formats for bitmap representation. - * \{ - */ -#define BITMAP_FMT_PLANAR_H_MSB 1 /**< Planar pixels, horizontal bytes, MSB left. */ -#define BITMAP_FMT_PLANAR_V_LSB 2 /**< Planar pixels, vertical bytes, LSB top. */ -/* \} */ #if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB -- 2.25.1