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

Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM*

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-20 14:18:08 -06:00
parent be84c048c9
commit 0b67b111ae
55 changed files with 281 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/NXGraphicsSubsystem.html
View File

@ -3375,7 +3375,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
<p>General NxConsole settings.</p>
<ul>
<dl>
<dt><code>CONFIG_NXCONSOLE</code>:
<dt><code>CONFIG_NXTERM</code>:
<dd>Enables building of the NxConsole driver.
</dl>
</ul>
@ -3383,17 +3383,17 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
<p>NxConsole output text/graphics options:</p>
<ul>
<dl>
<dt><code>CONFIG_NXCONSOLE_BPP</code>:
<dt><code>CONFIG_NXTERM_BPP</code>:
<dd>Currently, NxConsole supports only a single pixel depth.
This configuration setting must be provided to support that single pixel depth.
Default: The smallest enabled pixel depth. (see <code>CONFIG_NX_DISABLE_*BPP</code>)
<dt><code>CONFIG_NXCONSOLE_CURSORCHAR</code>:
<dt><code>CONFIG_NXTERM_CURSORCHAR</code>:
<dd>The bitmap code to use as the cursor. Default '_'
<dt><code>CONFIG_NXCONSOLE_MXCHARS</code>:
<dt><code>CONFIG_NXTERM_MXCHARS</code>:
<dd>NxConsole needs to remember every character written to the console so that it can redraw the window.
This setting determines the size of some internal memory allocations used to hold the character data.
Default: 128.
<dt><code>CONFIG_NXCONSOLE_CACHESIZE</code>:
<dt><code>CONFIG_NXTERM_CACHESIZE</code>:
<dd>
NxConsole supports caching of rendered fonts.
This font caching is required for two reasons:
@ -3401,20 +3401,20 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
(2) it preserves the font memory.
Since the NX server runs on a separate server thread, it requires that the rendered font memory persist until the server has a chance to render the font.
Unfortunately, the font cache would be quite large if all fonts were saved.
The <code>CONFIG_NXCONSOLE_CACHESIZE</code> setting will control the size of the font cache (in number of glyphs).
The <code>CONFIG_NXTERM_CACHESIZE</code> setting will control the size of the font cache (in number of glyphs).
Only that number of the most recently used glyphs will be retained.
Default: 16.
<blockquote>
NOTE: There can still be a race condition between the NxConsole driver and the
NX task. If you every see character corruption (especially when printing
a lot of data or scrolling), then increasing the value of <code>CONFIG_NXCONSOLE_CACHESIZE</code>
a lot of data or scrolling), then increasing the value of <code>CONFIG_NXTERM_CACHESIZE</code>
is something that you should try.
Alternatively, you can reduce the size of <code>CONFIG_MQ_MAXMSGSIZE</code> which will force NxConsole task to pace the server task.
<code>CONFIG_NXCONSOLE_CACHESIZE</code> should be larger than <code>CONFIG_MQ_MAXMSGSIZE</code> in any event.
<code>CONFIG_NXTERM_CACHESIZE</code> should be larger than <code>CONFIG_MQ_MAXMSGSIZE</code> in any event.
</blockquote>
<dt><code>CONFIG_NXCONSOLE_LINESEPARATION</code>:
<dt><code>CONFIG_NXTERM_LINESEPARATION</code>:
<dd>This the space (in rows) between each row of test. Default: 0
<dt><code>CONFIG_NXCONSOLE_NOWRAP</code>:
<dt><code>CONFIG_NXTERM_NOWRAP</code>:
<dd>By default, lines will wrap when the test reaches the right hand side of the window.
This setting can be defining to change this behavior so that the text is simply truncated until a new line is encountered.
</dl>
@ -3423,15 +3423,15 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
<p>NxConsole input options:</p>
<ul>
<dl>
<dt><code>CONFIG_NXCONSOLE_NXKBDIN</code>:
<dt><code>CONFIG_NXTERM_NXKBDIN</code>:
<dd>Take input from the NX keyboard input callback.
By default, keyboard input is taken from stdin (<code>/dev/console</code>).
If this option is set, then the interface<code>nxcon_kdbin()</code> is enabled.
That interface may be driven by window callback functions so that keyboard input <i>only</i> goes to the top window.
<dt><code>CONFIG__NXCONSOLE_KBDBUFSIZE</code>:
<dd>If <code>CONFIG_NXCONSOLE_NXKBDIN</code> is enabled, then this value may be used to
<dd>If <code>CONFIG_NXTERM_NXKBDIN</code> is enabled, then this value may be used to
define the size of the per-window keyboard input buffer. Default: 16
<dt><code>CONFIG_NXCONSOLE_NPOLLWAITERS</code>:
<dt><code>CONFIG_NXTERM_NPOLLWAITERS</code>:
<dd>The number of threads that can be waiting for read data available.
Default: 4
</dl>

2
TODO
View File

@ -1228,7 +1228,7 @@ o Graphics subystem (graphics/)
Title: IMPROVED NXCONSOLE FONT CACHING
Description: Now each NxConsole instance has its own private font cache
whose size is determined by CONFIG_NXCONSOLE_MXCHARS. If there
whose size is determined by CONFIG_NXTERM_MXCHARS. If there
are multiple NxConsole instances using the same font, each will
have a separate font cache. This is inefficient and wasteful
of memory: Each NxConsole instance should share a common font

2
configs/compal_e99/nsh_highram/defconfig
View File

@ -442,7 +442,7 @@ CONFIG_NXFONT_SANS17X22=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/hymini-stm32v/nsh2/defconfig
View File

@ -574,7 +574,7 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

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

@ -501,7 +501,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

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

@ -509,7 +509,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

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

@ -562,7 +562,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/maple/nx/defconfig
View File

