Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-21 04:52:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add more fonts

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3824 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-07-29 05:28:06 +00:00
parent f2140928cb
commit 4e5fb58dbc
21 changed files with 6550 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/NXGraphicsSubsystem.html
+30 -9
View File
@@ -2722,22 +2722,43 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
<dl>
<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.
only 7 and 8. The default is 7.
<dt><code>CONFIG_NXFONT_SANS22X29</code>:
<dd>This option enables support for a small, 22x29 san serif font
(font <code>ID FONTID_SANS22X29</code> == 1).
<dt><code>CONFIG_NXFONT_SANS23X27</code>:
<dd>This option enables support for a small, 23x27 san serif font
(font ID <code>FONTID_SANS23X27</code> == 1)
<dd>This option enables support for a tiny, 23x27 san serif font
(font <code>ID FONTID_SANS23X27</code> == 2).
<dt><code>CONFIG_NXFONT_SANS28X37</code>:
<dd>This option enables support for a medium, 28x37 san serif font
(font <code>ID FONTID_SANS28X37</code> == 3).
<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> == 4).
<dt><code>CONFIG_NXFONT_SANS28X37B</code>:
<dd>This option enables support for a medium, 28x37 san serif bold font
(font ID <code>FONTID_SANS28X37B</code> == 2)
(font ID <code>FONTID_SANS28X37B</code> == 5).
<dt><code>CONFIG_NXFONT_SANS40X49B</code>:
<dd>This option enables support for a large, 40x49 san serif bold font
(font ID <code>FONTID_SANS40X49B</code> == 3)
<dt><code>CONFIG_NXFONT_SERIF27X38B</code>:
<dd>This option enables support for a medium, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF27X38B</code> == 4)
(font ID <code>FONTID_SANS40X49B</code> == 6).
<dt><code>CONFIG_NXFONT_SERIF22X29</code>:
<dd>This option enables support for a small, 22x29 font (with serifs)
(font ID <code>FONTID_SERIF22X29</code> == 7).
<dt><code>CONFIG_NXFONT_SERIF29X37</code>:
<dd>This option enables support for a medium, 29x37 font (with serifs)
(font ID <code>FONTID_SERIF29X37</code> == 5)
(font ID <code>FONTID_SERIF29X37</code> == 8).
<dt><code>CONFIG_NXFONT_SERIF38X48</code>:
<dd>This option enables support for a large, 38x48 font (with serifs)
(font ID <code>FONTID_SERIF38X48</code> == 9).
<dt><code>CONFIG_NXFONT_SERIF22X28B</code>:
<dd>This option enables support for a small, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF22X28B</code> == 10).
<dt><code>CONFIG_NXFONT_SERIF27X38B</code>:
<dd>This option enables support for a medium, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF27X38B</code> == 11).
<dt><code>CONFIG_NXFONT_SERIF38X49B</code>:
<dd>This option enables support for a large, 38x49 bold font (with serifs)
(font ID <code>FONTID_SERIF38X49B</code> == 12).
</dl>
</ul>
Documentation/NuttxPortingGuide.html
+41 -11
View File
@@ -4476,34 +4476,64 @@ build
only 7 and 8. The default is 7.
</li>
<li>
<code>CONFIG_NXFONT_SANS23X27</code>:
At present, there is only one font, a 23x27 sans serif font.
But if there were were more, then this option would select that sans serif font.
<code>CONFIG_NXFONT_SANS22X29</code>:
This option enables support for a small, 22x29 san serif font
(font <code>ID FONTID_SANS22X29</code> == 1).
</li>
<li>
<code>CONFIG_NXFONT_SANS23X27</code>:
This option enables support for a small, 23x27 san serif font
(font <code>ID FONTID_SANS23X27</code> == 1).
This option enables support for a tiny, 23x27 san serif font
(font <code>ID FONTID_SANS23X27</code> == 2).
</li>
<li>
<code>CONFIG_NXFONT_SANS28X37</code>:
This option enables support for a medium, 28x37 san serif font
(font <code>ID FONTID_SANS28X37</code> == 3).
</li>
<li>
<code>CONFIG_NXFONT_SANS22X29B</code>:
This option enables support for a small, 22x29 san serif bold font
(font ID <code>FONTID_SANS22X29B</code> == 4).
</li>
<li>
<code>CONFIG_NXFONT_SANS28X37B</code>:
This option enables support for a medium, 28x37 san serif bold font
(font ID <code>FONTID_SANS28X37B</code> == 2).
(font ID <code>FONTID_SANS28X37B</code> == 5).
</li>
<li>
<code>CONFIG_NXFONT_SANS40X49B</code>:
This option enables support for a large, 40x49 san serif bold font
(font ID <code>FONTID_SANS40X49B</code> == 3).
(font ID <code>FONTID_SANS40X49B</code> == 6).
</li>
<li>
<code>CONFIG_NXFONT_SERIF27X38B</code>:
This option enables support for a medium, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF27X38B</code> == 4).
<code>CONFIG_NXFONT_SERIF22X29</code>:
This option enables support for a small, 22x29 font (with serifs)
(font ID <code>FONTID_SERIF22X29</code> == 7).
</li>
<li>
<code>CONFIG_NXFONT_SERIF29X37</code>:
This option enables support for a medium, 29x37 font (with serifs)
(font ID <code>FONTID_SERIF29X37</code> == 5).
(font ID <code>FONTID_SERIF29X37</code> == 8).
</li>
<li>
<code>CONFIG_NXFONT_SERIF38X48</code>:
This option enables support for a large, 38x48 font (with serifs)
(font ID <code>FONTID_SERIF38X48</code> == 9).
</li>
<li>
<code>CONFIG_NXFONT_SERIF22X28B</code>:
This option enables support for a small, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF22X28B</code> == 10).
</li>
<li>
<code>CONFIG_NXFONT_SERIF27X38B</code>:
This option enables support for a medium, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF27X38B</code> == 11).
</li>
<li>
<code>CONFIG_NXFONT_SERIF38X49B</code>:
This option enables support for a large, 38x49 bold font (with serifs)
(font ID <code>FONTID_SERIF38X49B</code> == 12).
</li>
</ul>
configs/README.txt
+34 -12
View File
@@ -973,21 +973,43 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_NXFONTS_CHARBITS
The number of bits in the character set. Current options are
only 7 and 8. The default is 7.
CONFIG_NXFONT_SANS23X27:
This option enables support for a small, 23x27 san serif font
(font ID FONTID_SANS23X27 == 1)
CONFIG_NXFONT_SANS28X37B:
CONFIG_NXFONT_SANS22X29
This option enables support for a small, 22x29 san serif font
(font ID FONTID_SANS22X29 == 1).
CONFIG_NXFONT_SANS23X27
This option enables support for a tiny, 23x27 san serif font
(font ID FONTID_SANS23X27 == 2).
CONFIG_NXFONT_SANS28X37
This option enables support for a medium, 28x37 san serif font
(font ID FONTID_SANS28X37 == 3).
CONFIG_NXFONT_SANS22X29B
This option enables support for a small, 22x29 san serif bold font
(font ID FONTID_SANS22X29B == 4).
CONFIG_NXFONT_SANS28X37B
This option enables support for a medium, 28x37 san serif bold font
(font ID FONTID_SANS28X37B == 2)
CONFIG_NXFONT_SANS40X49B:
(font ID FONTID_SANS28X37B == 5).
CONFIG_NXFONT_SANS40X49B
This option enables support for a large, 40x49 san serif bold font
(font ID FONTID_SANS40X49B == 3)
CONFIG_NXFONT_SERIF27X38B:
(font ID FONTID_SANS40X49B == 6).
CONFIG_NXFONT_SERIF22X29
This option enables support for a small, 22x29 font (with serifs)
(font ID FONTID_SERIF22X29 == 7).
CONFIG_NXFONT_SERIF29X37
This option enables support for a medium, 29x37 font (with serifs)
(font ID FONTID_SERIF29X37 == 8).
CONFIG_NXFONT_SERIF38X48
This option enables support for a large, 38x48 font (with serifs)
(font ID FONTID_SERIF38X48 == 9).
CONFIG_NXFONT_SERIF22X28B
This option enables support for a small, 27x38 bold font (with serifs)
(font ID FONTID_SERIF22X28B == 10).
CONFIG_NXFONT_SERIF27X38B
This option enables support for a medium, 27x38 bold font (with serifs)
(font ID FONTID_SERIF27X38B == 4)
CONFIG_NXFONT_SERIF29X37:
This option enables support for a medium, 29x37 font (with serifs)
(font ID FONTID_SERIF29X37 == 5)
(font ID FONTID_SERIF27X38B == 11).
CONFIG_NXFONT_SERIF38X49B
This option enables support for a large, 38x49 bold font (with serifs)
(font ID FONTID_SERIF38X49B == 12).
NX Multi-user only options:
configs/stm3210e-eval/nsh2/defconfig
+38 -10
View File
@@ -780,21 +780,42 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are
# only 7 and 8. The default is 7.
# CONFIG_NXFONT_SANS22X29
# This option enables support for a small, 22x29 san serif font
# (font ID FONTID_SANS22X29 == 1).
# CONFIG_NXFONT_SANS23X27
# This option enables support for a small, 23x27 san serif font
# (font ID FONTID_SANS23X27 == 1)
# This option enables support for a tiny, 23x27 san serif font
# (font ID FONTID_SANS23X27 == 2).
# CONFIG_NXFONT_SANS28X37
# This option enables support for a medium, 28x37 san serif font
# (font ID FONTID_SANS28X37 == 3).
# CONFIG_NXFONT_SANS22X29B
# This option enables support for a small, 22x29 san serif bold font
# (font ID FONTID_SANS22X29B == 4).
# CONFIG_NXFONT_SANS28X37B
# This option enables support for a medium, 28x37 san serif bold font
# (font ID FONTID_SANS28X37B == 2)
# (font ID FONTID_SANS28X37B == 5).
# CONFIG_NXFONT_SANS40X49B
# This option enables support for a large, 40x49 san serif bold font
# (font ID FONTID_SANS40X49B == 3)
# CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF27X38B == 4)
# (font ID FONTID_SANS40X49B == 6).
# CONFIG_NXFONT_SERIF22X29
# This option enables support for a small, 22x29 font (with serifs)
# (font ID FONTID_SERIF22X29 == 7).
# CONFIG_NXFONT_SERIF29X37
# This option enables support for a medium, 29x37 font (with serifs)
# (font ID FONTID_SERIF29X37 == 5)
# (font ID FONTID_SERIF29X37 == 8).
# CONFIG_NXFONT_SERIF38X48
# This option enables support for a large, 38x48 font (with serifs)
# (font ID FONTID_SERIF38X48 == 9).
# CONFIG_NXFONT_SERIF22X28B
# This option enables support for a small, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF22X28B == 10).
# CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF27X38B == 11).
# CONFIG_NXFONT_SERIF38X49B
# This option enables support for a large, 38x49 bold font (with serifs)
# (font ID FONTID_SERIF38X49B == 12).
#
# NX Multi-user only options:
#
@@ -828,11 +849,18 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=0xd69a
CONFIG_NXTK_BORDERCOLOR2=0xad55
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS22X29=n
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONT_SANS28X37=n
CONFIG_NXFONT_SANS22X29B=n
CONFIG_NXFONT_SANS28X37B=y
CONFIG_NXFONT_SANS40X49B=n
CONFIG_NXFONT_SERIF27X38B=n
CONFIG_NXFONT_SERIF22X29=n
CONFIG_NXFONT_SERIF29X37=n
CONFIG_NXFONT_SERIF38X48=n
CONFIG_NXFONT_SERIF22X28B=n
CONFIG_NXFONT_SERIF27X38B=n
CONFIG_NXFONT_SERIF38X49B=n
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32
@@ -1059,7 +1087,7 @@ CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
CONFIG_EXAMPLES_NXHELLO_VPLANE=0
CONFIG_EXAMPLES_NXHELLO_DEVNO=0
CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
CONFIG_EXAMPLES_NXHELLO_FONTID=2
CONFIG_EXAMPLES_NXHELLO_FONTID=5
CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf
CONFIG_EXAMPLES_NXHELLO_BPP=16
CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
configs/stm3210e-eval/nx/defconfig
+37 -9
View File
@@ -767,21 +767,42 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are
# only 7 and 8. The default is 7.
# CONFIG_NXFONT_SANS22X29
# This option enables support for a small, 22x29 san serif font
# (font ID FONTID_SANS22X29 == 1).
# CONFIG_NXFONT_SANS23X27
# This option enables support for a small, 23x27 san serif font
# (font ID FONTID_SANS23X27 == 1)
# This option enables support for a tiny, 23x27 san serif font
# (font ID FONTID_SANS23X27 == 2).
# CONFIG_NXFONT_SANS28X37
# This option enables support for a medium, 28x37 san serif font
# (font ID FONTID_SANS28X37 == 3).
# CONFIG_NXFONT_SANS22X29B
# This option enables support for a small, 22x29 san serif bold font
# (font ID FONTID_SANS22X29B == 4).
# CONFIG_NXFONT_SANS28X37B
# This option enables support for a medium, 28x37 san serif bold font
# (font ID FONTID_SANS28X37B == 2)
# (font ID FONTID_SANS28X37B == 5).
# CONFIG_NXFONT_SANS40X49B
# This option enables support for a large, 40x49 san serif bold font
# (font ID FONTID_SANS40X49B == 3)
# CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF27X38B == 4)
# (font ID FONTID_SANS40X49B == 6).
# CONFIG_NXFONT_SERIF22X29
# This option enables support for a small, 22x29 font (with serifs)
# (font ID FONTID_SERIF22X29 == 7).
# CONFIG_NXFONT_SERIF29X37
# This option enables support for a medium, 29x37 font (with serifs)
# (font ID FONTID_SERIF29X37 == 5)
# (font ID FONTID_SERIF29X37 == 8).
# CONFIG_NXFONT_SERIF38X48
# This option enables support for a large, 38x48 font (with serifs)
# (font ID FONTID_SERIF38X48 == 9).
# CONFIG_NXFONT_SERIF22X28B
# This option enables support for a small, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF22X28B == 10).
# CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF27X38B == 11).
# CONFIG_NXFONT_SERIF38X49B
# This option enables support for a large, 38x49 bold font (with serifs)
# (font ID FONTID_SERIF38X49B == 12).
#
# NX Multi-user only options:
#
@@ -815,11 +836,18 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=0xd69a
CONFIG_NXTK_BORDERCOLOR2=0xad55
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS22X29=n
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONT_SANS28X37=n
CONFIG_NXFONT_SANS22X29B=n
CONFIG_NXFONT_SANS28X37B=n
CONFIG_NXFONT_SANS40X49B=n
CONFIG_NXFONT_SERIF27X38B=n
CONFIG_NXFONT_SERIF22X29=n
CONFIG_NXFONT_SERIF29X37=n
CONFIG_NXFONT_SERIF38X48=n
CONFIG_NXFONT_SERIF22X28B=n
CONFIG_NXFONT_SERIF27X38B=n
CONFIG_NXFONT_SERIF38X49B=n
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32
configs/stm3210e-eval/nxtext/defconfig
+40 -13
View File
@@ -767,21 +767,42 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are
# only 7 and 8. The default is 7.
# CONFIG_NXFONT_SANS22X29
# This option enables support for a small, 22x29 san serif font
# (font ID FONTID_SANS22X29 == 1).
# CONFIG_NXFONT_SANS23X27
# This option enables support for a small, 23x27 san serif font
# (font ID FONTID_SANS23X27 == 1)
# This option enables support for a tiny, 23x27 san serif font
# (font ID FONTID_SANS23X27 == 2).
# CONFIG_NXFONT_SANS28X37
# This option enables support for a medium, 28x37 san serif font
# (font ID FONTID_SANS28X37 == 3).
# CONFIG_NXFONT_SANS22X29B
# This option enables support for a small, 22x29 san serif bold font
# (font ID FONTID_SANS22X29B == 4).
# CONFIG_NXFONT_SANS28X37B
# This option enables support for a medium, 28x37 san serif bold font
# (font ID FONTID_SANS28X37B == 2)
# (font ID FONTID_SANS28X37B == 5).
# CONFIG_NXFONT_SANS40X49B
# This option enables support for a large, 40x49 san serif bold font
# (font ID FONTID_SANS40X49B == 3)
# CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF27X38B == 4)
# (font ID FONTID_SANS40X49B == 6).
# CONFIG_NXFONT_SERIF22X29
# This option enables support for a small, 22x29 font (with serifs)
# (font ID FONTID_SERIF22X29 == 7).
# CONFIG_NXFONT_SERIF29X37
# This option enables support for a medium, 29x37 font (with serifs)
# (font ID FONTID_SERIF29X37 == 5)
# (font ID FONTID_SERIF29X37 == 8).
# CONFIG_NXFONT_SERIF38X48
# This option enables support for a large, 38x48 font (with serifs)
# (font ID FONTID_SERIF38X48 == 9).
# CONFIG_NXFONT_SERIF22X28B
# This option enables support for a small, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF22X28B == 10).
# CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs)
# (font ID FONTID_SERIF27X38B == 11).
# CONFIG_NXFONT_SERIF38X49B:
# This option enables support for a large, 38x49 bold font (with serifs)
# (font ID FONTID_SERIF38X49B == 12).
#
# NX Multi-user only options:
#
@@ -814,12 +835,18 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERWIDTH=4
CONFIG_NXTK_BORDERCOLOR1=0xd69a
CONFIG_NXTK_BORDERCOLOR2=0xad55
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS22X29=n
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONT_SANS28X37B=y
CONFIG_NXFONT_SANS28X37=n
CONFIG_NXFONT_SANS22X29B=n
CONFIG_NXFONT_SANS28X37B=n
CONFIG_NXFONT_SANS40X49B=n
CONFIG_NXFONT_SERIF27X38B=n
CONFIG_NXFONT_SERIF22X29=n
CONFIG_NXFONT_SERIF29X37=n
CONFIG_NXFONT_SERIF38X48=n
CONFIG_NXFONT_SERIF22X28B=y
CONFIG_NXFONT_SERIF27X38B=n
CONFIG_NXFONT_SERIF38X49B=n
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32
@@ -1061,10 +1088,10 @@ CONFIG_EXAMPLES_NXTEXT_BUILTIN=n
CONFIG_EXAMPLES_NXTEXT_VPLANE=0
CONFIG_EXAMPLES_NXTEXT_DEVNO=0
CONFIG_EXAMPLES_NXTEXT_BGCOLOR=0x0011
CONFIG_EXAMPLES_NXTEXT_BGFONTID=2
CONFIG_EXAMPLES_NXTEXT_BGFONTID=10
CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR=0xffdf
CONFIG_EXAMPLES_NXTEXT_PUCOLOR=0xfd20
CONFIG_EXAMPLES_NXTEXT_PUFONTID=1
CONFIG_EXAMPLES_NXTEXT_PUFONTID=2
CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR=0x001f
CONFIG_EXAMPLES_NXTEXT_BPP=16
CONFIG_EXAMPLES_NXTEXT_NOGETRUN=y
graphics/Makefile
+52 -5
View File
@@ -119,22 +119,69 @@ gen32bppsources:
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
genfontsources:
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
# SANS
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
ifeq ($(CONFIG_NXFONT_SANS28X37),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
# SANS-BOLD
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES)
endif
# SERIF
ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES)
endif
# SERIF-BOLD
ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES)
endif
gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
$(AOBJS): %$(OBJEXT): %.S
graphics/README.txt
+34 -12
View File
@@ -262,21 +262,43 @@ CONFIG_NXTK_AUTORAISE
CONFIG_NXFONTS_CHARBITS
The number of bits in the character set. Current options are only 7 and 8.
The default is 7.
CONFIG_NXFONT_SANS23X27:
This option enables support for a small, 23x27 san serif font
(font ID FONTID_SANS23X27 == 1)
CONFIG_NXFONT_SANS28X37B:
CONFIG_NXFONT_SANS22X29
This option enables support for a small, 22x29 san serif font
(font ID FONTID_SANS22X29 == 1).
CONFIG_NXFONT_SANS23X27
This option enables support for a tiny, 23x27 san serif font
(font ID FONTID_SANS23X27 == 2).
CONFIG_NXFONT_SANS28X37
This option enables support for a medium, 28x37 san serif font
(font ID FONTID_SANS28X37 == 3).
CONFIG_NXFONT_SANS22X29B
This option enables support for a small, 22x29 san serif bold font
(font ID FONTID_SANS22X29B == 4).
CONFIG_NXFONT_SANS28X37B
This option enables support for a medium, 28x37 san serif bold font
(font ID FONTID_SANS28X37B == 2)
CONFIG_NXFONT_SANS40X49B:
(font ID FONTID_SANS28X37B == 5).
CONFIG_NXFONT_SANS40X49B
This option enables support for a large, 40x49 san serif bold font
(font ID FONTID_SANS40X49B == 3)
CONFIG_NXFONT_SERIF27X38B:
This option enables support for a medium, 27x38 bold font (with serifs)
(font ID FONTID_SERIF27X38B == 4)
CONFIG_NXFONT_SERIF29X37:
(font ID FONTID_SANS40X49B == 6).
CONFIG_NXFONT_SERIF22X29
This option enables support for a small, 22x29 font (with serifs)
(font ID FONTID_SERIF22X29 == 7).
CONFIG_NXFONT_SERIF29X37
This option enables support for a medium, 29x37 font (with serifs)
(font ID FONTID_SERIF29X37 == 5)
(font ID FONTID_SERIF29X37 == 8).
CONFIG_NXFONT_SERIF38X48
This option enables support for a large, 38x48 font (with serifs)
(font ID FONTID_SERIF38X48 == 9).
CONFIG_NXFONT_SERIF22X28B
This option enables support for a small, 27x38 bold font (with serifs)
(font ID FONTID_SERIF22X28B == 10).
CONFIG_NXFONT_SERIF27X38B
This option enables support for a medium, 27x38 bold font (with serifs)
(font ID FONTID_SERIF27X38B == 11).
CONFIG_NXFONT_SERIF38X49B
This option enables support for a large, 38x49 bold font (with serifs)
(font ID FONTID_SERIF38X49B == 12).
NX Multi-user only options:
graphics/nxfonts/Make.defs
+45 -2
View File
@@ -41,21 +41,64 @@ NXFCONV_CSRCS = nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c \
NXFSET_ASRCS =
NXFSET_CSRCS =
# SANS
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans22x29.c
endif
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans23x27.c
endif
ifeq ($(CONFIG_NXFONT_SANS28X37),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans28x37.c
endif
# SANS-BOLD
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
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
NXFSET_CSRCS += nxfonts_bitmaps_serif27x38b.c
# SERIF
ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
NXFSET_CSRCS += nxfonts_bitmaps_serif22x29.c
endif
ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
NXFSET_CSRCS += nxfonts_bitmaps_serif29x37.c
endif
ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
NXFSET_CSRCS += nxfonts_bitmaps_serif38x48.c
endif
# SERIF-BOLD
ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
NXFSET_CSRCS += nxfonts_bitmaps_serif22x28b.c
endif
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
NXFSET_CSRCS += nxfonts_bitmaps_serif27x38b.c
endif
ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
NXFSET_CSRCS += nxfonts_bitmaps_serif38x49b.c
endif
NXFONTS_ASRCS = $(NXFCONV_ASRCS) $(NXFSET_ASRCS)
NXFONTS_CSRCS = nxfonts_getfont.c $(NXFCONV_CSRCS) $(NXFSET_CSRCS)
graphics/nxfonts/Makefile.sources
+54 -6
View File
@@ -72,25 +72,73 @@ CPPFLAGS += -DNXFONTS_SUFFIX=$(NXFONTS_SUFFIX)
endif
ifdef NXFONTS_FONTID
# SANS
ifeq ($(NXFONTS_FONTID),1)
NXFONTS_PREFIX := g_sans22x29_
GEN_CSRC = nxfonts_bitmaps_sans22x29.c
endif
ifeq ($(NXFONTS_FONTID),2)
NXFONTS_PREFIX := g_sans23x27_
GEN_CSRC = nxfonts_bitmaps_sans23x27.c
endif
ifeq ($(NXFONTS_FONTID),2)
ifeq ($(NXFONTS_FONTID),3)
NXFONTS_PREFIX := g_sans28x37_
GEN_CSRC = nxfonts_bitmaps_sans28x37.c
endif
# SANS-BOLD
ifeq ($(NXFONTS_FONTID),4)
NXFONTS_PREFIX := g_sans22x29b_
GEN_CSRC = nxfonts_bitmaps_sans22x29b.c
endif
ifeq ($(NXFONTS_FONTID),5)
NXFONTS_PREFIX := g_sans28x37b_
GEN_CSRC = nxfonts_bitmaps_sans28x37b.c
endif
ifeq ($(NXFONTS_FONTID),3)
ifeq ($(NXFONTS_FONTID),6)
NXFONTS_PREFIX := g_sans40x49b_
GEN_CSRC = nxfonts_bitmaps_sans40x49b.c
endif
ifeq ($(NXFONTS_FONTID),4)
# SERIF
ifeq ($(NXFONTS_FONTID),7)
NXFONTS_PREFIX := g_serif22x29_
GEN_CSRC = nxfonts_bitmaps_serif22x29.c
endif
ifeq ($(NXFONTS_FONTID),8)
NXFONTS_PREFIX := g_serif29x37_
GEN_CSRC = nxfonts_bitmaps_serif29x37.c
endif
ifeq ($(NXFONTS_FONTID),9)
NXFONTS_PREFIX := g_serif38x48_
GEN_CSRC = nxfonts_bitmaps_serif38x48.c
endif
# SERIF-BOLD
ifeq ($(NXFONTS_FONTID),10)
NXFONTS_PREFIX := g_serif22x28b_
GEN_CSRC = nxfonts_bitmaps_serif22x28b.c
endif
ifeq ($(NXFONTS_FONTID),11)
NXFONTS_PREFIX := g_serif27x38b_
GEN_CSRC = nxfonts_bitmaps_serif27x38b.c
endif
ifeq ($(NXFONTS_FONTID),5)
NXFONTS_PREFIX := g_serif29x37_
GEN_CSRC = nxfonts_bitmaps_serif29x37.c
ifeq ($(NXFONTS_FONTID),12)
NXFONTS_PREFIX := g_serif38x49b_
GEN_CSRC = nxfonts_bitmaps_serif38x49b.c
endif
DEPENDENCY := nxfonts_bitmaps.c
graphics/nxfonts/nxfonts_bitmaps.c
+18 -4
View File
@@ -47,15 +47,29 @@
/* Pick the fontset */
#if NXFONTS_FONTID == 1
# include "nxfonts_sans23x27.h"
# include "nxfonts_sans22x29.h"
#elif NXFONTS_FONTID == 2
# include "nxfonts_sans28x37b.h"
# include "nxfonts_sans23x27.h"
#elif NXFONTS_FONTID == 3
# include "nxfonts_sans40x49b.h"
# include "nxfonts_sans28x37.h"
#elif NXFONTS_FONTID == 4
# include "nxfonts_serif27x38b.h"
# include "nxfonts_sans22x29b.h"
#elif NXFONTS_FONTID == 5
# include "nxfonts_sans28x37b.h"
#elif NXFONTS_FONTID == 6
# include "nxfonts_sans40x49b.h"
#elif NXFONTS_FONTID == 7
# include "nxfonts_serif22x29.h"
#elif NXFONTS_FONTID == 8
# include "nxfonts_serif29x37.h"
#elif NXFONTS_FONTID == 9
# include "nxfonts_serif38x48.h"
#elif NXFONTS_FONTID == 10
# include "nxfonts_serif22x28b.h"
#elif NXFONTS_FONTID == 11
# include "nxfonts_serif27x38b.h"
#elif NXFONTS_FONTID == 12
# include "nxfonts_serif38x49b.h"
#else
# error "No font ID specified"
#endif
graphics/nxfonts/nxfonts_getfont.c
+86 -4
View File
@@ -60,39 +60,121 @@
* Private Data
****************************************************************************/
/* SANS */
#ifdef CONFIG_NXFONT_SANS22X29
extern const struct nx_fontpackage_s g_sans22x29_package;
#endif
#ifdef CONFIG_NXFONT_SANS23X27
extern const struct nx_fontpackage_s g_sans23x27_package;
#endif
#ifdef CONFIG_NXFONT_SANS28X37
extern const struct nx_fontpackage_s g_sans28x37_package;
#endif
/* SANS-BOLD */
#ifdef CONFIG_NXFONT_SANS22X29B
extern const struct nx_fontpackage_s g_sans22x29b_package;
#endif
#ifdef CONFIG_NXFONT_SANS28X37B
extern const struct nx_fontpackage_s g_sans28x37b_package;
#endif
#ifdef CONFIG_NXFONT_SANS40X49B
extern const struct nx_fontpackage_s g_sans40x49b_package;
#endif
#ifdef CONFIG_NXFONT_SERIF27X38B
extern const struct nx_fontpackage_s g_serif27x38b_package;
/* SERIF */
#ifdef CONFIG_NXFONT_SERIF22X29
extern const struct nx_fontpackage_s g_serif22x29_package;
#endif
#ifdef CONFIG_NXFONT_SERIF29X37
extern const struct nx_fontpackage_s g_serif29x37_package;
#endif
#ifdef CONFIG_NXFONT_SERIF38X48
extern const struct nx_fontpackage_s g_serif38x48_package;
#endif
/* SERIF-BOLD */
#ifdef CONFIG_NXFONT_SERIF22X28B
extern const struct nx_fontpackage_s g_serif22x28b_package;
#endif
#ifdef CONFIG_NXFONT_SERIF27X38B
extern const struct nx_fontpackage_s g_serif27x38b_package;
#endif
#ifdef CONFIG_NXFONT_SERIF38X49
extern const struct nx_fontpackage_s g_serif38x49b_package;
#endif
static FAR const struct nx_fontpackage_s *g_fontpackages[] =
{
/* SANS */
#ifdef CONFIG_NXFONT_SANS22X29
&g_sans22x29_package,
#endif
#ifdef CONFIG_NXFONT_SANS23X27
&g_sans23x27_package,
#endif
#ifdef CONFIG_NXFONT_SANS28X37
&g_sans28x37_package,
#endif
/* SANS-BOLD */
#ifdef CONFIG_NXFONT_SANS22X29B
&g_sans22x29b_package,
#endif
#ifdef CONFIG_NXFONT_SANS28X37B
&g_sans28x37b_package,
#endif
#ifdef CONFIG_NXFONT_SANS40X49B
&g_sans40x49b_package,
#endif
#ifdef CONFIG_NXFONT_SERIF27X38B
&g_serif27x38b_package,
/* SERIF */
#ifdef CONFIG_NXFONT_SERIF22X29
&g_serif22x29_package,
#endif
#ifdef CONFIG_NXFONT_SERIF29X37
&g_serif29x37_package,
#endif
#ifdef CONFIG_NXFONT_SERIF38X48
&g_serif38x48_package,
#endif
/* SERIF-BOLD */
#ifdef CONFIG_NXFONT_SERIF22X28B
&g_serif22x28b_package,
#endif
#ifdef CONFIG_NXFONT_SERIF27X38B
&g_serif27x38b_package,
#endif
#ifdef CONFIG_NXFONT_SERIF38X49B
&g_serif38x49b_package,
#endif
NULL
};
graphics/nxfonts/nxfonts_sans22x29.h
+849
View File
File diff suppressed because it is too large Load Diff
graphics/nxfonts/nxfonts_sans22x29b.h
+849
View File
File diff suppressed because it is too large Load Diff
graphics/nxfonts/nxfonts_sans28x37.h
+849
View File
File diff suppressed because it is too large Load Diff
graphics/nxfonts/nxfonts_serif22x28b.h
+849
View File
File diff suppressed because it is too large Load Diff
graphics/nxfonts/nxfonts_serif22x29.h
+849
View File
File diff suppressed because it is too large Load Diff
graphics/nxfonts/nxfonts_serif38x48.h
+849
View File
File diff suppressed because it is too large Load Diff
graphics/nxfonts/nxfonts_serif38x49b.h
+849
View File
File diff suppressed because it is too large Load Diff
include/nuttx/nx/nxfonts.h
+86 -10
View File
@@ -58,16 +58,51 @@
# define NXFONT_DEFAULT FONTID_SANS23X27
#endif
#if defined(CONFIG_NXFONT_SANS23X27)
/* SANS */
#if defined(CONFIG_NXFONT_SANS22X29)
# define NXFONT_DEFAULT FONTID_SANS22X29
#elif defined(CONFIG_NXFONT_SANS23X27)
# define NXFONT_DEFAULT FONTID_SANS23X27
#elif defined(CONFIG_NXFONT_SANS28X37)
# define NXFONT_DEFAULT FONTID_SANS28X37
/* SANS-BOLD */
#elif defined(CONFIG_NXFONT_SANS22X29B)
# define NXFONT_DEFAULT FONTID_SANS22X29B
#elif defined(CONFIG_NXFONT_SANS28X37B)
# define NXFONT_DEFAULT FONTID_SANS28X37B
#elif defined(CONFIG_NXFONT_SANS40X49B)
# define NXFONT_DEFAULT FONTID_SANS40X49B
#elif defined(CONFIG_NXFONT_SERIF27X38B)
# define NXFONT_DEFAULT FONTID_SERIF27X38B
/* SERIF */
#elif defined(CONFIG_NXFONT_SERIF22X29)
# define NXFONT_DEFAULT FONTID_SERIF22X29
#elif defined(CONFIG_NXFONT_SERIF29X37)
# define NXFONT_DEFAULT FONTID_SERIF29X37
#elif defined(CONFIG_NXFONT_SERIF38X48)
# define NXFONT_DEFAULT FONTID_SERIF38X48
/* SERIF-BOLD */
#elif defined(CONFIG_NXFONT_SERIF22X28B)
# define NXFONT_DEFAULT FONTID_SERIF22X28B
#elif defined(CONFIG_NXFONT_SERIF27X38B)
# define NXFONT_DEFAULT FONTID_SERIF27X38B
#elif defined(CONFIG_NXFONT_SERIF38X49B)
# define NXFONT_DEFAULT FONTID_SERIF38X49B
#endif
/****************************************************************************
@@ -78,21 +113,62 @@
enum nx_fontid_e
{
FONTID_DEFAULT = 0 /* The default font */
FONTID_DEFAULT = 0 /* The default font */
/* SANS */
#ifdef CONFIG_NXFONT_SANS22X29
, FONTID_SANS22X29 = 1 /* The 22x29 sans serif font */
#endif
#ifdef CONFIG_NXFONT_SANS23X27
, FONTID_SANS23X27 = 1 /* The 23x27 sans serif font */
, FONTID_SANS23X27 = 2 /* The 23x27 sans serif font */
#endif
#ifdef CONFIG_NXFONT_SANS28X37
, FONTID_SANS28X37 = 3 /* The 28x37 sans serif font */
#endif
/* SANS-BOLD */
#ifdef CONFIG_NXFONT_SANS22X29B
, FONTID_SANS22X29B = 4 /* The 22x29 sans bold font */
#endif
#ifdef CONFIG_NXFONT_SANS28X37B
, FONTID_SANS28X37B = 2 /* The 28x37 sans bold font */
, FONTID_SANS28X37B = 5 /* The 28x37 sans bold font */
#endif
#ifdef CONFIG_NXFONT_SANS40X49B
, FONTID_SANS40X49B = 3 /* The 40x49 sans bold font */
, FONTID_SANS40X49B = 6 /* The 40x49 sans bold font */
#endif
#ifdef CONFIG_NXFONT_SERIF27X38B
, FONTID_SERIF27X38B = 4 /* The 27x38 serif bold font */
/* SERIF */
#ifdef CONFIG_NXFONT_SERIF22X29
, FONTID_SERIF22X29 = 7 /* The 22x29 serif font */
#endif
#ifdef CONFIG_NXFONT_SERIF29X37
, FONTID_SERIF29X37 = 5 /* The 29x37 serif font */
, FONTID_SERIF29X37 = 8 /* The 29x37 serif font */
#endif
#ifdef CONFIG_NXFONT_SERIF38X48
, FONTID_SERIF38X48 = 9 /* The 38x48 serif font */
#endif
/* SERIF-BOLD */
#ifdef CONFIG_NXFONT_SERIF22X28B
, FONTID_SERIF22X28B = 10 /* The 22x28 serif bold font */
#endif
#ifdef CONFIG_NXFONT_SERIF27X38B
, FONTID_SERIF27X38B = 11 /* The 27x38 serif bold font */
#endif
#ifdef CONFIG_NXFONT_SERIF38X49B
, FONTID_SERIF38X49B = 12 /* The 38x49 serif bold font */
#endif
};
tools/bdf-converter.c
+12 -1
View File
@@ -396,7 +396,18 @@ static void bdf_printoutput(FILE *out,
/* Glyph general info */
fprintf(out, "/* %s (%d) */\n", ginfo->name, ginfo->encoding);
if (ginfo->bb_x_off < 0)
{
fprintf(out,
"/* %s (%d) -- NOTE: Xoffset should be %d, not 0. */\n",
ginfo->name,
ginfo->encoding,
ginfo->bb_x_off);
}
else
{
fprintf(out, "/* %s (%d) */\n", ginfo->name, ginfo->encoding);
}
/* Glyph metrics */