mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 23:03:27 +08:00
Add two new small, bold, sans-serif fonts
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4130 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
@@ -2227,3 +2227,7 @@
|
||||
* sched/sig_timedwait.c: Fix signal handling with the returned info
|
||||
is NULL. Before this change, it would derefence a NULL pointer
|
||||
in this case.
|
||||
* graphics/nxfonts/nxfonts_sans17x22.h and nxfonts_sans20x26.h: Add
|
||||
some very small sans serif fonts.
|
||||
* graphics/nxfonts/nxfonts_sans17x23b.h and nxfonts_sans20x27b.h: Add
|
||||
corresponding sans serif bold fonts.
|
||||
@@ -12,7 +12,7 @@
|
||||
<h1><big><font color="#3c34ec">
|
||||
<i>NX Graphics Subsystem</i>
|
||||
</font></big></h1>
|
||||
<p>Last Updated: October 22, 2011</p>
|
||||
<p>Last Updated: December 1, 2011</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -3291,6 +3291,12 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
|
||||
<dt><code>CONFIG_NXFONTS_CHARBITS</code>:
|
||||
<dd>The number of bits in the character set. Current options are
|
||||
only 7 and 8. The default is 7.
|
||||
<dt><code>CONFIG_NXFONT_SANS17X22</code>:
|
||||
<dd>This option enables support for a tiny, 17x22 san serif font
|
||||
(font <code>ID FONTID_SANS17X22</code> == 14).
|
||||
<dt><code>CONFIG_NXFONT_SANS20X26</code>:
|
||||
<dd>This option enables support for a tiny, 20x26 san serif font
|
||||
(font <code>ID FONTID_SANS20X26</code> == 15).
|
||||
<dt><code>CONFIG_NXFONT_SANS23X27</code>:
|
||||
<dd>This option enables support for a tiny, 23x27 san serif font
|
||||
(font <code>ID FONTID_SANS23X27</code> == 1).
|
||||
@@ -3303,6 +3309,12 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
|
||||
<dt><code>CONFIG_NXFONT_SANS39X48</code>:
|
||||
<dd>This option enables support for a large, 39x48 san serif font
|
||||
(font <code>ID FONTID_SANS39X48</code> == 4).
|
||||
<dt><code>CONFIG_NXFONT_SANS17X23B</code>:
|
||||
<dd>This option enables support for a tiny, 17x23 san serif bold font
|
||||
(font <code>ID FONTID_SANS17X23B</code> == 16).
|
||||
<dt><code>CONFIG_NXFONT_SANS20X27B</code>:
|
||||
<dd>This option enables support for a tiny, 20x27 san serif bold font
|
||||
(font <code>ID FONTID_SANS20X27B</code> == 17).
|
||||
<dt><code>CONFIG_NXFONT_SANS22X29B</code>:
|
||||
<dd>This option enables support for a small, 22x29 san serif bold font
|
||||
(font ID <code>FONTID_SANS22X29B</code> == 5).
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<h1><big><font color="#3c34ec">
|
||||
<i>NuttX RTOS Porting Guide</i>
|
||||
</font></big></h1>
|
||||
<p>Last Updated: October 1, 2011</p>
|
||||
<p>Last Updated: December 1, 2011</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -5014,6 +5014,16 @@ build
|
||||
The number of bits in the character set. Current options are
|
||||
only 7 and 8. The default is 7.
|
||||
</li>
|
||||
<li>
|
||||
<code>CONFIG_NXFONT_SANS17X22</code>:
|
||||
This option enables support for a tiny, 17x22 san serif font
|
||||
(font <code>ID FONTID_SANS17X22</code> == 14).
|
||||
</li>
|
||||
<li>
|
||||
<code>CONFIG_NXFONT_SANS20X26</code>:
|
||||
This option enables support for a tiny, 20x26 san serif font
|
||||
(font <code>ID FONTID_SANS20X26</code> == 15).
|
||||
</li>
|
||||
<li>
|
||||
<code>CONFIG_NXFONT_SANS23X27</code>:
|
||||
This option enables support for a tiny, 23x27 san serif font
|
||||
@@ -5034,6 +5044,16 @@ build
|
||||
This option enables support for a large, 39x48 san serif font
|
||||
(font <code>ID FONTID_SANS39X48</code> == 4).
|
||||
</li>
|
||||
<li>
|
||||
<code>CONFIG_NXFONT_SANS17X23B</code>:
|
||||
This option enables support for a tiny, 17x23 san serif bold font
|
||||
(font <code>ID FONTID_SANS17X23B</code> == 16).
|
||||
</li>
|
||||
<li>
|
||||
<code>CONFIG_NXFONT_SANS20X27B</code>:
|
||||
This option enables support for a tiny, 20x27 san serif bold font
|
||||
(font <code>ID FONTID_SANS20X27B</code> == 17).
|
||||
</li>
|
||||
<li>
|
||||
<code>CONFIG_NXFONT_SANS22X29B</code>:
|
||||
This option enables support for a small, 22x29 san serif bold font
|
||||
|
||||
@@ -131,6 +131,12 @@ endif
|
||||
ifeq ($(CONFIG_NXFONT_SANS39X48),y)
|
||||
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_SANS17X23B),y)
|
||||
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=16 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_SANS20X27B),y)
|
||||
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=17 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
|
||||
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
@@ -158,6 +164,12 @@ endif
|
||||
ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
|
||||
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=13 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_SANS17X22),y)
|
||||
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=14 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
ifeq ($(CONFIG_NXFONT_SANS20X26),y)
|
||||
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=15 EXTRADEFINES=$(EXTRADEFINES)
|
||||
endif
|
||||
|
||||
gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
|
||||
|
||||
|
||||
@@ -263,6 +263,12 @@ CONFIG_NXFONTS_CHARBITS
|
||||
The number of bits in the character set. Current options are only 7 and 8.
|
||||
The default is 7.
|
||||
|
||||
CONFIG_NXFONT_SANS17X22
|
||||
This option enables support for a tiny, 17x22 san serif font
|
||||
(font ID FONTID_SANS17X22 == 14).
|
||||
CONFIG_NXFONT_SANS20X26
|
||||
This option enables support for a tiny, 20x26 san serif font
|
||||
(font ID FONTID_SANS20X26 == 15).
|
||||
CONFIG_NXFONT_SANS23X27
|
||||
This option enables support for a tiny, 23x27 san serif font
|
||||
(font ID FONTID_SANS23X27 == 1).
|
||||
@@ -275,6 +281,12 @@ CONFIG_NXFONT_SANS28X37
|
||||
CONFIG_NXFONT_SANS39X48
|
||||
This option enables support for a large, 39x48 san serif font
|
||||
(font ID FONTID_SANS39X48 == 4).
|
||||
CONFIG_NXFONT_SANS17X23B
|
||||
This option enables support for a tiny, 17x23 san serif bold font
|
||||
(font ID FONTID_SANS17X23B == 16).
|
||||
CONFIG_NXFONT_SANS20X27B
|
||||
This option enables support for a tiny, 20x27 san serif bold font
|
||||
(font ID FONTID_SANS20X27B == 17).
|
||||
CONFIG_NXFONT_SANS22X29B
|
||||
This option enables support for a small, 22x29 san serif bold font
|
||||
(font ID FONTID_SANS22X29B == 5).
|
||||
|
||||
@@ -42,7 +42,15 @@ NXFCONV_CSRCS = nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c \
|
||||
NXFSET_ASRCS =
|
||||
NXFSET_CSRCS =
|
||||
|
||||
# SANS
|
||||
# Sans serif fonts
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS17X22),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans17x22.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS20X26),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans20x26.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans23x27.c
|
||||
@@ -60,23 +68,29 @@ ifeq ($(CONFIG_NXFONT_SANS39X48),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans39x48.c
|
||||
endif
|
||||
|
||||
# SANS-BOLD
|
||||
# Sans serif bold fonts
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS17X23B),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans17x23b.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS20X27B),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans20x27b.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans22x29b.c
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans28x37b.c
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_sans40x49b.c
|
||||
endif
|
||||
|
||||
# SERIF
|
||||
# Serif fonts
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_serif22x29.c
|
||||
@@ -90,7 +104,7 @@ ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_serif38x48.c
|
||||
endif
|
||||
|
||||
# SERIF-BOLD
|
||||
# Serif bold fonts
|
||||
|
||||
ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
|
||||
NXFSET_CSRCS += nxfonts_bitmaps_serif22x28b.c
|
||||
|
||||
@@ -75,6 +75,16 @@ ifdef NXFONTS_FONTID
|
||||
|
||||
# SANS
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),14)
|
||||
NXFONTS_PREFIX := g_sans17x22_
|
||||
GEN_CSRC = nxfonts_bitmaps_sans17x22.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),15)
|
||||
NXFONTS_PREFIX := g_sans20x26_
|
||||
GEN_CSRC = nxfonts_bitmaps_sans20x26.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),1)
|
||||
NXFONTS_PREFIX := g_sans23x27_
|
||||
GEN_CSRC = nxfonts_bitmaps_sans23x27.c
|
||||
@@ -97,6 +107,16 @@ endif
|
||||
|
||||
# SANS-BOLD
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),16)
|
||||
NXFONTS_PREFIX := g_sans17x23b_
|
||||
GEN_CSRC = nxfonts_bitmaps_sans17x23b.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),17)
|
||||
NXFONTS_PREFIX := g_sans20x27b_
|
||||
GEN_CSRC = nxfonts_bitmaps_sans20x27b.c
|
||||
endif
|
||||
|
||||
ifeq ($(NXFONTS_FONTID),5)
|
||||
NXFONTS_PREFIX := g_sans22x29b_
|
||||
GEN_CSRC = nxfonts_bitmaps_sans22x29b.c
|
||||
|
||||
@@ -72,6 +72,14 @@
|
||||
# include "nxfonts_serif27x38b.h"
|
||||
#elif NXFONTS_FONTID == 13
|
||||
# include "nxfonts_serif38x49b.h"
|
||||
#elif NXFONTS_FONTID == 14
|
||||
# include "nxfonts_sans17x22.h"
|
||||
#elif NXFONTS_FONTID == 15
|
||||
# include "nxfonts_sans20x26.h"
|
||||
#elif NXFONTS_FONTID == 16
|
||||
# include "nxfonts_sans17x23b.h"
|
||||
#elif NXFONTS_FONTID == 17
|
||||
# include "nxfonts_sans20x27b.h"
|
||||
#else
|
||||
# error "No font ID specified"
|
||||
#endif
|
||||
|
||||
@@ -62,6 +62,14 @@
|
||||
|
||||
/* SANS */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS17X22
|
||||
extern const struct nx_fontpackage_s g_sans17x22_package;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS20X26
|
||||
extern const struct nx_fontpackage_s g_sans20x26_package;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS23X27
|
||||
extern const struct nx_fontpackage_s g_sans23x27_package;
|
||||
#endif
|
||||
@@ -80,6 +88,14 @@ extern const struct nx_fontpackage_s g_sans39x48_package;
|
||||
|
||||
/* SANS-BOLD */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS17X23B
|
||||
extern const struct nx_fontpackage_s g_sans17x23b_package;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS20X27B
|
||||
extern const struct nx_fontpackage_s g_sans20x27b_package;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS22X29B
|
||||
extern const struct nx_fontpackage_s g_sans22x29b_package;
|
||||
#endif
|
||||
@@ -125,6 +141,14 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] =
|
||||
|
||||
/* SANS */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS17X22
|
||||
&g_sans17x22_package,
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS20X26
|
||||
&g_sans20x26_package,
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS23X27
|
||||
&g_sans23x27_package,
|
||||
#endif
|
||||
@@ -143,6 +167,14 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] =
|
||||
|
||||
/* SANS-BOLD */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS17X23B
|
||||
&g_sans17x23b_package,
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS20X27B
|
||||
&g_sans20x27b_package,
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS22X29B
|
||||
&g_sans22x29b_package,
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -54,11 +54,17 @@
|
||||
* is likely down the road.
|
||||
*/
|
||||
|
||||
/* SANS */
|
||||
/* Sans serif fonts */
|
||||
|
||||
#if defined(CONFIG_NXFONT_SANS23X27) /* The "legacy," tiny NuttX font */
|
||||
# define NXFONT_DEFAULT FONTID_SANS23X27
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SANS17X22)
|
||||
# define NXFONT_DEFAULT FONTID_SANS17X22
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SANS20X26)
|
||||
# define NXFONT_DEFAULT FONTID_SANS20X26
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SANS22X29)
|
||||
# define NXFONT_DEFAULT FONTID_SANS22X29
|
||||
|
||||
@@ -68,7 +74,13 @@
|
||||
#elif defined(CONFIG_NXFONT_SANS39X48)
|
||||
# define NXFONT_DEFAULT FONTID_SANS39X48
|
||||
|
||||
/* SANS-BOLD */
|
||||
/* Sans serif bold fonts */
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SANS17X23B)
|
||||
# define NXFONT_DEFAULT FONTID_SANS17X23B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SANS20X27B)
|
||||
# define NXFONT_DEFAULT FONTID_SANS20X27B
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SANS22X29B)
|
||||
# define NXFONT_DEFAULT FONTID_SANS22X29B
|
||||
@@ -79,7 +91,7 @@
|
||||
#elif defined(CONFIG_NXFONT_SANS40X49B)
|
||||
# define NXFONT_DEFAULT FONTID_SANS40X49B
|
||||
|
||||
/* SERIF */
|
||||
/* Serif fonts */
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SERIF22X29)
|
||||
# define NXFONT_DEFAULT FONTID_SERIF22X29
|
||||
@@ -90,12 +102,11 @@
|
||||
#elif defined(CONFIG_NXFONT_SERIF38X48)
|
||||
# define NXFONT_DEFAULT FONTID_SERIF38X48
|
||||
|
||||
/* SERIF-BOLD */
|
||||
/* Serif bold fonts */
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SERIF22X28B)
|
||||
# define NXFONT_DEFAULT FONTID_SERIF22X28B
|
||||
|
||||
|
||||
#elif defined(CONFIG_NXFONT_SERIF27X38B)
|
||||
# define NXFONT_DEFAULT FONTID_SERIF27X38B
|
||||
|
||||
@@ -114,7 +125,15 @@ enum nx_fontid_e
|
||||
{
|
||||
FONTID_DEFAULT = 0 /* The default font */
|
||||
|
||||
/* SANS */
|
||||
/* Sans Serif fonts */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS17X22
|
||||
, FONTID_SANS17X22 = 14 /* The 17x22 sans serif font */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS20X26
|
||||
, FONTID_SANS20X26 = 15 /* The 20x26 sans serif font */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS23X27
|
||||
, FONTID_SANS23X27 = 1 /* The 23x27 sans serif font */
|
||||
@@ -132,7 +151,15 @@ enum nx_fontid_e
|
||||
, FONTID_SANS39X48 = 4 /* The 39x48 sans serif font */
|
||||
#endif
|
||||
|
||||
/* SANS-BOLD */
|
||||
/* Sans Serif bold fonts */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS17X23B
|
||||
, FONTID_SANS17X23B = 16 /* The 17x23 sans bold font */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS20X27B
|
||||
, FONTID_SANS20X27B = 17 /* The 20x27 sans bold font */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NXFONT_SANS22X29B
|
||||
, FONTID_SANS22X29B = 5 /* The 22x29 sans bold font */
|
||||
@@ -146,7 +173,7 @@ enum nx_fontid_e
|
||||
, FONTID_SANS40X49B = 7 /* The 40x49 sans bold font */
|
||||
#endif
|
||||
|
||||
/* SERIF */
|
||||
/* Serif fonts */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SERIF22X29
|
||||
, FONTID_SERIF22X29 = 8 /* The 22x29 serif font */
|
||||
@@ -160,7 +187,7 @@ enum nx_fontid_e
|
||||
, FONTID_SERIF38X48 = 10 /* The 38x48 serif font */
|
||||
#endif
|
||||
|
||||
/* SERIF-BOLD */
|
||||
/* Serif bold fonts */
|
||||
|
||||
#ifdef CONFIG_NXFONT_SERIF22X28B
|
||||
, FONTID_SERIF22X28B = 11 /* The 22x28 serif bold font */
|
||||
|
||||
Reference in New Issue
Block a user