@ -656,7 +656,7 @@ CONFIG_NXFONT_MONO5X8=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/mikroe-stm32f4/fulldemo/defconfig
View File

@ -795,24 +795,24 @@ CONFIG_NXFONT_SANS28X37B=y
CONFIG_NXFONT_SERIF22X28B=y
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=128
CONFIG_NXCONSOLE_CACHESIZE=16
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=128
CONFIG_NXTERM_CACHESIZE=16
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
# CONFIG_NXCONSOLE_NXKBDIN is not set
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
# CONFIG_NXTERM_NXKBDIN is not set
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

2
configs/mikroe-stm32f4/nx/defconfig
View File

@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7
CONFIG_NXFONT_SERIF22X28B=y
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/mikroe-stm32f4/nxlines/defconfig
View File

@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7
CONFIG_NXFONT_SERIF22X28B=y
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/mikroe-stm32f4/nxtext/defconfig
View File

@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7
CONFIG_NXFONT_SERIF22X28B=y
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

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

@ -573,7 +573,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/open1788/nxlines/defconfig
View File

@ -483,7 +483,7 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

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

@ -542,7 +542,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/sam3u-ek/nxwm/defconfig
View File

@ -571,24 +571,24 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=325
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=325
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
CONFIG_NXCONSOLE_NXKBDIN=y
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
CONFIG_NXTERM_NXKBDIN=y
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

20
configs/sam4e-ek/nxwm/defconfig
View File

@ -832,24 +832,24 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=396
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=396
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
CONFIG_NXCONSOLE_NXKBDIN=y
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
CONFIG_NXTERM_NXKBDIN=y
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

2
configs/sama5d3x-ek/nx/defconfig
View File

@ -641,7 +641,7 @@ CONFIG_NXFONTS_CHARBITS=7
CONFIG_NXFONT_SERIF22X28B=y
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/sama5d3x-ek/nxwm/defconfig
View File

@ -685,24 +685,24 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=640
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=640
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
CONFIG_NXCONSOLE_NXKBDIN=y
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
CONFIG_NXTERM_NXKBDIN=y
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

2
configs/sama5d4-ek/nsh/defconfig
View File

@ -955,7 +955,7 @@ CONFIG_NXFONTS_CHARBITS=7
CONFIG_NXFONT_SERIF22X28B=y
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/sama5d4-ek/nxwm/defconfig
View File

@ -919,24 +919,24 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=640
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=640
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
CONFIG_NXCONSOLE_NXKBDIN=y
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
CONFIG_NXTERM_NXKBDIN=y
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

20
configs/shenzhou/nxwm/defconfig
View File

@ -734,24 +734,24 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=325
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=325
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
CONFIG_NXCONSOLE_NXKBDIN=y
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
CONFIG_NXTERM_NXKBDIN=y
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

4
configs/sim/README.txt
View File

@ -459,8 +459,8 @@ nx11
First, select Multi-User mode as described above. Then add the
following definitions to the defconfig file:
-CONFIG_NXCONSOLE=n
+CONFIG_NXCONSOLE=y
-CONFIG_NXTERM=n
+CONFIG_NXTERM=y
-CONFIG_NX_MULTIUSER=n
+CONFIG_NX_MULTIUSER=y

2
configs/sim/nsh2/defconfig
View File

@ -351,7 +351,7 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/sim/nx/defconfig
View File

@ -376,7 +376,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/sim/nx11/defconfig
View File

@ -377,7 +377,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/sim/nxlines/defconfig
View File

@ -376,7 +376,7 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/sim/nxwm/defconfig
View File

@ -367,24 +367,24 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=32
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=256
CONFIG_NXCONSOLE_CACHESIZE=16
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=32
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=256
CONFIG_NXTERM_CACHESIZE=16
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
# CONFIG_NXCONSOLE_NXKBDIN is not set
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
# CONFIG_NXTERM_NXKBDIN is not set
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

2
configs/sim/touchscreen/defconfig
View File

@ -385,7 +385,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/stm3210e-eval/README.txt
View File

@ -926,7 +926,7 @@ Where <subdir> is one of the following:
The following definition in the defconfig file to enables the NxConsole
driver:
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
And this selects apps/examples/nxconsole instead of apps/examples/nsh:

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

@ -752,7 +752,7 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

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

@ -678,7 +678,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/stm3210e-eval/nxconsole/defconfig
View File

@ -655,24 +655,24 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=256
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=256
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
# CONFIG_NXCONSOLE_NXKBDIN is not set
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
# CONFIG_NXTERM_NXKBDIN is not set
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

2
configs/stm3210e-eval/pm/defconfig
View File

@ -676,7 +676,7 @@ CONFIG_NXFONT_SANS28X37B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/stm3220g-eval/nxwm/defconfig
View File

@ -788,24 +788,24 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=325
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=325
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
CONFIG_NXCONSOLE_NXKBDIN=y
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
CONFIG_NXTERM_NXKBDIN=y
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

2
configs/stm3240g-eval/README.txt
View File

@ -1424,7 +1424,7 @@ Where <subdir> is one of the following:
The following definition in the defconfig file to enables the NxConsole
driver:
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
And this selects examples/nxconsole instead of examples/nsh:

2
configs/stm3240g-eval/knxwm/defconfig
View File

@ -788,7 +788,7 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

20
configs/stm3240g-eval/nxconsole/defconfig
View File

@ -761,24 +761,24 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=256
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=256
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
# CONFIG_NXCONSOLE_NXKBDIN is not set
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
# CONFIG_NXTERM_NXKBDIN is not set
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

20
configs/stm3240g-eval/nxwm/defconfig
View File

