Extend interface to allow any algorithmic style.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@192 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/mware/text.c b/mware/text.c
index a68b7bbbadc846ce8185fc2f9174f08a5bbb9943..b7e2a3ae31cfc02ddfe414464d090f6a169cea85 100755 (executable)
--- a/mware/text.c
+++ b/mware/text.c
@@ -16,11 +16,8 @@
 
 /*#*
  *#* $Log$
- *#* Revision 1.4  2004/08/29 22:04:53  bernie
- *#* Fix Doxygen markup and indentation.
- *#*
- *#* Revision 1.3  2004/08/25 14:12:09  rasky
- *#* Aggiornato il comment block dei log RCS
+ *#* Revision 1.5  2004/09/06 21:51:26  bernie
+ *#* Extend interface to allow any algorithmic style.
  *#*
  *#* Revision 1.2  2004/06/03 11:27:09  bernie
  *#* Add dual-license information.
@@ -239,6 +236,12 @@ void text_clear(struct Bitmap *bmp)
 }
 
 
+void text_clearLine(struct Bitmap *bmp, int line)
+{
+       gfx_ClearRect(bmp, 0, line * FONT_HEIGHT, bmp->width, (line + 1) * FONT_HEIGHT);
+}
+
+
 /*!
  * Set/clear algorithmic font style bits.
  *

diff --git a/mware/text.h b/mware/text.h
index 231dbb667789c7eea257589b0973a0cc33a81ab4..fc63a12b2db96854658174abed513e37b00554fe 100755 (executable)
--- a/mware/text.h
+++ b/mware/text.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.5  2004/09/06 21:51:26  bernie
+ *#* Extend interface to allow any algorithmic style.
+ *#*
  *#* Revision 1.4  2004/08/25 14:12:09  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -55,10 +58,9 @@
  * \{
  */
 #define TEXT_NORMAL   0       /*!< Normal mode */
-#define TEXT_FILL     BV(0)   /*!< Fill rest of line with spaces */
-#define TEXT_CENTER   BV(1)   /*!< Center string in line */
-#define TEXT_INVERT   BV(2)   /*!< Inverted mode */
-#define TEXT_RIGHT    BV(3)   /*!< Right aligned */
+#define TEXT_FILL     BV(7)   /*!< Fill rest of line with spaces */
+#define TEXT_CENTER   BV(8)   /*!< Center string in line */
+#define TEXT_RIGHT    BV(9)   /*!< Right aligned */
 /*\}*/
 
 /*! Escape sequences codes */
@@ -75,13 +77,14 @@ int text_putchar(char c, struct Bitmap *bm);
 int text_puts(const char *str, struct Bitmap *bm);
 int text_vprintf(struct Bitmap *bm, const char *fmt, va_list ap);
 int text_printf(struct Bitmap *bm, const char *fmt, ...) FORMAT(__printf__, 2, 3);
-int text_xprintf(struct Bitmap *bm, uint8_t row, uint8_t col, uint8_t mode, const char *fmt, ...) FORMAT(__printf__, 5, 6);
+int text_xprintf(struct Bitmap *bm, uint8_t row, uint8_t col, uint16_t mode, const char *fmt, ...) FORMAT(__printf__, 5, 6);
 uint8_t text_style(uint8_t flags, uint8_t mask);
 void text_clear(struct Bitmap *bm);
+void text_clearLine(struct Bitmap *bm, int line);
 
 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_xprintf_P(struct Bitmap *bm, uint8_t row, uint8_t col, uint8_t mode, const char * PROGMEM 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);
 
 #endif /* TEXT_H */