diff options
Diffstat (limited to 'NxWidgets')
-rw-r--r-- | NxWidgets/ChangeLog.txt | 2 | ||||
-rw-r--r-- | NxWidgets/Kconfig | 36 | ||||
-rw-r--r-- | NxWidgets/UnitTests/nxwm/nxwm_main.cxx | 8 | ||||
-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 |
6 files changed, 54 insertions, 54 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 2d89d3f91..dbea761b3 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -417,7 +417,7 @@ This is because in the kernel build mode, the NX server must be initialized in kernel mode by the RTOS before applications using the server run in user mode. -* NxWm: Added CONFIG_NXWM_NXCONSOLE that can be used to disable the NxConsole +* NxWm: Added CONFIG_NXWM_NXTERM that can be used to disable the NxConsole window (2013-12-30). * NxWm::CTouchscreen: Added CONFIG_NXWM_TOUCHSCREEN_DEVINIT that can be used to suppress calls to initialize the touchscreen device from the listener diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index 4f6b84b73..f5b03e58f 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -677,16 +677,16 @@ endmenu # Start Window Configuration menu "NxConsole Window Settings" -config NXWM_NXCONSOLE +config NXWM_NXTERM bool "NxConsole Window" default y ---help--- Enable support for the NxConsole window which provides a text window in which you can interact with NSH. -if NXWM_NXCONSOLE +if NXWM_NXTERM -config NXWM_NXCONSOLE_PRIO +config NXWM_NXTERM_PRIO int "NxConsole Task Priority" default 100 ---help--- @@ -696,14 +696,14 @@ config NXWM_NXCONSOLE_PRIO 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 +config NXWM_NXTERM_STACKSIZE int "NxConsole Task Stack Size" default 2048 ---help--- The stack size to use when starting the NxConsole task. Default: 2048 bytes. -config NXWM_NXCONSOLE_CUSTOM_COLORS +config NXWM_NXTERM_CUSTOM_COLORS bool "Custom NxConsole Colors" default n ---help--- @@ -712,55 +712,55 @@ config NXWM_NXCONSOLE_CUSTOM_COLORS (there are no default colors because the hexadecimal representation of the default colors depend on the pixel depth). Default: n -if NXWM_NXCONSOLE_CUSTOM_COLORS +if NXWM_NXTERM_CUSTOM_COLORS -config NXWM_NXCONSOLE_WCOLOR +config NXWM_NXTERM_WCOLOR hex "NxConsole Background Color" ---help--- The color of the NxConsole window background. Default: RGB(192,192,192) -config NXWM_NXCONSOLE_FONTCOLOR +config NXWM_NXTERM_FONTCOLOR hex "NxConsole Font Color" ---help--- The color of the fonts to use in the NxConsole window. Default: RGB(0,0,0) -endif # NXWM_NXCONSOLE_CUSTOM_COLORS +endif # NXWM_NXTERM_CUSTOM_COLORS -config NXWM_NXCONSOLE_CUSTOM_FONTID +config NXWM_NXTERM_CUSTOM_FONTID bool "Use Custom Default Font" default n ---help--- Set to override the NxWM default font id (NXWM_DEFAULT_FONTID). -if NXWM_NXCONSOLE_CUSTOM_FONTID +if NXWM_NXTERM_CUSTOM_FONTID -config NXWM_NXCONSOLE_FONTID +config NXWM_NXTERM_FONTID int "NxConsole Font ID" default 0 ---help--- Use this default font ID in the NxConsole window instead of the NxWM font ID (NXWM_DEFAULT_FONTID). Default: 0 -endif # NXWM_NXCONSOLE_CUSTOM_FONTID +endif # NXWM_NXTERM_CUSTOM_FONTID -config NXWM_CUSTOM_NXCONSOLE_ICON +config NXWM_CUSTOM_NXTERM_ICON bool "Custom NxConsole Icon" default n ---help--- Select to override the default NxConsole Window Icon: NxWM::g_cmdBitmap -if NXWM_CUSTOM_NXCONSOLE_ICON +if NXWM_CUSTOM_NXTERM_ICON -config NXWM_NXCONSOLE_ICON +config NXWM_NXTERM_ICON string "NxConsole Icon" default "NxWM::g_cmdBitmap" ---help--- The glyph to use as the NxConsole icon. Default: NxWM::g_cmdBitmap -endif # NXWM_NXCONSOLE_ICON -endif # NXWM_NXCONSOLE +endif # NXWM_NXTERM_ICON +endif # NXWM_NXTERM endmenu # NxConsole Window Settings menu "NxWM Touchscreen Configuration" diff --git a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx index 13e0bd8b1..379b03186 100644 --- a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx +++ b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx @@ -51,7 +51,7 @@ #include "ctaskbar.hxx" #include "cstartwindow.hxx" -#ifdef CONFIG_NXWM_NXCONSOLE +#ifdef CONFIG_NXWM_NXTERM # include "cnxconsole.hxx" #endif @@ -548,7 +548,7 @@ static bool createCalibration(void) // Name: createNxConsole ///////////////////////////////////////////////////////////////////////////// -#ifdef CONFIG_NXWM_NXCONSOLE +#ifdef CONFIG_NXWM_NXTERM static bool createNxConsole(void) { // Add the NxConsole application to the start window @@ -678,7 +678,7 @@ int nxwm_main(int argc, char *argv[]) // Initialize the NSH library -#ifdef CONFIG_NXWM_NXCONSOLE +#ifdef CONFIG_NXWM_NXTERM printf("nxwm_main: Initialize the NSH library\n"); if (!NxWM::nshlibInitialize()) { @@ -736,7 +736,7 @@ int nxwm_main(int argc, char *argv[]) // Create the NxConsole application and add it to the start window -#ifdef CONFIG_NXWM_NXCONSOLE +#ifdef CONFIG_NXWM_NXTERM if (!createNxConsole()) { printf("nxwm_main: ERROR: Failed to create the NxConsole application\n"); 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; } |