From d4488e79ca12c053388a7f58e8406cc33ea117a5 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 20 Sep 2014 14:18:08 -0600 Subject: [PATCH] Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM* --- UnitTests/README.txt | 2 +- libnxwidgets/include/cbgwindow.hxx | 2 +- libnxwidgets/include/ccallback.hxx | 6 +++--- libnxwidgets/include/cnxtkwindow.hxx | 2 +- libnxwidgets/include/cnxtoolbar.hxx | 2 +- libnxwidgets/include/cnxwindow.hxx | 2 +- libnxwidgets/include/inxwindow.hxx | 4 ++-- libnxwidgets/include/nxconfig.hxx | 4 ++-- libnxwidgets/src/ccallback.cxx | 6 +++--- nxwm/include/nxwmconfig.hxx | 6 +++--- nxwm/src/cnxconsole.cxx | 12 ++++++------ 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/UnitTests/README.txt b/UnitTests/README.txt index 97f3eec7c..044fcc175 100644 --- a/UnitTests/README.txt +++ b/UnitTests/README.txt @@ -87,7 +87,7 @@ Installing and Building the Unit Tests d) Special configuration requirements for the nxwm unit test: - CONFIG_NXCONSOLE=y + CONFIG_NXTERM=y CONFIG_NX_MULTIUSER=y e) Other .config file changes -- NSH configurations only. diff --git a/libnxwidgets/include/cbgwindow.hxx b/libnxwidgets/include/cbgwindow.hxx index 0b73a01de..57c0a1675 100644 --- a/libnxwidgets/include/cbgwindow.hxx +++ b/libnxwidgets/include/cbgwindow.hxx @@ -220,7 +220,7 @@ namespace NXWidgets * directed to the widgets within the window. */ -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN inline void redirectNxConsole(NXCONSOLE handle) { setNxConsole(handle); diff --git a/libnxwidgets/include/ccallback.hxx b/libnxwidgets/include/ccallback.hxx index 8127dc20d..8d96f0022 100644 --- a/libnxwidgets/include/ccallback.hxx +++ b/libnxwidgets/include/ccallback.hxx @@ -49,7 +49,7 @@ #include #include -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN # include #endif @@ -93,7 +93,7 @@ namespace NXWidgets private: CWidgetControl *m_widgetControl; /**< The widget control instance for this window */ struct nx_callback_s m_callbacks; /**< C-callable vtable of callback function pointers */ -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN NXCONSOLE m_nxconsole; /**< The NxConsole handle for redirection of keyboard input */ #endif @@ -257,7 +257,7 @@ namespace NXWidgets * directed to the widgets within the window. */ -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN inline void setNxConsole(NXCONSOLE handle) { m_nxconsole = handle; diff --git a/libnxwidgets/include/cnxtkwindow.hxx b/libnxwidgets/include/cnxtkwindow.hxx index ea18595de..5bf2a1a03 100644 --- a/libnxwidgets/include/cnxtkwindow.hxx +++ b/libnxwidgets/include/cnxtkwindow.hxx @@ -241,7 +241,7 @@ namespace NXWidgets * directed to the widgets within the window. */ -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN inline void redirectNxConsole(NXCONSOLE handle) { setNxConsole(handle); diff --git a/libnxwidgets/include/cnxtoolbar.hxx b/libnxwidgets/include/cnxtoolbar.hxx index 501067f0d..7a8a783b2 100644 --- a/libnxwidgets/include/cnxtoolbar.hxx +++ b/libnxwidgets/include/cnxtoolbar.hxx @@ -210,7 +210,7 @@ namespace NXWidgets * directed to the widgets within the window. */ -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN inline void redirectNxConsole(NXCONSOLE handle) { setNxConsole(handle); diff --git a/libnxwidgets/include/cnxwindow.hxx b/libnxwidgets/include/cnxwindow.hxx index 780276a5f..525a0c851 100644 --- a/libnxwidgets/include/cnxwindow.hxx +++ b/libnxwidgets/include/cnxwindow.hxx @@ -214,7 +214,7 @@ namespace NXWidgets * directed to the widgets within the window. */ -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN inline void redirectNxConsole(NXCONSOLE handle) { setNxConsole(handle); diff --git a/libnxwidgets/include/inxwindow.hxx b/libnxwidgets/include/inxwindow.hxx index 826d1784e..4aa2c519b 100644 --- a/libnxwidgets/include/inxwindow.hxx +++ b/libnxwidgets/include/inxwindow.hxx @@ -47,7 +47,7 @@ #include #include -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN # include #endif @@ -186,7 +186,7 @@ namespace NXWidgets * directed to the widgets within the window. */ -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN virtual void redirectNxConsole(NXCONSOLE handle) = 0; #endif diff --git a/libnxwidgets/include/nxconfig.hxx b/libnxwidgets/include/nxconfig.hxx index 9face1e70..f6c9ead90 100644 --- a/libnxwidgets/include/nxconfig.hxx +++ b/libnxwidgets/include/nxconfig.hxx @@ -188,8 +188,8 @@ * reducing the AND of these three conditions to a single condition. */ -#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXCONSOLE) -# undef CONFIG_NXCONSOLE_NXKBDIN +#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXTERM) +# undef CONFIG_NXTERM_NXKBDIN #endif /* NX Server/Device Configuration *******************************************/ diff --git a/libnxwidgets/src/ccallback.cxx b/libnxwidgets/src/ccallback.cxx index 4550d24b0..cec7ea1bf 100644 --- a/libnxwidgets/src/ccallback.cxx +++ b/libnxwidgets/src/ccallback.cxx @@ -44,7 +44,7 @@ #include #include -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN # include #endif @@ -87,7 +87,7 @@ CCallback::CCallback(CWidgetControl *widgetControl) // Keyboard input is initially direct to the widgets within the window -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN m_nxconsole = (NXCONSOLE)0; #endif } @@ -209,7 +209,7 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh, // (default) OR is NX keyboard input being re-directed to an NxConsole // driver? -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN if (This->m_nxconsole) { // Keyboard input is going to an NxConsole diff --git a/nxwm/include/nxwmconfig.hxx b/nxwm/include/nxwmconfig.hxx index b2c3f4c54..a0b91e0ef 100644 --- a/nxwm/include/nxwmconfig.hxx +++ b/nxwm/include/nxwmconfig.hxx @@ -57,7 +57,7 @@ * CONFIG_HAVE_CXX : C++ support is required * CONFIG_NX : NX must enabled * CONFIG_NX_MULTIUSER=y : NX must be configured in multiuse mode - * CONFIG_NXCONSOLE=y : For NxConsole support + * CONFIG_NXTERM=y : For NxConsole support * CONFIG_SCHED_ONEXIT : Support for on_exit() * * General settings: @@ -89,8 +89,8 @@ * selected */ -#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXCONSOLE) -# warning "NxConsole support may be needed (CONFIG_NXCONSOLE)" +#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXTERM) +# warning "NxConsole support may be needed (CONFIG_NXTERM)" #endif /** diff --git a/nxwm/src/cnxconsole.cxx b/nxwm/src/cnxconsole.cxx index be0718a10..f2449e6b1 100644 --- a/nxwm/src/cnxconsole.cxx +++ b/nxwm/src/cnxconsole.cxx @@ -278,7 +278,7 @@ bool CNxConsole::run(void) // Re-direct NX keyboard input to the new NxConsole driver DEBUGASSERT(g_nxconvars.nxcon != 0); -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN window->redirectNxConsole(g_nxconvars.nxcon); #endif // Save the handle to use in the stop method @@ -331,7 +331,7 @@ void CNxConsole::stop(void) { // Re-store NX keyboard input routing -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN NXWidgets::INxWindow *window = m_window->getWindow(); window->redirectNxConsole((NXCONSOLE)0); #endif @@ -455,7 +455,7 @@ int CNxConsole::nxconsole(int argc, char *argv[]) // Open the NxConsole driver -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN fd = open(devname, O_RDWR); #else fd = open(devname, O_WRONLY); @@ -474,19 +474,19 @@ int CNxConsole::nxconsole(int argc, char *argv[]) (void)std::fflush(stdout); (void)std::fflush(stderr); -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN (void)std::fclose(stdin); #endif (void)std::fclose(stdout); (void)std::fclose(stderr); -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN (void)std::dup2(fd, 0); #endif (void)std::dup2(fd, 1); (void)std::dup2(fd, 2); -#ifdef CONFIG_NXCONSOLE_NXKBDIN +#ifdef CONFIG_NXTERM_NXKBDIN (void)std::fdopen(0, "r"); #endif (void)std::fdopen(1, "w");