@ -783,24 +783,24 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
#
# NxConsole Output Text/Graphics Options
#
CONFIG_NXCONSOLE_BPP=16
CONFIG_NXCONSOLE_CURSORCHAR=137
CONFIG_NXCONSOLE_MXCHARS=325
CONFIG_NXCONSOLE_CACHESIZE=32
CONFIG_NXCONSOLE_LINESEPARATION=0
# CONFIG_NXCONSOLE_NOWRAP is not set
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_MXCHARS=325
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0
# CONFIG_NXTERM_NOWRAP is not set
#
# NxConsole Input options
#
CONFIG_NXCONSOLE_NXKBDIN=y
CONFIG_NXCONSOLE_KBDBUFSIZE=16
CONFIG_NXCONSOLE_NPOLLWAITERS=4
CONFIG_NXTERM_NXKBDIN=y
CONFIG_NXTERM_KBDBUFSIZE=16
CONFIG_NXTERM_NPOLLWAITERS=4
#
# NX Multi-user only options

2
configs/stm32f4discovery/nxlines/defconfig
View File

@ -664,7 +664,7 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/zkit-arm-1769/nxhello/defconfig
View File

@ -667,7 +667,7 @@ CONFIG_NXFONT_SANS23X27=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

2
configs/zp214xpa/nxlines/defconfig
View File

@ -378,7 +378,7 @@ CONFIG_NXFONT_MONO5X8=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
# CONFIG_NXCONSOLE is not set
# CONFIG_NXTERM is not set
#
# NX Multi-user only options

32
graphics/Kconfig
View File

@ -357,17 +357,17 @@ config NXFONT_SERIF38X49B
endmenu
menuconfig NXCONSOLE
menuconfig NXTERM
bool "NxConsole"
default n
---help---
Enables building of the NxConsole driver.
if NXCONSOLE
if NXTERM
comment "NxConsole Output Text/Graphics Options"
config NXCONSOLE_BPP
config NXTERM_BPP
int "NxConsole BPP"
default 1 if !NX_DISABLE_1BPP
default 2 if !NX_DISABLE_2BPP
@ -381,13 +381,13 @@ config NXCONSOLE_BPP
configuration setting must be provided to support that single pixel depth.
Default: The smallest enabled pixel depth. (see NX_DISABLE_*BPP)
config NXCONSOLE_CURSORCHAR
config NXTERM_CURSORCHAR
int "Character code to use as the cursor"
default 137
---help---
The bitmap code to use as the cursor. Default '_' (137)
config NXCONSOLE_MXCHARS
config NXTERM_MXCHARS
int "Max Characters on Display"
default 128
---help---
@ -395,7 +395,7 @@ config NXCONSOLE_MXCHARS
that it can redraw the window. This setting determines the size of some
internal memory allocations used to hold the character data. Default: 128.
config NXCONSOLE_CACHESIZE
config NXTERM_CACHESIZE
int "Font Cache Size"
default 16
---help---
@ -404,23 +404,23 @@ config NXCONSOLE_CACHESIZE
importantly (2) it preserves the font memory. Since the NX server runs on
a separate server thread, it requires that the rendered font memory persist
until the server has a chance to render the font. Unfortunately, the font
cache would be quite large if all fonts were saved. The NXCONSOLE_CACHESIZE
cache would be quite large if all fonts were saved. The NXTERM_CACHESIZE
setting will control the size of the font cache (in number of glyphs). Only that
number of the most recently used glyphs will be retained. Default: 16.
NOTE: There can still be a race condition between the NxConsole driver and the
NX task. If you every see character corruption (especially when printing
a lot of data or scrolling), then increasing the value of NXCONSOLE_CACHESIZE
a lot of data or scrolling), then increasing the value of NXTERM_CACHESIZE
is something that you should try. Alternatively, you can reduce the size of
MQ_MAXMSGSIZE which will force NxConsole task to pace the server task.
NXCONSOLE_CACHESIZE should be larger than MQ_MAXMSGSIZE in any event.
NXTERM_CACHESIZE should be larger than MQ_MAXMSGSIZE in any event.
config NXCONSOLE_LINESEPARATION
config NXTERM_LINESEPARATION
int "Line Separation"
default 0
---help---
This the space (in rows) between each row of test. Default: 0
config NXCONSOLE_NOWRAP
config NXTERM_NOWRAP
bool "No wrap"
default n
---help---
@ -430,7 +430,7 @@ config NXCONSOLE_NOWRAP
comment "NxConsole Input options"
config NXCONSOLE_NXKBDIN
config NXTERM_NXKBDIN
bool "NX KBD input"
default n
---help---
@ -440,21 +440,21 @@ config NXCONSOLE_NXKBDIN
by window callback functions so that keyboard input *only* goes to the
top window.
config NXCONSOLE_KBDBUFSIZE
config NXTERM_KBDBUFSIZE
int "Keyboard Input Buffer Size"
default 16
---help---
If NXCONSOLE_NXKBDIN is enabled, then this value may be used to
If NXTERM_NXKBDIN is enabled, then this value may be used to
define the size of the per-window keyboard input buffer. Default: 16
config NXCONSOLE_NPOLLWAITERS
config NXTERM_NPOLLWAITERS
int "Number of Poll Waiters"
default 4
---help---
The number of threads that can be waiting for read data available.
Default: 4
endif # NXCONSOLE
endif # NXTERM
comment "NX Multi-user only options"

2
graphics/Makefile
View File

@ -59,7 +59,7 @@ DEPPATH += --dep-path nxsu
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxsu}
endif
ifeq ($(CONFIG_NXCONSOLE),y)
ifeq ($(CONFIG_NXTERM),y)
include nxconsole/Make.defs
DEPPATH += --dep-path nxconsole
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxconsole}

26
graphics/README.txt
View File

