From 01bce341a9d065e8250f655c246c07a525779bc0 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 20 May 2012 18:56:14 +0000 Subject: NxWM::CNxConsole and NXWidgets::CCallback can now redirect keyboard input to the NxConsole driver git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4754 42af7a65-404d-4744-a932-0658087f49c3 --- NxWidgets/ChangeLog.txt | 13 ++++++ NxWidgets/libnxwidgets/include/cbgwindow.hxx | 21 +++++++++ NxWidgets/libnxwidgets/include/ccallback.hxx | 32 +++++++++++++- NxWidgets/libnxwidgets/include/cnxtkwindow.hxx | 21 +++++++++ NxWidgets/libnxwidgets/include/cnxtoolbar.hxx | 21 +++++++++ NxWidgets/libnxwidgets/include/cnxwindow.hxx | 21 +++++++++ NxWidgets/libnxwidgets/include/inxwindow.hxx | 22 ++++++++++ NxWidgets/libnxwidgets/include/nxconfig.hxx | 8 ++++ NxWidgets/libnxwidgets/src/cbgwindow.cxx | 3 +- NxWidgets/libnxwidgets/src/ccallback.cxx | 61 +++++++++++++++++++------- NxWidgets/libnxwidgets/src/cnxtkwindow.cxx | 3 +- NxWidgets/libnxwidgets/src/cnxtoolbar.cxx | 2 +- NxWidgets/libnxwidgets/src/cnxwindow.cxx | 3 +- NxWidgets/nxwm/src/cnxconsole.cxx | 43 +++++++++++++++++- 14 files changed, 251 insertions(+), 23 deletions(-) (limited to 'NxWidgets') diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 80101c920..c61d48375 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -111,3 +111,16 @@ threading model. 1.2 2012-xx-xx Gregory Nutt + +* NXWidgets::CCallback: callback arguement is now type CCallback and not + CWidgetControl; Added a method to redirect keyboard contacts to either + the widgets in the window (via CWidgetControl) or to an NxConsole (via + nxcon_kbdin()). +* NXWidgets::INxWindow, CBgWindow, CNxTkWindow, CNxToolbar, CNxWindow: + Now pass the CCallback intances as the callback argument instead of + the CWidgetControl instance. New method redirectNxConsole() will + support redirection of any window keyboard input to the NxConsole + (via CCallback). +* NxWM:CNxConsole: Configures the NxConsole window to redirectin keyboard + input to the NxConsole; redirects standard input to the NxConsole + device driver. diff --git a/NxWidgets/libnxwidgets/include/cbgwindow.hxx b/NxWidgets/libnxwidgets/include/cbgwindow.hxx index 435fdffbf..21b75799d 100644 --- a/NxWidgets/libnxwidgets/include/cbgwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cbgwindow.hxx @@ -206,6 +206,27 @@ namespace NXWidgets bool lower(void); + /** + * Each window implementation also inherits from CCallback. CCallback, + * by default, forwards NX keyboard input to the various widgets residing + * in the window. But NxConsole is a different usage model; In this case, + * keyboard input needs to be directed to the NxConsole character driver. + * This method can be used to enable (or disable) redirection of NX + * keyboard input from the window widgets to the NxConsole + * + * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard + * input will be directed to the NxConsole driver using this + * handle; If NULL (the default), NX keyboard input will be + * directed to the widgets within the window. + */ + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + inline void redirectNxConsole(NXCONSOLE handle) + { + setNxConsole(handle); + } +#endif + /** * Set an individual pixel in the window with the specified color. * diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx index 09cb83a8a..8d3c13cd2 100644 --- a/NxWidgets/libnxwidgets/include/ccallback.hxx +++ b/NxWidgets/libnxwidgets/include/ccallback.hxx @@ -48,7 +48,10 @@ #include #include -#include + +#ifdef CONFIG_NXCONSOLE_NXKBDIN +# include +#endif #include "crect.hxx" @@ -88,7 +91,11 @@ namespace NXWidgets class CCallback { private: - struct nx_callback_s m_callbacks; /**< C-callable vtable of callback function pointers */ + 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 + NXCONSOLE m_nxconsole; /**< The NxConsole handle for redirection of keyboard input */ +#endif // Methods in the callback vtable @@ -235,6 +242,27 @@ namespace NXWidgets { return &m_callbacks; } + + /** + * By default, NX keyboard input is given to the various widgets + * residing in the window. But NxConsole is a different usage model; + * In this case, keyboard input needs to be directed to the NxConsole + * character driver. This method can be used to enable (or disable) + * redirection of NX keyboard input from the window widgets to the + * NxConsole + * + * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard + * input will be directed to the NxConsole driver using this + * handle; If NULL (the default), NX keyboard input will be + * directed to the widgets within the window. + */ + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + inline void setNxConsole(NXCONSOLE handle) + { + m_nxconsole = handle; + } +#endif }; } diff --git a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx index 8fda121a9..16a0bee92 100644 --- a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx @@ -227,6 +227,27 @@ namespace NXWidgets bool lower(void); + /** + * Each window implementation also inherits from CCallback. CCallback, + * by default, forwards NX keyboard input to the various widgets residing + * in the window. But NxConsole is a different usage model; In this case, + * keyboard input needs to be directed to the NxConsole character driver. + * This method can be used to enable (or disable) redirection of NX + * keyboard input from the window widgets to the NxConsole + * + * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard + * input will be directed to the NxConsole driver using this + * handle; If NULL (the default), NX keyboard input will be + * directed to the widgets within the window. + */ + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + inline void redirectNxConsole(NXCONSOLE handle) + { + setNxConsole(handle); + } +#endif + /** * Set an individual pixel in the window with the specified color. * diff --git a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx index 8e016c15e..69a004da5 100644 --- a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx +++ b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx @@ -196,6 +196,27 @@ namespace NXWidgets bool lower(void); + /** + * Each window implementation also inherits from CCallback. CCallback, + * by default, forwards NX keyboard input to the various widgets residing + * in the window. But NxConsole is a different usage model; In this case, + * keyboard input needs to be directed to the NxConsole character driver. + * This method can be used to enable (or disable) redirection of NX + * keyboard input from the window widgets to the NxConsole + * + * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard + * input will be directed to the NxConsole driver using this + * handle; If NULL (the default), NX keyboard input will be + * directed to the widgets within the window. + */ + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + inline void redirectNxConsole(NXCONSOLE handle) + { + setNxConsole(handle); + } +#endif + /** * Set an individual pixel in the toolbar with the specified color. * diff --git a/NxWidgets/libnxwidgets/include/cnxwindow.hxx b/NxWidgets/libnxwidgets/include/cnxwindow.hxx index e39c3cc81..50822cc83 100644 --- a/NxWidgets/libnxwidgets/include/cnxwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwindow.hxx @@ -200,6 +200,27 @@ namespace NXWidgets bool lower(void); + /** + * Each window implementation also inherits from CCallback. CCallback, + * by default, forwards NX keyboard input to the various widgets residing + * in the window. But NxConsole is a different usage model; In this case, + * keyboard input needs to be directed to the NxConsole character driver. + * This method can be used to enable (or disable) redirection of NX + * keyboard input from the window widgets to the NxConsole + * + * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard + * input will be directed to the NxConsole driver using this + * handle; If NULL (the default), NX keyboard input will be + * directed to the widgets within the window. + */ + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + inline void redirectNxConsole(NXCONSOLE handle) + { + setNxConsole(handle); + } +#endif + /** * Set an individual pixel in the window with the specified color. * diff --git a/NxWidgets/libnxwidgets/include/inxwindow.hxx b/NxWidgets/libnxwidgets/include/inxwindow.hxx index 750994a71..210a1e6ce 100644 --- a/NxWidgets/libnxwidgets/include/inxwindow.hxx +++ b/NxWidgets/libnxwidgets/include/inxwindow.hxx @@ -47,6 +47,10 @@ #include #include +#ifdef CONFIG_NXCONSOLE_NXKBDIN +# include +#endif + /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ @@ -168,6 +172,24 @@ namespace NXWidgets virtual bool lower(void) = 0; + /** + * Each window implementation also inherits from CCallback. CCallback, + * by default, forwards NX keyboard input to the various widgets residing + * in the window. But NxConsole is a different usage model; In this case, + * keyboard input needs to be directed to the NxConsole character driver. + * This method can be used to enable (or disable) redirection of NX + * keyboard input from the window widgets to the NxConsole + * + * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard + * input will be directed to the NxConsole driver using this + * handle; If NULL (the default), NX keyboard input will be + * directed to the widgets within the window. + */ + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + virtual void redirectNxConsole(NXCONSOLE handle) = 0; +#endif + /** * Set an individual pixel in the window with the specified color. * diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx index 5ab883ab1..699686822 100644 --- a/NxWidgets/libnxwidgets/include/nxconfig.hxx +++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx @@ -184,6 +184,14 @@ # error "Only a single color plane is supported (CONFIG_NX_NPLANES)" #endif +/* NxConsole checks. This just simplifies the conditional compilation by + * reducing the AND of these three conditions to a single condition. + */ + +#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXCONSOLE) +# undef CONFIG_NXCONSOLE_NXKBDIN +#endif + /* NX Server/Device Configuration *******************************************/ /** * LCD device number (in case there are more than one LCDs connected) diff --git a/NxWidgets/libnxwidgets/src/cbgwindow.cxx b/NxWidgets/libnxwidgets/src/cbgwindow.cxx index 58ecc1f51..268bc5d80 100644 --- a/NxWidgets/libnxwidgets/src/cbgwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cbgwindow.cxx @@ -101,7 +101,8 @@ bool CBgWindow::open(void) // Request the background the window - int ret = nx_requestbkgd(m_hNxServer, vtable, (FAR void *)m_widgetControl); + int ret = nx_requestbkgd(m_hNxServer, vtable, + (FAR void *)static_cast(this)); if (ret < 0) { return false; diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx index b2256c6bb..374502a38 100644 --- a/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/NxWidgets/libnxwidgets/src/ccallback.cxx @@ -44,6 +44,10 @@ #include #include +#ifdef CONFIG_NXCONSOLE_NXKBDIN +# include +#endif + #include "cwidgetcontrol.hxx" #include "ccallback.hxx" @@ -65,6 +69,10 @@ using namespace NXWidgets; CCallback::CCallback(CWidgetControl *widgetControl) { + // Save the widgetControl + + m_widgetControl = widgetControl; + // Initialize the callback vtable m_callbacks.redraw = redraw; @@ -76,6 +84,12 @@ CCallback::CCallback(CWidgetControl *widgetControl) m_callbacks.kbdin = newKeyboardEvent; #endif m_callbacks.blocked = windowBlocked; + + // Keyboard input is initially direct to the widgets within the window + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + m_nxconsole = (NXCONSOLE)0; +#endif } /** @@ -98,13 +112,13 @@ void CCallback::redraw(NXHANDLE hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, bMore ? "true" : "false"); - // The argument must be the CWidgetControl instance + // The argument must be the CCallback instance - CWidgetControl *This = (CWidgetControl *)arg; + CCallback *This = (CCallback *)arg; // Just forward the callback to the CWidgetControl::redrawEvent method - This->redrawEvent(rect, bMore); + This->m_widgetControl->redrawEvent(rect, bMore); } /** @@ -132,13 +146,13 @@ void CCallback::position(NXHANDLE hwnd, arg); - // The argument must be the CWidgetControl instance + // The argument must be the CCallback instance - CWidgetControl *This = (CWidgetControl *)arg; + CCallback *This = (CCallback *)arg; // Just forward the callback to the CWidgetControl::geometry method - This->geometryEvent(hwnd, size, pos, bounds); + This->m_widgetControl->geometryEvent(hwnd, size, pos, bounds); } /** @@ -160,13 +174,13 @@ void CCallback::newMouseEvent(NXHANDLE hwnd, gvdbg("hwnd=%p pos=(%d,%d) buttons=%02x arg=%p\n", hwnd, pos->x, pos->y, buttons, arg); - // The argument must be the CWidgetControl instance + // The argument must be the CCallback instance - CWidgetControl *This = (CWidgetControl *)arg; + CCallback *This = (CCallback *)arg; // Just forward the callback to the CWidgetControl::newMouseEvent method - This->newMouseEvent(pos, buttons); + This->m_widgetControl->newMouseEvent(pos, buttons); } #endif /* CONFIG_NX_MOUSE */ @@ -188,13 +202,28 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh, { gvdbg("hwnd=%p nCh=%d arg=%p\n", hwnd, nCh, arg); - // The argument must be the CWidgetControl instance + // The argument must be the CCallback instance + + CCallback *This = (CCallback *)arg; - CWidgetControl *This = (CWidgetControl *)arg; + // Is NX keyboard input being directed to the widgets within the window + // (default) OR is NX keyboard input being re-directed to an NxConsole + // driver? - // Just forward the callback to the CWidgetControl::newKeyboardEvent method +#ifdef CONFIG_NXCONSOLE_NXKBDIN + if (This->m_nxconsole) + { + // Keyboard input is going to an NxConsole + + nxcon_kbdin(This->m_nxconsole, str, nCh); + } + else +#endif + { + // Just forward the callback to the CWidgetControl::newKeyboardEvent method - This->newKeyboardEvent(nCh, str); + This->m_widgetControl->newKeyboardEvent(nCh, str); + } } /** @@ -221,13 +250,13 @@ void CCallback::windowBlocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2) { gvdbg("hwnd=%p arg1=%p arg2=%p\n", hwnd, arg1, arg2); - // The first argument must be the CWidgetControl instance + // The first argument must be the CCallback instance - CWidgetControl *This = (CWidgetControl *)arg1; + CCallback *This = (CCallback *)arg1; // Just forward the callback to the CWidgetControl::windowBlocked method - This->windowBlocked(arg2); + This->m_widgetControl->windowBlocked(arg2); } #endif diff --git a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx b/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx index 6a9c115e1..b1d7be9e2 100644 --- a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx @@ -118,7 +118,8 @@ bool CNxTkWindow::open(void) // Create the window - m_hNxTkWindow = nxtk_openwindow(m_hNxServer, vtable, (FAR void *)m_widgetControl); + m_hNxTkWindow = nxtk_openwindow(m_hNxServer, vtable, + (FAR void *)static_cast(this)); return m_hNxTkWindow != NULL; } diff --git a/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx b/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx index 12b6bea4c..725a368fa 100644 --- a/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx +++ b/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx @@ -119,7 +119,7 @@ bool CNxToolbar::open(void) // Create the toolbar int ret = nxtk_opentoolbar(m_hNxTkWindow, m_height, vtable, - (FAR void *)m_widgetControl); + (FAR void *)static_cast(this)); return ret == OK; } diff --git a/NxWidgets/libnxwidgets/src/cnxwindow.cxx b/NxWidgets/libnxwidgets/src/cnxwindow.cxx index 5ba4d734c..b38667d8d 100644 --- a/NxWidgets/libnxwidgets/src/cnxwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cnxwindow.cxx @@ -99,7 +99,8 @@ bool CNxWindow::open(void) // Create the window - m_hNxWindow = nx_openwindow(m_hNxServer, vtable, (FAR void *)m_widgetControl); + m_hNxWindow = nx_openwindow(m_hNxServer, vtable, + (FAR void *)static_cast(this)); return m_hNxWindow != NULL; } diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx index 30105910b..63cd21eb6 100644 --- a/NxWidgets/nxwm/src/cnxconsole.cxx +++ b/NxWidgets/nxwm/src/cnxconsole.cxx @@ -36,6 +36,11 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ +#include // REMOVE ME +#define CONFIG_DEBUG 1 // REMOVE ME +#define CONFIG_DEBUG_VERBOSE 1 // REMOVE ME +#define CONFIG_DEBUG_GRAPHICS 1 // REMOVE ME +#include // REMOVE ME #include @@ -202,6 +207,7 @@ bool CNxConsole::run(void) if (m_pid >= 0 || m_nxcon != 0) { + gdbg("ERROR: All ready running or connected\n"); return false; } @@ -211,6 +217,7 @@ bool CNxConsole::run(void) { // This might fail if a signal is received while we are waiting. + gdbg("ERROR: Failed to get semaphore\n"); return false; } @@ -252,6 +259,7 @@ bool CNxConsole::run(void) bool result = true; if (m_pid < 0) { + gdbg("ERROR: Failed to create the NxConsole task\n"); result = false; } else @@ -267,14 +275,22 @@ bool CNxConsole::run(void) if (ret == OK && g_nxconvars.result) { + // Re-direct NX keyboard input to the new NxConsole driver + + DEBUGASSERT(g_nxconvars.nxcon != 0); +#ifdef CONFIG_NXCONSOLE_NXKBDIN + window->redirectNxConsole(g_nxconvars.nxcon); +#endif // Save the handle to use in the stop method m_nxcon = g_nxconvars.nxcon; } else { - // Stop the application + // sem_timedwait failed OR the NxConsole task reported a + // failure. Stop the application + gdbg("ERROR: Failed start the NxConsole task\n"); stop(); result = false; } @@ -313,6 +329,15 @@ void CNxConsole::stop(void) if (m_nxcon) { + // Re-store NX keyboard input routing + +#ifdef CONFIG_NXCONSOLE_NXKBDIN + NXWidgets::INxWindow *window = m_window->getWindow(); + window->redirectNxConsole((NXCONSOLE)0); +#endif + + // Unregister the NxConsole driver + nxcon_unregister(m_nxcon); m_nxcon = 0; } @@ -405,6 +430,7 @@ int CNxConsole::nxconsole(int argc, char *argv[]) if (on_exit(exitHandler, g_nxconvars.console) != 0) { + gdbg("ERROR: on_exit failed\n"); goto errout; } @@ -414,6 +440,7 @@ int CNxConsole::nxconsole(int argc, char *argv[]) g_nxconvars.minor); if (!g_nxconvars.nxcon) { + gdbg("ERROR: Failed register the console device\n"); goto errout; } @@ -428,9 +455,14 @@ int CNxConsole::nxconsole(int argc, char *argv[]) // Open the NxConsole driver +#ifdef CONFIG_NXCONSOLE_NXKBDIN + fd = open(devname, O_RDWR); +#else fd = open(devname, O_WRONLY); +#endif if (fd < 0) { + gdbg("ERROR: Failed open the console device\n"); goto errout_with_nxcon; } @@ -442,12 +474,21 @@ int CNxConsole::nxconsole(int argc, char *argv[]) (void)std::fflush(stdout); (void)std::fflush(stderr); +#ifdef CONFIG_NXCONSOLE_NXKBDIN + (void)std::fclose(stdin); +#endif (void)std::fclose(stdout); (void)std::fclose(stderr); +#ifdef CONFIG_NXCONSOLE_NXKBDIN + (void)std::dup2(fd, 0); +#endif (void)std::dup2(fd, 1); (void)std::dup2(fd, 2); +#ifdef CONFIG_NXCONSOLE_NXKBDIN + (void)std::fdopen(0, "r"); +#endif (void)std::fdopen(1, "w"); (void)std::fdopen(2, "w"); -- cgit v1.2.3