From 99ed2b88c1c90173cd9f857eb6d6eaa775e8b36d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 10 Dec 2014 17:11:23 -0600 Subject: Lots of fonts that derive from X11-misc-fixed-* fonts. Converted for use by NuttX by Pierre-Noel Bouteville --- nuttx/include/nuttx/nx/nxfonts.h | 158 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) (limited to 'nuttx/include') diff --git a/nuttx/include/nuttx/nx/nxfonts.h b/nuttx/include/nuttx/nx/nxfonts.h index 9c6d57ff2..bcd5cea60 100644 --- a/nuttx/include/nuttx/nx/nxfonts.h +++ b/nuttx/include/nuttx/nx/nxfonts.h @@ -121,6 +121,74 @@ #elif defined(CONFIG_NXFONT_PIXEL_LCD_MACHINE) # define NXFONT_DEFAULT FONTID_PIXEL_LCD_MACHINE +/* X11 misc fixed fonts */ + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_4X6) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_4X6 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X7) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X7 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X8) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X8 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X9) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X9 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X10) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X10 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X12) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X12 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13B) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13B + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13O) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13O + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13B) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13B + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13O) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13O + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14B) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14B + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13B) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13B + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13O) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13O + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15B) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15B + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18 + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18B) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18B + +#elif defined(CONFIG_NXFONT_X11_MISC_FIXED_10X20) +# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_10X20 + /* Mono-space fonts */ #elif defined(CONFIG_NXFONT_MONO5X8) @@ -229,6 +297,96 @@ enum nx_fontid_e #ifdef CONFIG_NXFONT_PIXEL_LCD_MACHINE , FONTID_PIXEL_LCD_MACHINE = 20 /* Pixel lcd machine font */ #endif + +/* X11 misc fixed fonts */ + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_4X6 + , FONTID_X11_MISC_FIXED_4X6 = 21 /* X11 misc fixed 4x6 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_5X7 + , FONTID_X11_MISC_FIXED_5X7 = 22 /* X11 misc fixed 5x7 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_5X8 + , FONTID_X11_MISC_FIXED_5X8 = 23 /* X11 misc fixed 5x8 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X9 + , FONTID_X11_MISC_FIXED_6X9 = 24 /* X11 misc fixed 6x9 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X10 + , FONTID_X11_MISC_FIXED_6X10 = 25 /* X11 misc fixed 6x10 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X12 + , FONTID_X11_MISC_FIXED_6X12 = 26 /* X11 misc fixed 6x12 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13 + , FONTID_X11_MISC_FIXED_6X13 = 27 /* X11 misc fixed 6x13 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13B + , FONTID_X11_MISC_FIXED_6X13B = 28 /* X11 misc fixed 6x13b */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13O + , FONTID_X11_MISC_FIXED_6X13O = 29 /* X11 misc fixed 6x13o */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13 + , FONTID_X11_MISC_FIXED_7X13 = 30 /* X11 misc fixed 7x13 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13B + , FONTID_X11_MISC_FIXED_7X13B = 31 /* X11 misc fixed 7x13b */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13O + , FONTID_X11_MISC_FIXED_7X13O = 32 /* X11 misc fixed 7x13o */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14 + , FONTID_X11_MISC_FIXED_7X14 = 33 /* X11 misc fixed 7x14 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14B + , FONTID_X11_MISC_FIXED_7X14B = 34 /* X11 misc fixed 7x14b */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13 + , FONTID_X11_MISC_FIXED_8X13 = 35 /* X11 misc fixed 8x13 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13B + , FONTID_X11_MISC_FIXED_8X13B = 36 /* X11 misc fixed 8x13b */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13O + , FONTID_X11_MISC_FIXED_8X13O = 37 /* X11 misc fixed 8x13o */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15 + , FONTID_X11_MISC_FIXED_9X15 = 38 /* X11 misc fixed 9x15 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15B + , FONTID_X11_MISC_FIXED_9X15B = 39 /* X11 misc fixed 9x15b */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18 + , FONTID_X11_MISC_FIXED_9X18 = 40 /* X11 misc fixed 9x18 */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18B + , FONTID_X11_MISC_FIXED_9X18B = 41 /* X11 misc fixed 9x18b */ +#endif + +#ifdef CONFIG_NXFONT_X11_MISC_FIXED_10X20 + , FONTID_X11_MISC_FIXED_10X20 = 42 /* X11 misc fixed 10x20 */ +#endif }; /* This structures provides the metrics for one glyph */ -- cgit v1.2.3