@ -354,55 +354,55 @@ CONFIG_NXFONT_SERIF38X49B
NxConsole Configuration Settings
--------------------------------
CONFIG_NXCONSOLE
CONFIG_NXTERM
Enables building of the NxConsole driver.
NxConsole output text/graphics options:
CONFIG_NXCONSOLE_BPP
CONFIG_NXTERM_BPP
Currently, NxConsole supports only a single pixel depth. This
configuration setting must be provided to support that single pixel depth.
Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP)
CONFIG_NXCONSOLE_CURSORCHAR
CONFIG_NXTERM_CURSORCHAR
The bitmap code to use as the cursor. Default '_'
CONFIG_NXCONSOLE_MXCHARS
CONFIG_NXTERM_MXCHARS
NxConsole needs to remember every character written to the console so
that it can redraw the window. This setting determines the size of some
internal memory allocations used to hold the character data. Default: 128.
CONFIG_NXCONSOLE_CACHESIZE
CONFIG_NXTERM_CACHESIZE
NxConsole supports caching of rendered fonts. This font caching is required
for two reasons: (1) First, it improves text performance, but more
importantly (2) it preserves the font memory. Since the NX server runs on
a separate server thread, it requires that the rendered font memory persist
until the server has a chance to render the font. Unfortunately, the font
cache would be quite large if all fonts were saved. The CONFIG_NXCONSOLE_CACHESIZE
cache would be quite large if all fonts were saved. The CONFIG_NXTERM_CACHESIZE
setting will control the size of the font cache (in number of glyphs). Only that
number of the most recently used glyphs will be retained. Default: 16.
NOTE: There can still be a race condition between the NxConsole driver and the
NX task. If you every see character corruption (especially when printing
a lot of data or scrolling), then increasing the value of CONFIG_NXCONSOLE_CACHESIZE
a lot of data or scrolling), then increasing the value of CONFIG_NXTERM_CACHESIZE
is something that you should try. Alternatively, you can reduce the size of
CONFIG_MQ_MAXMSGSIZE which will force NxConsole task to pace the server task.
CONFIG_NXCONSOLE_CACHESIZE should be larger than CONFIG_MQ_MAXMSGSIZE in any event.
CONFIG_NXCONSOLE_LINESEPARATION
CONFIG_NXTERM_CACHESIZE should be larger than CONFIG_MQ_MAXMSGSIZE in any event.
CONFIG_NXTERM_LINESEPARATION
This the space (in rows) between each row of test. Default: 0
CONFIG_NXCONSOLE_NOWRAP
CONFIG_NXTERM_NOWRAP
By default, lines will wrap when the test reaches the right hand side
of the window. This setting can be defining to change this behavior so
that the text is simply truncated until a new line is encountered.
NxConsole Input options
CONFIG_NXCONSOLE_NXKBDIN
CONFIG_NXTERM_NXKBDIN
Take input from the NX keyboard input callback. By default, keyboard
input is taken from stdin (/dev/console). If this option is set, then
the interface nxcon_kdbin() is enabled. That interface may be driven
by window callback functions so that keyboard input *only* goes to the
top window.
CONFIG__NXCONSOLE_KBDBUFSIZE
If CONFIG_NXCONSOLE_NXKBDIN is enabled, then this value may be used to
If CONFIG_NXTERM_NXKBDIN is enabled, then this value may be used to
define the size of the per-window keyboard input buffer. Default: 16
CONFIG_NXCONSOLE_NPOLLWAITERS
CONFIG_NXTERM_NPOLLWAITERS
The number of threads that can be waiting for read data available.
Default: 4

2
graphics/nxconsole/Make.defs
View File

@ -39,7 +39,7 @@ NXCON_CSRCS += nxcon_redraw.c nxcon_register.c nxcon_scroll.c
NXCON_CSRCS += nxcon_vt100.c nxcon_unregister.c nxtk_register.c
NXCON_CSRCS += nxtool_register.c
ifeq ($(CONFIG_NXCONSOLE_NXKBDIN),y)
ifeq ($(CONFIG_NXTERM_NXKBDIN),y)
NXCON_CSRCS += nxcon_kbdin.c
endif

8
graphics/nxconsole/nxcon_driver.c
View File

