sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setup environment to support multiple fonts

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3799 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-07-19 20:08:28 +00:00
parent 2928511cce
commit 118a2dd458
30 changed files with 147 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Documentation/NXGraphicsSubsystem.html
View File

@ -12,7 +12,7 @@
<h1><big><font color="#3c34ec">
<i>NX Graphics Subsystem</i>
</font></big></h1>
<p>Last Updated: July 10, 2011</p>
<p>Last Updated: July 19, 2011</p>
</td>
</tr>
</table>
@ -2402,14 +2402,18 @@ struct nx_font_s
#include &lt;nuttx/nxglib.h&gt;
#include &lt;nuttx/nxfonts.h&gt;
FAR const struct nx_font_s *nxf_getfontset(void);
FAR const struct nx_font_s *nxf_getfontset(enum nx_fontid_e fontid);
</pre></ul>
<p>
<b>Description:</b>
Return information about the current font set.
</p>
<p>
<b>Input Parameters:</b> None
<b>Input Parameters:</b>
<ul><dl>
<dt><code>fontid</code>
<dd>Identifies the font set to get
</dl></ul>
</p>
<p>
<b>Returned Value:</b>
@ -2422,7 +2426,7 @@ FAR const struct nx_font_s *nxf_getfontset(void);
#include &lt;nuttx/nxglib.h&gt;
#include &lt;nuttx/nxfonts.h&gt;
FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch);
FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch, enum nx_fontid_e fontid);
</pre></ul>
<p>
<b>Description:</b>
@ -2431,8 +2435,10 @@ FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch);
<p>
<b>Input Parameters:</b>
<ul><dl>
<dt><code></code>
<dt><code>ch</code>
<dd>
<dt><code>fontid</code>
<dd>Identifies the font set to use
</dl></ul>
</p>
<p>
@ -2676,9 +2682,9 @@ 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_SANS</code>:
<dd>At present, there is only one font. But if there were were more,
then this option would select the sans serif font.
<dt><code>CONFIG_NXFONT_SANS23X27</code>:
<dd>At present, there is only one font, a 23x27 san serif font.
But if there were were more, then this option would select that sans serif font.
</dl>
</ul>

6
Documentation/NuttxPortingGuide.html
View File

@ -4476,9 +4476,9 @@ build
only 7 and 8. The default is 7.
</li>
<li>
<code>CONFIG_NXFONT_SANS</code>:
At present, there is only one font. But if there were were more,
then this option would select the sans serif font.
<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.
</li>
</ul>

7
configs/README.txt
View File

@ -973,9 +973,10 @@ 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_SANS
At present, there is only one font. But if there were were more,
then this option would select the sans serif font.
CONFIG_NXFONT_SANS23X27
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.
NX Multi-user only options:

4
configs/ez80f910200kitg/ostest/defconfig
View File

@ -572,7 +572,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -605,7 +605,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/ez80f910200zco/dhcpd/defconfig
View File

@ -580,7 +580,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -613,7 +613,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/ez80f910200zco/httpd/defconfig
View File

@ -580,7 +580,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -613,7 +613,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/ez80f910200zco/nettest/defconfig
View File

@ -580,7 +580,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -613,7 +613,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/ez80f910200zco/nsh/defconfig
View File

@ -580,7 +580,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -613,7 +613,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/ez80f910200zco/ostest/defconfig
View File

@ -575,7 +575,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -608,7 +608,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/ez80f910200zco/poll/defconfig
View File

@ -580,7 +580,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -613,7 +613,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/lm3s6965-ek/nx/defconfig
View File

@ -548,7 +548,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
# CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are
# only 7 and 8. The default is 7.
# CONFIG_NXFONT_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -584,7 +584,7 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=8
CONFIG_NXTK_BORDERCOLOR2=4
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/lm3s8962-ek/nx/defconfig
View File

@ -548,7 +548,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
# CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are
# only 7 and 8. The default is 7.
# CONFIG_NXFONT_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -584,7 +584,7 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=8
CONFIG_NXTK_BORDERCOLOR2=4
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/lpcxpresso-lpc1768/nx/defconfig
View File

@ -759,7 +759,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -795,7 +795,7 @@ CONFIG_NXTK_BORDERWIDTH=2
CONFIG_NXTK_BORDERCOLOR1=1
CONFIG_NXTK_BORDERCOLOR2=0
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/olimex-lpc1766stk/nx/defconfig
View File

@ -739,7 +739,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -775,7 +775,7 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=8
CONFIG_NXTK_BORDERCOLOR2=4
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/sam3u-ek/knsh/defconfig
View File

@ -702,7 +702,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -738,7 +738,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/sam3u-ek/nsh/defconfig
View File

@ -672,7 +672,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -708,7 +708,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/sam3u-ek/nx/defconfig
View File

@ -681,7 +681,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -717,7 +717,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/sim/nx/defconfig
View File

@ -369,7 +369,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
# CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are
# only 7 and 8. The default is 7.
# CONFIG_NXFONT_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -402,7 +402,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/sim/nx/defconfig-x11
View File

