diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:25:51 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:25:51 -0600 |
commit | 9f0d9a6db5d6d1eec7bec3a029bb37a95245e495 (patch) | |
tree | eca80fba732d2ee0e6eb3af44d6473de4de877c5 /NxWidgets/nxwm | |
parent | 4860036d8f145187cfe700743def8d0ee3548f1b (diff) | |
download | nuttx-9f0d9a6db5d6d1eec7bec3a029bb37a95245e495.tar.gz nuttx-9f0d9a6db5d6d1eec7bec3a029bb37a95245e495.tar.bz2 nuttx-9f0d9a6db5d6d1eec7bec3a029bb37a95245e495.zip |
Rename CONFIG_EXAMPLES_NXCONSOLE to CONFIG_EXAMPLES_NXTERM; rename CONFIG_NXWM_NXCONSOLE to CONFIG_NXWM_NXTERM
Diffstat (limited to 'NxWidgets/nxwm')
-rw-r--r-- | NxWidgets/nxwm/Makefile | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/include/nxwmconfig.hxx | 46 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/cnxconsole.cxx | 14 |
3 files changed, 31 insertions, 31 deletions
diff --git a/NxWidgets/nxwm/Makefile b/NxWidgets/nxwm/Makefile index 75c923299..8dd287c64 100644 --- a/NxWidgets/nxwm/Makefile +++ b/NxWidgets/nxwm/Makefile @@ -70,7 +70,7 @@ ifeq ($(CONFIG_NXWM_TOUCHSCREEN),y) CXXSRCS += ccalibration.cxx endif -ifeq ($(CONFIG_NXWM_NXCONSOLE),y) +ifeq ($(CONFIG_NXWM_NXTERM),y) CXXSRCS += cnxconsole.cxx endif diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index a0b91e0ef..a7578a206 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -85,11 +85,11 @@ #endif /** - * NxConsole support is (probably) required if CONFIG_NXWM_NXCONSOLE is + * NxConsole support is (probably) required if CONFIG_NXWM_NXTERM is * selected */ -#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXTERM) +#if defined(CONFIG_NXWM_NXTERM) && !defined(CONFIG_NXTERM) # warning "NxConsole support may be needed (CONFIG_NXTERM)" #endif @@ -367,54 +367,54 @@ /** * NxConsole Window Configuration * - * CONFIG_NXWM_NXCONSOLE_PRIO - Priority of the NxConsole task. Default: + * CONFIG_NXWM_NXTERM_PRIO - Priority of the NxConsole task. Default: * SCHED_PRIORITY_DEFAULT. NOTE: This priority should be less than * CONFIG_NXWIDGETS_SERVERPRIO or else there may be data overrun errors. * Such errors would most likely appear as duplicated rows of data on the * display. - * CONFIG_NXWM_NXCONSOLE_STACKSIZE - The stack size to use when starting the + * CONFIG_NXWM_NXTERM_STACKSIZE - The stack size to use when starting the * NxConsole task. Default: 2048 bytes. - * CONFIG_NXWM_NXCONSOLE_WCOLOR - The color of the NxConsole window background. + * CONFIG_NXWM_NXTERM_WCOLOR - The color of the NxConsole window background. * Default: MKRGB(192,192,192) - * CONFIG_NXWM_NXCONSOLE_FONTCOLOR - The color of the fonts to use in the + * CONFIG_NXWM_NXTERM_FONTCOLOR - The color of the fonts to use in the * NxConsole window. Default: MKRGB(0,0,0) - * CONFIG_NXWM_NXCONSOLE_FONTID - The ID of the font to use in the NxConsole + * CONFIG_NXWM_NXTERM_FONTID - The ID of the font to use in the NxConsole * window. Default: CONFIG_NXWM_DEFAULT_FONTID - * CONFIG_NXWM_NXCONSOLE_ICON - The glyph to use as the NxConsole icon + * CONFIG_NXWM_NXTERM_ICON - The glyph to use as the NxConsole icon */ -#ifdef CONFIG_NXWM_NXCONSOLE -# ifndef CONFIG_NXWM_NXCONSOLE_PRIO -# define CONFIG_NXWM_NXCONSOLE_PRIO SCHED_PRIORITY_DEFAULT +#ifdef CONFIG_NXWM_NXTERM +# ifndef CONFIG_NXWM_NXTERM_PRIO +# define CONFIG_NXWM_NXTERM_PRIO SCHED_PRIORITY_DEFAULT # endif -# if CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXCONSOLE_PRIO -# warning "CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXCONSOLE_PRIO" +# if CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXTERM_PRIO +# warning "CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXTERM_PRIO" # warning" -- This can result in data overrun errors" # endif -# ifndef CONFIG_NXWM_NXCONSOLE_STACKSIZE -# define CONFIG_NXWM_NXCONSOLE_STACKSIZE 2048 +# ifndef CONFIG_NXWM_NXTERM_STACKSIZE +# define CONFIG_NXWM_NXTERM_STACKSIZE 2048 # endif -# ifndef CONFIG_NXWM_NXCONSOLE_WCOLOR -# define CONFIG_NXWM_NXCONSOLE_WCOLOR CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR +# ifndef CONFIG_NXWM_NXTERM_WCOLOR +# define CONFIG_NXWM_NXTERM_WCOLOR CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR # endif -# ifndef CONFIG_NXWM_NXCONSOLE_FONTCOLOR -# define CONFIG_NXWM_NXCONSOLE_FONTCOLOR CONFIG_NXWM_DEFAULT_FONTCOLOR +# ifndef CONFIG_NXWM_NXTERM_FONTCOLOR +# define CONFIG_NXWM_NXTERM_FONTCOLOR CONFIG_NXWM_DEFAULT_FONTCOLOR # endif -# ifndef CONFIG_NXWM_NXCONSOLE_FONTID -# define CONFIG_NXWM_NXCONSOLE_FONTID CONFIG_NXWM_DEFAULT_FONTID +# ifndef CONFIG_NXWM_NXTERM_FONTID +# define CONFIG_NXWM_NXTERM_FONTID CONFIG_NXWM_DEFAULT_FONTID # endif /** * The NxConsole window glyph */ -# ifndef CONFIG_NXWM_NXCONSOLE_ICON -# define CONFIG_NXWM_NXCONSOLE_ICON NxWM::g_cmdBitmap +# ifndef CONFIG_NXWM_NXTERM_ICON +# define CONFIG_NXWM_NXTERM_ICON NxWM::g_cmdBitmap # endif #endif diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx index f2449e6b1..ff5ed92c2 100644 --- a/NxWidgets/nxwm/src/cnxconsole.cxx +++ b/NxWidgets/nxwm/src/cnxconsole.cxx @@ -179,7 +179,7 @@ IApplicationWindow *CNxConsole::getWindow(void) const NXWidgets::IBitmap *CNxConsole::getIcon(void) { NXWidgets::CRlePaletteBitmap *bitmap = - new NXWidgets::CRlePaletteBitmap(&CONFIG_NXWM_NXCONSOLE_ICON); + new NXWidgets::CRlePaletteBitmap(&CONFIG_NXWM_NXTERM_ICON); return bitmap; } @@ -235,9 +235,9 @@ bool CNxConsole::run(void) // Describe the NxConsole - g_nxconvars.wndo.wcolor[0] = CONFIG_NXWM_NXCONSOLE_WCOLOR; - g_nxconvars.wndo.fcolor[0] = CONFIG_NXWM_NXCONSOLE_FONTCOLOR; - g_nxconvars.wndo.fontid = CONFIG_NXWM_NXCONSOLE_FONTID; + g_nxconvars.wndo.wcolor[0] = CONFIG_NXWM_NXTERM_WCOLOR; + g_nxconvars.wndo.fcolor[0] = CONFIG_NXWM_NXTERM_FONTCOLOR; + g_nxconvars.wndo.fontid = CONFIG_NXWM_NXTERM_FONTID; // Get the size of the window @@ -250,8 +250,8 @@ bool CNxConsole::run(void) g_nxconvars.nxcon = 0; sched_lock(); - m_pid = task_create("NxConsole", CONFIG_NXWM_NXCONSOLE_PRIO, - CONFIG_NXWM_NXCONSOLE_STACKSIZE, nxconsole, + m_pid = task_create("NxConsole", CONFIG_NXWM_NXTERM_PRIO, + CONFIG_NXWM_NXTERM_STACKSIZE, nxconsole, (FAR char * const *)0); // Did we successfully start the NxConsole task? @@ -629,7 +629,7 @@ IApplication *CNxConsoleFactory::create(void) NXWidgets::IBitmap *CNxConsoleFactory::getIcon(void) { NXWidgets::CRlePaletteBitmap *bitmap = - new NXWidgets::CRlePaletteBitmap(&CONFIG_NXWM_NXCONSOLE_ICON); + new NXWidgets::CRlePaletteBitmap(&CONFIG_NXWM_NXTERM_ICON); return bitmap; } |