@ -64,7 +64,7 @@ static ssize_t nxcon_write(FAR struct file *filep, FAR const char *buffer,
****************************************************************************/
/* This is the common NX driver file operations */
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
const struct file_operations g_nxcon_drvrops =
{
@ -80,7 +80,7 @@ const struct file_operations g_nxcon_drvrops =
#endif
};
#else /* CONFIG_NXCONSOLE_NXKBDIN */
#else /* CONFIG_NXTERM_NXKBDIN */
const struct file_operations g_nxcon_drvrops =
{
@ -96,7 +96,7 @@ const struct file_operations g_nxcon_drvrops =
#endif
};
#endif /* CONFIG_NXCONSOLE_NXKBDIN */
#endif /* CONFIG_NXTERM_NXKBDIN */
/****************************************************************************
* Private Data
@ -125,7 +125,7 @@ static int nxcon_open(FAR struct file *filep)
/* Verify that the driver is opened for write-only access */
#ifndef CONFIG_NXCONSOLE_NXKBDIN
#ifndef CONFIG_NXTERM_NXKBDIN
if ((filep->f_oflags & O_RDOK) != 0)
{
gdbg("ERROR: Attempted open with read access\n");

38
graphics/nxconsole/nxcon_font.c
View File

@ -56,22 +56,22 @@
* pixel depths that are not directly addressable (1,2,4, and 24).
*/
#if CONFIG_NXCONSOLE_BPP == 1
#if CONFIG_NXTERM_BPP == 1
# define RENDERER nxf_convert_1bpp
#elif CONFIG_NXCONSOLE_BPP == 2
#elif CONFIG_NXTERM_BPP == 2
# define RENDERER nxf_convert_2bpp
#elif CONFIG_NXCONSOLE_BPP == 4
#elif CONFIG_NXTERM_BPP == 4
# define RENDERER nxf_convert_4bpp
#elif CONFIG_NXCONSOLE_BPP == 8
#elif CONFIG_NXTERM_BPP == 8
# define RENDERER nxf_convert_8bpp
#elif CONFIG_NXCONSOLE_BPP == 16
#elif CONFIG_NXTERM_BPP == 16
# define RENDERER nxf_convert_16bpp
#elif CONFIG_NXCONSOLE_BPP == 24
#elif CONFIG_NXTERM_BPP == 24
# define RENDERER nxf_convert_24bpp
#elif CONFIG_NXCONSOLE_BPP == 32
#elif CONFIG_NXTERM_BPP == 32
# define RENDERER nxf_convert_32bpp
#else
# error "Unsupported CONFIG_NXCONSOLE_BPP"
# error "Unsupported CONFIG_NXTERM_BPP"
#endif
/****************************************************************************
@ -219,7 +219,7 @@ nxcon_renderglyph(FAR struct nxcon_state_s *priv,
{
FAR struct nxcon_glyph_s *glyph = NULL;
FAR nxgl_mxpixel_t *ptr;
#if CONFIG_NXCONSOLE_BPP < 8
#if CONFIG_NXTERM_BPP < 8
nxgl_mxpixel_t pixel;
#endif
int bmsize;
@ -239,7 +239,7 @@ nxcon_renderglyph(FAR struct nxcon_state_s *priv,
/* Get the physical width of the glyph in bytes */
glyph->stride = (glyph->width * CONFIG_NXCONSOLE_BPP + 7) / 8;
glyph->stride = (glyph->width * CONFIG_NXTERM_BPP + 7) / 8;
/* Allocate memory to hold the glyph with its offsets */
@ -256,10 +256,10 @@ nxcon_renderglyph(FAR struct nxcon_state_s *priv,
* differing BPP's as well.
*/
#if CONFIG_NXCONSOLE_BPP < 8
#if CONFIG_NXTERM_BPP < 8
pixel = priv->wndo.wcolor[0];
# if CONFIG_NXCONSOLE_BPP == 1
# if CONFIG_NXTERM_BPP == 1
/* Pack 1-bit pixels into a 2-bits */
@ -267,7 +267,7 @@ nxcon_renderglyph(FAR struct nxcon_state_s *priv,
pixel = (pixel) << 1 | pixel;
# endif
# if CONFIG_NXCONSOLE_BPP < 4
# if CONFIG_NXTERM_BPP < 4
/* Pack 2-bit pixels into a nibble */
@ -292,10 +292,10 @@ nxcon_renderglyph(FAR struct nxcon_state_s *priv,
}
}
#elif CONFIG_NXCONSOLE_BPP == 24
#elif CONFIG_NXTERM_BPP == 24
# error "Additional logic is needed here for 24bpp support"
#else /* CONFIG_NXCONSOLE_BPP = {8,16,32} */
#else /* CONFIG_NXTERM_BPP = {8,16,32} */
ptr = (FAR nxgl_mxpixel_t *)glyph->bitmap;
for (row = 0; row < glyph->height; row++)
@ -538,9 +538,9 @@ void nxcon_home(FAR struct nxcon_state_s *priv)
priv->fpos.x = priv->spwidth;
/* And CONFIG_NXCONSOLE_LINESEPARATION lines from the top */
/* And CONFIG_NXTERM_LINESEPARATION lines from the top */
priv->fpos.y = CONFIG_NXCONSOLE_LINESEPARATION;
priv->fpos.y = CONFIG_NXTERM_LINESEPARATION;
}
/****************************************************************************
@ -557,9 +557,9 @@ void nxcon_newline(FAR struct nxcon_state_s *priv)
priv->fpos.x = priv->spwidth;
/* Linefeed: Down the max font height + CONFIG_NXCONSOLE_LINESEPARATION */
/* Linefeed: Down the max font height + CONFIG_NXTERM_LINESEPARATION */
priv->fpos.y += (priv->fheight + CONFIG_NXCONSOLE_LINESEPARATION);
priv->fpos.y += (priv->fheight + CONFIG_NXTERM_LINESEPARATION);
}
/****************************************************************************

14
graphics/nxconsole/nxcon_internal.h
View File

@ -166,21 +166,21 @@ struct nxcon_state_s
/* Font cache data storage */
struct nxcon_bitmap_s cursor;
struct nxcon_bitmap_s bm[CONFIG_NXCONSOLE_MXCHARS];
struct nxcon_bitmap_s bm[CONFIG_NXTERM_MXCHARS];
/* Glyph cache data storage */
struct nxcon_glyph_s glyph[CONFIG_NXCONSOLE_CACHESIZE];
struct nxcon_glyph_s glyph[CONFIG_NXTERM_CACHESIZE];
/* Keyboard input support */
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
sem_t waitsem; /* Supports waiting for input data */
uint8_t nwaiters; /* Number of threads waiting for data */
uint8_t head; /* rxbuffer head/input index */
uint8_t tail; /* rxbuffer tail/output index */
uint8_t rxbuffer[CONFIG_NXCONSOLE_KBDBUFSIZE];
uint8_t rxbuffer[CONFIG_NXTERM_KBDBUFSIZE];
/* The following is a list if poll structures of threads waiting for
* driver events. The 'struct pollfd' reference for each open is also
@ -188,9 +188,9 @@ struct nxcon_state_s
*/
#ifndef CONFIG_DISABLE_POLL
struct pollfd *fds[CONFIG_NXCONSOLE_NPOLLWAITERS];
struct pollfd *fds[CONFIG_NXTERM_NPOLLWAITERS];
#endif
#endif /* CONFIG_NXCONSOLE_NXKBDIN */
#endif /* CONFIG_NXTERM_NXKBDIN */
};
/****************************************************************************
@ -220,7 +220,7 @@ FAR struct nxcon_state_s *nxcon_register(NXCONSOLE handle,
FAR struct nxcon_window_s *wndo, FAR const struct nxcon_operations_s *ops,
int minor);
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
ssize_t nxcon_read(FAR struct file *filep, FAR char *buffer, size_t len);
#ifndef CONFIG_DISABLE_POLL
int nxcon_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup);

18
graphics/nxconsole/nxcon_kbdin.c
View File

@ -48,7 +48,7 @@
#include "nxcon_internal.h"
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
/****************************************************************************
* Pre-processor Definitions
@ -79,7 +79,7 @@ static void nxcon_pollnotify(FAR struct nxcon_state_s *priv, pollevent_t eventse
/* This function may be called from an interrupt handler */
for (i = 0; i < CONFIG_NXCONSOLE_NPOLLWAITERS; i++)
for (i = 0; i < CONFIG_NXTERM_NPOLLWAITERS; i++)
{
flags = irqsave();
fds = priv->fds[i];
@ -231,7 +231,7 @@ ssize_t nxcon_read(FAR struct file *filep, FAR char *buffer, size_t len)
/* Increment the tail index and re-enable interrupts */
if (++priv->tail >= CONFIG_NXCONSOLE_KBDBUFSIZE)
if (++priv->tail >= CONFIG_NXTERM_KBDBUFSIZE)
{
priv->tail = 0;
}
@ -298,7 +298,7 @@ int nxcon_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
* slot for the poll structure reference
*/
for (i = 0; i < CONFIG_NXCONSOLE_NPOLLWAITERS; i++)
for (i = 0; i < CONFIG_NXTERM_NPOLLWAITERS; i++)
{
/* Find an available slot */
@ -312,7 +312,7 @@ int nxcon_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
}
}
if (i >= CONFIG_NXCONSOLE_NPOLLWAITERS)
if (i >= CONFIG_NXTERM_NPOLLWAITERS)
{
gdbg("ERROR: Too many poll waiters\n");
@ -378,10 +378,10 @@ errout:
* this function. This function will buffer the keyboard data and makE
* it available to the NxConsole as stdin.
*
* If CONFIG_NXCONSOLE_NXKBDIN is not selected, then the NxConsole will
* If CONFIG_NXTERM_NXKBDIN is not selected, then the NxConsole will
* receive its input from stdin (/dev/console). This works great but
* cannot be shared between different windows. Chaos will ensue if you
* try to support multiple NxConsole windows without CONFIG_NXCONSOLE_NXKBDIN
* try to support multiple NxConsole windows without CONFIG_NXTERM_NXKBDIN
*
* Input Parameters:
* handle - A handle previously returned by nx_register, nxtk_register, or
@ -438,7 +438,7 @@ void nxcon_kbdin(NXCONSOLE handle, FAR const uint8_t *buffer, uint8_t buflen)
*/
nexthead = priv->head + 1;
if (nexthead >= CONFIG_NXCONSOLE_KBDBUFSIZE)
if (nexthead >= CONFIG_NXTERM_KBDBUFSIZE)
{
nexthead = 0;
}
@ -486,4 +486,4 @@ void nxcon_kbdin(NXCONSOLE handle, FAR const uint8_t *buffer, uint8_t buflen)
nxcon_sempost(priv);
}
#endif /* CONFIG_NXCONSOLE_NXKBDIN */
#endif /* CONFIG_NXTERM_NXKBDIN */