@ -369,7 +369,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
# CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are
# only 7 and 8. The default is 7.
# CONFIG_NXFONT_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -402,7 +402,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERCOLOR1
#CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/stm3210e-eval/nsh2/defconfig
View File

@ -775,7 +775,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -811,7 +811,7 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=0xd69a
CONFIG_NXTK_BORDERCOLOR2=0xad55
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/stm3210e-eval/nx/defconfig
View File

@ -767,7 +767,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -803,7 +803,7 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=0xd69a
CONFIG_NXTK_BORDERCOLOR2=0xad55
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

4
configs/stm3210e-eval/nxtext/defconfig
View File

@ -767,7 +767,7 @@ 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_SANS
# CONFIG_NXFONT_SANS23X27
# At present, there is only one font. But if there were were more,
# then this option would select the sans serif font.
#
@ -803,7 +803,7 @@ CONFIG_NX_KBD=y
CONFIG_NXTK_BORDERCOLOR1=0xd69a
CONFIG_NXTK_BORDERCOLOR2=0xad55
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONTS_CHARBITS=7
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32

6
graphics/README.txt
View File

@ -118,9 +118,9 @@ 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_SANS
At present, there is only one font. But if there were were more, then this
option would select the sans serif font.
CONFIG_NXFONT_SANS23X27
At present, there is only one font, a 23x27 sans serif fount. But if
there were were more, then this option would select that sans serif font.
NX Multi-user only options:

8
graphics/nxfonts/nxfonts_bitmaps.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxfonts/nxfonts_bitmap.h
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -46,10 +46,10 @@
/* Pick the fontset */
#ifdef CONFIG_NXFONT_SANS
# include "nxfonts_sans.h"
#ifdef CONFIG_NXFONT_SANS23X27
# include "nxfonts_sans23x27.h"
#else
# include "nxfonts_sans.h"
# include "nxfonts_sans23x27.h"
#endif
/****************************************************************************

18
graphics/nxfonts/nxfonts_getfont.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxfonts/nxfonts_getfont.h
* graphics/nxfonts/nxfonts_getfont.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -51,6 +51,10 @@
* Pre-Processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
@ -115,11 +119,11 @@ static inline FAR const struct nx_fontset_s *nxf_getglyphset(uint16_t ch)
* Return information about the current font set
*
* Input Parameters:
* None
* fontid: Identifies the font set to get
*
****************************************************************************/
FAR const struct nx_font_s *nxf_getfontset(void)
FAR const struct nx_font_s *nxf_getfontset(enum nx_fontid_e fontid)
{
return &g_fonts;
}
@ -131,11 +135,13 @@ FAR const struct nx_font_s *nxf_getfontset(void)
* Return font bitmap information for the selected character encoding.
*
* Input Parameters:
* ch - character code
* ch: Character code
* fontid: Identifies the font set to use
*
****************************************************************************/
FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch)
FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch,
enum nx_fontid_e fontid)
{
FAR const struct nx_fontset_s *set = nxf_getglyphset(ch);
FAR const struct nx_fontbitmap_s *bm = NULL;

4
graphics/nxfonts/nxfonts_internal.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxfonts/nxfonts_internal.h
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -56,7 +56,7 @@
/* Only font supported for now */
#define CONFIG_NXFONT_SANS 1
#define CONFIG_NXFONT_SANS23X27 1
/****************************************************************************
* Public Types

26
graphics/nxfonts/nxfonts_sans.h → graphics/nxfonts/nxfonts_sans23x27.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxfonts/nxfonts_sans.h
* graphics/nxfonts/nxfonts_sans23x27.h
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS_H
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS23X27_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS23X27_H
/****************************************************************************
* Included Files
@ -44,18 +44,22 @@
* Pre-Processor Definitions
****************************************************************************/
/* Font ID */
#define NXFONT_ID FONTID_SANS23X27
/* Ranges of 7-bit and 8-bit fonts */
#define NXFONT_MIN7BIT 33
#define NXFONT_MAX7BIT 126
#define NXFONT_MIN7BIT 33
#define NXFONT_MAX7BIT 126
#define NXFONT_MIN8BIT 161
#define NXFONT_MAX8BIT 255
#define NXFONT_MIN8BIT 161
#define NXFONT_MAX8BIT 255
/* Maximum height and width of any glyph in the set */
#define NXFONT_MAXHEIGHT 23
#define NXFONT_MAXWIDTH 27
#define NXFONT_MAXHEIGHT 23
#define NXFONT_MAXWIDTH 27
/* The width of a space */
@ -852,5 +856,5 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS_H */
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS23X27_H */

65
include/nuttx/nxfonts.h
View File

@ -48,20 +48,37 @@
/****************************************************************************
* Pre-processor definitions
****************************************************************************/
/* Select the default font. If no fonts are select, then a compilation error
* is likely down the road.
*/
#ifdef CONFIG_NXFONT_SANS23X27
# define NXFONT_DEFAULT FONTID_SANS23X27
#endif
/****************************************************************************
* Public Types
****************************************************************************/
/* Font IDs */
enum nx_fontid_e
{
FONTID_DEFAULT = 0 /* The default font */
#ifdef CONFIG_NXFONT_SANS23X27
, FONTID_SANS23X27 /* The 23x27 sans serif font */
#endif
};
/* This structures provides the metrics for one glyph */
struct nx_fontmetric_s
{
uint32_t stride : 2; /* Width of one font row in bytes */
uint32_t width : 6; /* Width of the font in bits */
uint32_t height : 6; /* Height of the font in rows */
uint32_t xoffset : 6; /* Top, left-hand corner X-offset in pixels */
uint32_t yoffset : 6; /* Top, left-hand corner y-offset in pixels */
uint32_t stride : 2; /* Width of one font row in bytes */
uint32_t width : 6; /* Width of the font in bits */
uint32_t height : 6; /* Height of the font in rows */
uint32_t xoffset : 6; /* Top, left-hand corner X-offset in pixels */
uint32_t yoffset : 6; /* Top, left-hand corner y-offset in pixels */
uint32_t unused : 6;
};
@ -70,7 +87,7 @@ struct nx_fontmetric_s
struct nx_fontbitmap_s
{
struct nx_fontmetric_s metric; /* Character metrics */
FAR const uint8_t *bitmap; /* Pointer to the character bitmap */
FAR const uint8_t *bitmap; /* Pointer to the character bitmap */
};
/* This structure describes one contiguous grouping of glyphs that
@ -80,19 +97,31 @@ struct nx_fontbitmap_s
struct nx_fontset_s
{
uint8_t first; /* First bitmap character code */
uint8_t nchars; /* Number of bitmap character codes */
uint8_t first; /* First bitmap character code */
uint8_t nchars; /* Number of bitmap character codes */
FAR const struct nx_fontbitmap_s *bitmap;
};
/* This structure describes the overall fontset */
/* This structure describes the overall metrics of the fontset */
struct nx_font_s
{
uint8_t mxheight; /* Max height of one glyph in rows */
uint8_t mxwidth; /* Max width of any glyph in pixels */
uint8_t mxbits; /* Max number of bits per character code */
uint8_t spwidth; /* The width of a space in pixels */
uint8_t mxheight; /* Max height of one glyph in rows */
uint8_t mxwidth; /* Max width of any glyph in pixels */
uint8_t mxbits; /* Max number of bits per character code */
uint8_t spwidth; /* The width of a space in pixels */
};
/* Finally, this structure defines everything about the font set */
struct nx_fontpackage_s
{
uint8_t id; /* The font ID */
struct nx_font_s metrics; /* Font set metrics */
struct nx_fontset_s font7; /* Fonts for 7-bit encoding */
#if CONFIG_NXFONTS_CHARBITS >= 8
struct nx_fontset_s font8; /* Fonts for 8-bit encoding */
#endif
};
/****************************************************************************
@ -118,11 +147,11 @@ extern "C" {
* Return information about the current font set
*
* Input Parameters:
* An instance of struct nx_font_s describing the font set.
* fontid: Identifies the font set to get
*
****************************************************************************/
EXTERN FAR const struct nx_font_s *nxf_getfontset(void);
EXTERN FAR const struct nx_font_s *nxf_getfontset(enum nx_fontid_e fontid);
/****************************************************************************
* Name: nxf_getbitmap
@ -131,14 +160,16 @@ EXTERN FAR const struct nx_font_s *nxf_getfontset(void);
* Return font bitmap information for the selected character encoding.
*
* Input Parameters:
* ch - character code
* ch: Character code
* fontid: Identifies the font set to use
*
* Returned Value:
* An instance of struct nx_fontbitmap_s describing the glyph.
*
****************************************************************************/
EXTERN FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch);
EXTERN FAR const struct nx_fontbitmap_s *
nxf_getbitmap(uint16_t ch, enum nx_fontid_e fontid);
/****************************************************************************
* Name: nxf_convert_*bpp

2
include/nuttx/sched.h
View File

@ -105,7 +105,7 @@ enum tstate_e
TSTATE_WAIT_MQNOTFULL, /* BLOCKED - Waiting for a MQ to become not full. */
#endif
#ifdef CONFIG_PAGING
TSTATE_WAIT_PAGEFILL, /* BLOCKED - Waiting for page fill */
TSTATE_WAIT_PAGEFILL, /* BLOCKED - Waiting for page fill */
#endif
NUM_TASK_STATES /* Must be last */
};

4
sched/sem_timedwait.c
View File

@ -271,7 +271,9 @@ int sem_timedwait(FAR sem_t *sem, FAR const struct timespec *abstime)
wd_delete(wdog);
/* We are either returning success or an error detected by sem_wait()
* or the timeout detected by sem_timeout().
* or the timeout detected by sem_timeout(). The 'errno' value has
* been set appropriately by sem_wait() or sem_timeout() in those
* cases.
*/
return ret;