projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for compilers without variadic macros support.
[bertos.git]
/
gfx
/
text.h
diff --git
a/gfx/text.h
b/gfx/text.h
index d131e0144db0185b4771d4d5fd001cc5797d971f..c8b1d12b98475c23d7fb5711a84bec4158586f04 100755
(executable)
--- a/
gfx/text.h
+++ b/
gfx/text.h
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.3 2006/02/10 12:26:19 bernie
+ *#* Add STYLEF_TALL (unimplemented).
+ *#*
+ *#* 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.1 2005/11/04 18:11:35 bernie
*#* Move graphics stuff from mware/ to gfx/.
*#*
@@
-50,8
+56,8
@@
*#*
*#*/
*#*
*#*/
-#ifndef
MWARE
_TEXT_H
-#define
MWARE
_TEXT_H
+#ifndef
GFX
_TEXT_H
+#define
GFX
_TEXT_H
#include <cfg/compiler.h>
#include <cfg/macros.h> /* BV() */
#include <cfg/compiler.h>
#include <cfg/macros.h> /* BV() */
@@
-71,10
+77,12
@@
#define STYLEF_EXPANDED BV(4)
#define STYLEF_CONDENSED BV(5)
#define STYLEF_STRIKEOUT BV(6) /*<! Not implemented */
#define STYLEF_EXPANDED BV(4)
#define STYLEF_CONDENSED BV(5)
#define STYLEF_STRIKEOUT BV(6) /*<! Not implemented */
+#define STYLEF_TALL BV(7) /*<! Not implemented */
#define STYLEF_MASK \
#define STYLEF_MASK \
- (STYLEF_BOLD | STYLEF_ITALIC | STYLEF_UNDERLINE | \
- STYLEF_EXPANDED | STYLEF_CONDENSED | STYLEF_INVERT)
+ (STYLEF_BOLD | STYLEF_ITALIC | STYLEF_UNDERLINE \
+ | STYLEF_INVERT | STYLEF_EXPANDED | STYLEF_CONDENSED \
+ | STYLEF_STRIKEOUT | STYLEF_TALL)
/*\}*/
/*!
/*\}*/
/*!
@@
-83,9
+91,9
@@
* \{
*/
#define TEXT_NORMAL 0 /*!< Normal mode */
* \{
*/
#define TEXT_NORMAL 0 /*!< Normal mode */
-#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 */
+#define TEXT_FILL BV(
13)
/*!< Fill rest of line with spaces */
+#define TEXT_CENTER BV(
14)
/*!< Center string in line */
+#define TEXT_RIGHT BV(
15)
/*!< Right aligned */
/*\}*/
/*! Escape sequences codes */
/*\}*/
/*! Escape sequences codes */
@@
-122,4
+130,4
@@
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 */
int text_widthf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...);
#endif /* CPU_HARVARD */
-#endif /*
MWARE
_TEXT_H */
+#endif /*
GFX
_TEXT_H */