8
graphics/nxconsole/nxcon_putc.c
View File

@ -99,7 +99,7 @@ void nxcon_putc(FAR struct nxcon_state_s *priv, uint8_t ch)
if (priv->fpos.x + priv->fwidth > priv->wndo.wsize.w)
{
#ifndef CONFIG_NXCONSOLE_NOWRAP
#ifndef CONFIG_NXTERM_NOWRAP
/* No.. move to the next line */
nxcon_newline(priv);
@ -132,7 +132,7 @@ void nxcon_putc(FAR struct nxcon_state_s *priv, uint8_t ch)
/* Check if we need to scroll up */
lineheight = (priv->fheight + CONFIG_NXCONSOLE_LINESEPARATION);
lineheight = (priv->fheight + CONFIG_NXTERM_LINESEPARATION);
while (priv->fpos.y >= priv->wndo.wsize.h - lineheight)
{
nxcon_scroll(priv, lineheight);
@ -165,7 +165,7 @@ void nxcon_showcursor(FAR struct nxcon_state_s *priv)
if (priv->fpos.x + priv->fwidth > priv->wndo.wsize.w)
{
#ifndef CONFIG_NXCONSOLE_NOWRAP
#ifndef CONFIG_NXTERM_NOWRAP
/* No.. move to the next line */
nxcon_newline(priv);
@ -176,7 +176,7 @@ void nxcon_showcursor(FAR struct nxcon_state_s *priv)
/* Check if we need to scroll up */
lineheight = (priv->fheight + CONFIG_NXCONSOLE_LINESEPARATION);
lineheight = (priv->fheight + CONFIG_NXTERM_LINESEPARATION);
while (priv->fpos.y >= priv->wndo.wsize.h - lineheight)
{
nxcon_scroll(priv, lineheight);

8
graphics/nxconsole/nxcon_register.c
View File

@ -103,7 +103,7 @@ FAR struct nxcon_state_s *
priv->holder = NO_HOLDER;
#endif
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
sem_init(&priv->waitsem, 0, 0);
#endif
@ -129,11 +129,11 @@ FAR struct nxcon_state_s *
/* Set up the text cache */
priv->maxchars = CONFIG_NXCONSOLE_MXCHARS;
priv->maxchars = CONFIG_NXTERM_MXCHARS;
/* Set up the font glyph bitmap cache */
priv->maxglyphs = CONFIG_NXCONSOLE_CACHESIZE;
priv->maxglyphs = CONFIG_NXTERM_CACHESIZE;
/* Set the initial display position */
@ -141,7 +141,7 @@ FAR struct nxcon_state_s *
/* Show the cursor */
priv->cursor.code = CONFIG_NXCONSOLE_CURSORCHAR;
priv->cursor.code = CONFIG_NXTERM_CURSORCHAR;
nxcon_showcursor(priv);
/* Register the driver */

6
graphics/nxconsole/nxcon_scroll.c
View File

@ -106,7 +106,7 @@ static inline void nxcon_movedisplay(FAR struct nxcon_state_s *priv,
rect.pt1.x = 0;
rect.pt2.x = priv->wndo.wsize.w - 1;
for (row = CONFIG_NXCONSOLE_LINESEPARATION; row < bottom; row += scrollheight)
for (row = CONFIG_NXTERM_LINESEPARATION; row < bottom; row += scrollheight)
{
/* Create a bounding box the size of one row of characters */
@ -154,7 +154,7 @@ static inline void nxcon_movedisplay(FAR struct nxcon_state_s *priv,
/* Add the line separation value to the scroll height */
scrollheight += CONFIG_NXCONSOLE_LINESEPARATION;
scrollheight += CONFIG_NXTERM_LINESEPARATION;
/* Move the display in the range of 0-height up one scrollheight. The
* line at the bottom will be reset to the background color automatically.
@ -213,7 +213,7 @@ void nxcon_scroll(FAR struct nxcon_state_s *priv, int scrollheight)
/* Has any part of this character scrolled off the screen? */
if (bm->pos.y < scrollheight + CONFIG_NXCONSOLE_LINESEPARATION)
if (bm->pos.y < scrollheight + CONFIG_NXTERM_LINESEPARATION)
{
/* Yes... Delete the character by moving all of the data */

4
graphics/nxconsole/nxcon_unregister.c
View File

@ -97,13 +97,13 @@ void nxcon_unregister(NXCONSOLE handle)
priv = (FAR struct nxcon_state_s *)handle;
sem_destroy(&priv->exclsem);
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
sem_destroy(&priv->waitsem);
#endif
/* Free all allocated glyph bitmap */
for (i = 0; i < CONFIG_NXCONSOLE_CACHESIZE; i++)
for (i = 0; i < CONFIG_NXTERM_CACHESIZE; i++)
{
FAR struct nxcon_glyph_s *glyph = &priv->glyph[i];
if (glyph->bitmap)

88
include/nuttx/nx/nxconsole.h
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxtk.h>
#ifdef CONFIG_NXCONSOLE
#ifdef CONFIG_NXTERM
/****************************************************************************
* Pre-processor definitions
@ -63,91 +63,91 @@
/* Nx Console configuration options:
*
* CONFIG_NXCONSOLE
* CONFIG_NXTERM
* Enables building of the NxConsole driver.
*
* Output text/graphics options:
*
* CONFIG_NXCONSOLE_BPP
* CONFIG_NXTERM_BPP
* Currently, NxConsole supports only a single pixel depth. This
* configuration setting must be provided to support that single pixel depth.
* Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP)
* CONFIG_NXCONSOLE_CURSORCHAR
* CONFIG_NXTERM_CURSORCHAR
* The bitmap code to use as the cursor. Default '_'
* CONFIG_NXCONSOLE_MXCHARS
* CONFIG_NXTERM_MXCHARS
* NxConsole needs to remember every character written to the console so
* that it can redraw the window. This setting determines the size of some
* internal memory allocations used to hold the character data. Default: 128.
* CONFIG_NXCONSOLE_CACHESIZE
* CONFIG_NXTERM_CACHESIZE
* NxConsole supports caching of rendered fonts. This font caching is required
* for two reasons: (1) First, it improves text performance, but more
* importantly (2) it preserves the font memory. Since the NX server runs on
* a separate server thread, it requires that the rendered font memory persist
* until the server has a chance to render the font. (NOTE: There is still
* inherently a race condition in this!). Unfortunately, the font cache would
* be quite large if all fonts were saved. The CONFIG_NXCONSOLE_CACHESIZE setting
* be quite large if all fonts were saved. The CONFIG_NXTERM_CACHESIZE setting
* will control the size of the font cache (in number of glyphs). Only that
* number of the most recently used glyphs will be retained. Default: 16.
* CONFIG_NXCONSOLE_LINESEPARATION
* CONFIG_NXTERM_LINESEPARATION
* This the space (in rows) between each row of test. Default: 0
* CONFIG_NXCONSOLE_NOWRAP
* CONFIG_NXTERM_NOWRAP
* By default, lines will wrap when the test reaches the right hand side
* of the window. This setting can be defining to change this behavior so
* that the text is simply truncated until a new line is encountered.
*
* Input options:
*
* CONFIG_NXCONSOLE_NXKBDIN
* CONFIG_NXTERM_NXKBDIN
* Take input from the NX keyboard input callback. By default, keyboard
* input is taken from stdin (/dev/console). If this option is set, then
* the interface nxcon_kbdin() is enabled. That interface may be driven
* by window callback functions so that keyboard input *only* goes to the
* top window.
* CONFIG_NXCONSOLE_KBDBUFSIZE
* If CONFIG_NXCONSOLE_NXKBDIN is enabled, then this value may be used to
* CONFIG_NXTERM_KBDBUFSIZE
* If CONFIG_NXTERM_NXKBDIN is enabled, then this value may be used to
* define the size of the per-window keyboard input buffer. Default: 16
* CONFIG_NXCONSOLE_NPOLLWAITERS
* CONFIG_NXTERM_NPOLLWAITERS
* The number of threads that can be waiting for read data available.
* Default: 4
*/
/* Cursor character */
#ifndef CONFIG_NXCONSOLE_CURSORCHAR
# define CONFIG_NXCONSOLE_CURSORCHAR '_'
#ifndef CONFIG_NXTERM_CURSORCHAR
# define CONFIG_NXTERM_CURSORCHAR '_'
#endif
/* The maximum number of characters that can be remembered */
#ifndef CONFIG_NXCONSOLE_MXCHARS
# define CONFIG_NXCONSOLE_MXCHARS 128
#ifndef CONFIG_NXTERM_MXCHARS
# define CONFIG_NXTERM_MXCHARS 128
#endif
/* Font cache -- this is the number or pre-rendered font glyphs that can be
* remembered.
*/
#ifndef CONFIG_NXCONSOLE_CACHESIZE
# define CONFIG_NXCONSOLE_CACHESIZE 16
#ifndef CONFIG_NXTERM_CACHESIZE
# define CONFIG_NXTERM_CACHESIZE 16
#endif
/* Pixel depth */
#ifndef CONFIG_NXCONSOLE_BPP
#ifndef CONFIG_NXTERM_BPP
# if !defined(CONFIG_NX_DISABLE_1BPP)
# define CONFIG_NXCONSOLE_BPP 1
# define CONFIG_NXTERM_BPP 1
# elif !defined(CONFIG_NX_DISABLE_2BPP)
# define CONFIG_NXCONSOLE_BPP 2
# define CONFIG_NXTERM_BPP 2
# elif !defined(CONFIG_NX_DISABLE_4BPP)
# define CONFIG_NXCONSOLE_BPP 4
# define CONFIG_NXTERM_BPP 4
# elif !defined(CONFIG_NX_DISABLE_8BPP)
# define CONFIG_NXCONSOLE_BPP 8
# define CONFIG_NXTERM_BPP 8
# elif !defined(CONFIG_NX_DISABLE_16BPP)
# define CONFIG_NXCONSOLE_BPP 16
# define CONFIG_NXTERM_BPP 16
//#elif !defined(CONFIG_NX_DISABLE_24BPP)
//# define CONFIG_NXCONSOLE_BPP 24
//# define CONFIG_NXTERM_BPP 24
# elif !defined(CONFIG_NX_DISABLE_32BPP)
# define CONFIG_NXCONSOLE_BPP 32
# define CONFIG_NXTERM_BPP 32
# else
# error "No pixel depth provided"
# endif
@ -155,32 +155,32 @@
/* Space (in rows) between lines */
#ifndef CONFIG_NXCONSOLE_LINESEPARATION
# define CONFIG_NXCONSOLE_LINESEPARATION 0
#ifndef CONFIG_NXTERM_LINESEPARATION
# define CONFIG_NXTERM_LINESEPARATION 0
#endif
/* Input options */
#ifndef CONFIG_NX_KBD
# undef CONFIG_NXCONSOLE_NXKBDIN
# undef CONFIG_NXTERM_NXKBDIN
#endif
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
# ifndef CONFIG_NXCONSOLE_KBDBUFSIZE
# define CONFIG_NXCONSOLE_KBDBUFSIZE 16
# elif (CONFIG_NXCONSOLE_KBDBUFSIZE < 1) || (CONFIG_NXCONSOLE_KBDBUFSIZE > 255)
# error "CONFIG_NXCONSOLE_KBDBUFSIZE is out of range (1-255)"
# ifndef CONFIG_NXTERM_KBDBUFSIZE
# define CONFIG_NXTERM_KBDBUFSIZE 16
# elif (CONFIG_NXTERM_KBDBUFSIZE < 1) || (CONFIG_NXTERM_KBDBUFSIZE > 255)
# error "CONFIG_NXTERM_KBDBUFSIZE is out of range (1-255)"
# endif
# ifndef CONFIG_NXCONSOLE_NPOLLWAITERS
# define CONFIG_NXCONSOLE_NPOLLWAITERS 4
# ifndef CONFIG_NXTERM_NPOLLWAITERS
# define CONFIG_NXTERM_NPOLLWAITERS 4
# endif
#else
# undef CONFIG_NXCONSOLE_KBDBUFSIZE
# define CONFIG_NXCONSOLE_KBDBUFSIZE 0
# define CONFIG_NXCONSOLE_NPOLLWAITERS 0
# undef CONFIG_NXTERM_KBDBUFSIZE
# define CONFIG_NXTERM_KBDBUFSIZE 0
# define CONFIG_NXTERM_NPOLLWAITERS 0
#endif
/****************************************************************************
@ -337,10 +337,10 @@ EXTERN void nxcon_redraw(NXCONSOLE handle, FAR const struct nxgl_rect_s *rect,
* this function. This function will buffer the keyboard data and make
* it available to the NxConsole as stdin.
*
* If CONFIG_NXCONSOLE_NXKBDIN is not selected, then the NxConsole will
* If CONFIG_NXTERM_NXKBDIN is not selected, then the NxConsole will
* receive its input from stdin (/dev/console). This works great but
* cannot be shared between different windows. Chaos will ensue if you
* try to support multiple NxConsole windows without CONFIG_NXCONSOLE_NXKBDIN
* try to support multiple NxConsole windows without CONFIG_NXTERM_NXKBDIN
*
* Input Parameters:
* handle - A handle previously returned by nx_register, nxtk_register, or
@ -353,7 +353,7 @@ EXTERN void nxcon_redraw(NXCONSOLE handle, FAR const struct nxgl_rect_s *rect,
*
****************************************************************************/
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
EXTERN void nxcon_kbdin(NXCONSOLE handle, FAR const uint8_t *buffer,
uint8_t buflen);
#endif
@ -363,5 +363,5 @@ EXTERN void nxcon_kbdin(NXCONSOLE handle, FAR const uint8_t *buffer,
}
#endif
#endif /* CONFIG_NXCONSOLE */
#endif /* CONFIG_NXTERM */
#endif /* __INCLUDE_NUTTX_NX_NXCONSOLE_H */