Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-26 11:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ChangeLog

Browse source
This commit is contained in:
Gregory Nutt 2014-09-20 14:43:30 -06:00
parent a39743bbf3
commit 70db994200
14 changed files with 96 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libnxwidgets/include/cbgwindow.hxx
View file

@ -209,21 +209,21 @@ namespace NXWidgets
/**
* 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.
* in the window. But NxTerm is a different usage model; In this case,
* keyboard input needs to be directed to the NxTerm character driver.
* This method can be used to enable (or disable) redirection of NX
* keyboard input from the window widgets to the NxConsole
* keyboard input from the window widgets to the NxTerm
*
* @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard
* input will be directed to the NxConsole driver using this
* @param handle. The NXTERM handle. If non-NULL, NX keyboard
* input will be directed to the NxTerm driver using this
* handle; If NULL (the default), NX keyboard input will be
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
inline void redirectNxTerm(NXTERM handle)
{
setNxConsole(handle);
setNxTerm(handle);
}
#endif

18
libnxwidgets/include/ccallback.hxx
View file

@ -50,7 +50,7 @@
#include <nuttx/nx/nx.h>
#ifdef CONFIG_NXTERM_NXKBDIN
# include <nuttx/nx/nxconsole.h>
# include <nuttx/nx/nxterm.h>
#endif
#include "crect.hxx"
@ -94,7 +94,7 @@ namespace NXWidgets
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_NXTERM_NXKBDIN
NXCONSOLE m_nxconsole; /**< The NxConsole handle for redirection of keyboard input */
NXTERM m_nxterm; /**< The NxTerm handle for redirection of keyboard input */
#endif
// Methods in the callback vtable
@ -245,22 +245,22 @@ namespace NXWidgets
/**
* 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
* residing in the window. But NxTerm is a different usage model;
* In this case, keyboard input needs to be directed to the NxTerm
* character driver. This method can be used to enable (or disable)
* redirection of NX keyboard input from the window widgets to the
* NxConsole
* NxTerm
*
* @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard
* input will be directed to the NxConsole driver using this
* @param handle. The NXTERM handle. If non-NULL, NX keyboard
* input will be directed to the NxTerm driver using this
* handle; If NULL (the default), NX keyboard input will be
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXTERM_NXKBDIN
inline void setNxConsole(NXCONSOLE handle)
inline void setNxTerm(NXTERM handle)
{
m_nxconsole = handle;
m_nxterm = handle;
}
#endif
};

14
libnxwidgets/include/cnxtkwindow.hxx
View file

@ -230,21 +230,21 @@ namespace NXWidgets
/**
* 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.
* in the window. But NxTerm is a different usage model; In this case,
* keyboard input needs to be directed to the NxTerm character driver.
* This method can be used to enable (or disable) redirection of NX
* keyboard input from the window widgets to the NxConsole
* keyboard input from the window widgets to the NxTerm
*
* @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard
* input will be directed to the NxConsole driver using this
* @param handle. The NXTERM handle. If non-NULL, NX keyboard
* input will be directed to the NxTerm driver using this
* handle; If NULL (the default), NX keyboard input will be
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
inline void redirectNxTerm(NXTERM handle)
{
setNxConsole(handle);
setNxTerm(handle);
}
#endif

14
libnxwidgets/include/cnxtoolbar.hxx
View file

@ -199,21 +199,21 @@ namespace NXWidgets
/**
* 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.
* in the window. But NxTerm is a different usage model; In this case,
* keyboard input needs to be directed to the NxTerm character driver.
* This method can be used to enable (or disable) redirection of NX
* keyboard input from the window widgets to the NxConsole
* keyboard input from the window widgets to the NxTerm
*
* @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard
* input will be directed to the NxConsole driver using this
* @param handle. The NXTERM handle. If non-NULL, NX keyboard
* input will be directed to the NxTerm driver using this
* handle; If NULL (the default), NX keyboard input will be
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
inline void redirectNxTerm(NXTERM handle)
{
setNxConsole(handle);
setNxTerm(handle);
}
#endif

14
libnxwidgets/include/cnxwindow.hxx
View file

@ -203,21 +203,21 @@ namespace NXWidgets
/**
* 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.
* in the window. But NxTerm is a different usage model; In this case,
* keyboard input needs to be directed to the NxTerm character driver.
* This method can be used to enable (or disable) redirection of NX
* keyboard input from the window widgets to the NxConsole
* keyboard input from the window widgets to the NxTerm
*
* @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard
* input will be directed to the NxConsole driver using this
* @param handle. The NXTERM handle. If non-NULL, NX keyboard
* input will be directed to the NxTerm driver using this
* handle; If NULL (the default), NX keyboard input will be
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
inline void redirectNxTerm(NXTERM handle)
{
setNxConsole(handle);
setNxTerm(handle);
}
#endif

14
libnxwidgets/include/inxwindow.hxx
View file

@ -48,7 +48,7 @@
#include <stdbool.h>
#ifdef CONFIG_NXTERM_NXKBDIN
# include <nuttx/nx/nxconsole.h>
# include <nuttx/nx/nxterm.h>
#endif
/****************************************************************************
@ -175,19 +175,19 @@ namespace NXWidgets
/**
* 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.
* in the window. But NxTerm is a different usage model; In this case,
* keyboard input needs to be directed to the NxTerm character driver.
* This method can be used to enable (or disable) redirection of NX
* keyboard input from the window widgets to the NxConsole
* keyboard input from the window widgets to the NxTerm
*
* @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard
* input will be directed to the NxConsole driver using this
* @param handle. The NXTERM handle. If non-NULL, NX keyboard
* input will be directed to the NxTerm driver using this
* handle; If NULL (the default), NX keyboard input will be
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXTERM_NXKBDIN
virtual void redirectNxConsole(NXCONSOLE handle) = 0;
virtual void redirectNxTerm(NXTERM handle) = 0;
#endif
/**

2
libnxwidgets/include/nxconfig.hxx
View file

@ -184,7 +184,7 @@
# error "Only a single color plane is supported (CONFIG_NX_NPLANES)"
#endif
/* NxConsole checks. This just simplifies the conditional compilation by
/* NxTerm checks. This just simplifies the conditional compilation by
* reducing the AND of these three conditions to a single condition.
*/