Macros for program memory access.

[bertos.git] / mware / text_format.c

diff --git a/mware/text_format.c b/mware/text_format.c
index 9aaf58dde1f83ab71fa595c067d80dcaff35c4e7..d8080a90c53d3c46727bd0f37f0f0902c2aa0d4f 100755 (executable)
--- a/mware/text_format.c
+++ b/mware/text_format.c
@@ -6,16 +6,27 @@
  * This file is part of DevLib - See devlib/README for information.
  * -->
  *
- * \version $Id$
+ * \brief printf-family routines for text output
  *
+ * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Stefano Fedrigo <aleph@develer.com>
- *
- * \brief printf-family routines for text output
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.9  2004/12/31 17:47:45  bernie
+ *#* Rename UNUSED() to UNUSED_ARG().
+ *#*
+ *#* Revision 1.8  2004/11/16 21:16:56  bernie
+ *#* Update to new naming scheme in mware/gfx.c.
+ *#*
+ *#* Revision 1.7  2004/10/03 19:05:04  bernie
+ *#* text_widthf(), text_vwidthf(): New functions.
+ *#*
+ *#* Revision 1.6  2004/09/14 20:59:04  bernie
+ *#* text_xprintf(): Support all styles; Pixel-wise text centering.
+ *#*
  *#* Revision 1.5  2004/08/25 14:12:09  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -110,18 +121,18 @@ int PGM_FUNC(text_printf)(struct Bitmap *bm, const char * PGM_ATTR fmt, ...)
  * of a Bitmap.
  *
  * \param bm Bitmap where to render the text
- * \param row  Starting row in character units (zero based)
- * \param col  Starting column in character units (zero based)
- * \param mode Formatting mode to use.  Can be TEXT_NORMAL,
- *        TEXT_FILL, TEXT_INVERT or TEXT_RIGHT or a combination
- *        of these flags ORed together.
+ * \param row   Starting row in character units (zero based)
+ * \param col   Starting column in character units (zero based)
+ * \param style Formatting style to use.  In addition to any STYLEF_
+ *        flag, it can be TEXT_NORMAL, TEXT_FILL, TEXT_INVERT or
+ *        TEXT_RIGHT, or a combination of these flags ORed together.
  * \param fmt  String possibly containing printf() formatting commands.
  *
  * \see text_puts() text_putchar() text_printf() text_vprintf()
  * \see text_moveto() text_style()
  */
 int PGM_FUNC(text_xprintf)(struct Bitmap *bm,
-               uint8_t row, uint8_t col, uint8_t mode, const char * PGM_ATTR fmt, ...)
+               uint8_t row, uint8_t col, uint16_t style, const char * PGM_ATTR fmt, ...)
 {
        int len;
        uint8_t oldstyle = 0;
@@ -131,32 +142,61 @@ int PGM_FUNC(text_xprintf)(struct Bitmap *bm,
 
        text_moveto(bm, row, col);
 
-       if (mode & TEXT_INVERT)
-               oldstyle = text_style(STYLEF_INVERT, STYLEF_INVERT);
+       if (style & STYLEF_MASK)
+               oldstyle = text_style(style, STYLEF_MASK);
 
-       if (mode & (TEXT_CENTER | TEXT_RIGHT))
+       if (style & (TEXT_CENTER | TEXT_RIGHT))
        {
-               uint8_t pad;
+               uint8_t pad = bm->width - PGM_FUNC(text_vwidthf)(bm, fmt, ap);
 
-               pad = bm->width/FONT_WIDTH - PGM_FUNC(vsprintf)(NULL, fmt, ap);
-
-               if (mode & TEXT_CENTER)
+               if (style & TEXT_CENTER)
                        pad /= 2;
 
-               while (pad--)
-                       text_putchar(' ', bm);
+               if (style & TEXT_FILL)
+                       gfx_rectFillC(bm, 0, row * FONT_HEIGHT, pad, (row + 1) * FONT_HEIGHT,
+                               (style & STYLEF_INVERT) ? 0xFF : 0x00);
+
+               text_setcoord(bm, pad, row * FONT_HEIGHT);
        }
 
        len = PGM_FUNC(text_vprintf)(bm, fmt, ap);
        va_end(ap);
 
-       if (mode & (TEXT_FILL | TEXT_CENTER))
-               while (bm->penX + FONT_WIDTH < bm->width)
-                       text_putchar(' ', bm);
+       if (style & TEXT_FILL)
+               gfx_rectFillC(bm, bm->penX, row * FONT_HEIGHT, bm->width, (row + 1) * FONT_HEIGHT,
+                       (style & STYLEF_INVERT) ? 0xFF : 0x00);
 
-       if (mode & TEXT_INVERT)
+       /* Restore old style */
+       if (style & STYLEF_MASK)
                text_style(oldstyle, STYLEF_MASK);
 
        return len;
 }
 
+
+/*!
+ * Return the width in pixels of a vprintf()-formatted string.
+ */
+int PGM_FUNC(text_vwidthf)(
+       UNUSED_ARG(struct Bitmap *, bm),
+       const char * PGM_ATTR fmt,
+       va_list ap)
+{
+       return PGM_FUNC(vsprintf)(NULL, fmt, ap) * FONT_WIDTH;
+}
+
+
+/*!
+ * Return the width in pixels of a printf()-formatted string.
+ */
+int PGM_FUNC(text_widthf)(struct Bitmap *bm, const char * PGM_ATTR fmt, ...)
+{
+       int width;
+
+       va_list ap;
+       va_start(ap, fmt);
+       width = PGM_FUNC(text_vwidthf)(bm, fmt, ap);
+       va_end(ap);
+
+       return width;
+}