X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgfx%2Ftext.h;h=aea4b1dd7fbd5a5470284e115a57bf6b6ac7a5ff;hb=fb5863ca8d0db3ff2e84721f7c902b031157ebb0;hp=0ca2407d6b031daf57683109221ad1729d674aca;hpb=6eb6ebb5ae5953a27977f0ef66a36344462b949a;p=bertos.git diff --git a/bertos/gfx/text.h b/bertos/gfx/text.h index 0ca2407d..aea4b1dd 100644 --- a/bertos/gfx/text.h +++ b/bertos/gfx/text.h @@ -31,11 +31,16 @@ * * --> * + * \defgroup text Text handling on graphical displays. + * \ingroup graphics + * \{ * \brief Text graphic routines (interface) * * \author Bernie Innocenti * \author Stefano Fedrigo - * \version $Id$ + * + * $WIZ$ module_name = "text" + * $WIZ$ module_depends = "bitmap", "line" */ #ifndef GFX_TEXT_H @@ -110,9 +115,12 @@ int text_widthf(struct Bitmap *bm, const char * fmt, ...) FORMAT(__printf__, 2, int text_puts_P(const char * PROGMEM str, struct Bitmap *bm); int text_vprintf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap); int text_printf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...) FORMAT(__printf__, 2, 3); +int text_xyvprintf_P(struct Bitmap *bm, coord_t x, coord_t y, uint16_t mode, const char *fmt, va_list ap); +int text_xyprintf_P(struct Bitmap *bm, coord_t x, coord_t col, uint16_t mode, const char *fmt, ...) FORMAT(__printf__, 5, 6); int text_xprintf_P(struct Bitmap *bm, uint8_t row, uint8_t col, uint16_t mode, const char * PROGMEM fmt, ...) FORMAT(__printf__, 5, 6); int text_vwidthf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap); int text_widthf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...); #endif /* CPU_HARVARD */ +/** \} */ //defgroup text #endif /* GFX_TEXT_H */