diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 16:31:31 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 16:31:31 -0600 |
commit | 72754295cabf0096cbc6f2ec693f1e5e362d8c56 (patch) | |
tree | d541af4e4c2a1ba416aa775623d658d926b282b8 | |
parent | 80ea5737ca7bbdb33ba3ccf37a7c919338876222 (diff) | |
download | px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.gz px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.bz2 px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.zip |
Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN
76 files changed, 231 insertions, 119 deletions
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index a1a6803e4..aea80e076 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -1113,6 +1113,7 @@ menu "NxWM Media Player Display Settings" config NXWM_MEDIAPLAYER bool "NxWM Media Player" default n + depends on FS_READABLE ---help--- Enable support for the MP3 Media Player. This features requires a board that includes an MP3 Codec chip, such as the Mikromedia diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx index bef4a2ca9..8127dc20d 100644 --- a/NxWidgets/libnxwidgets/include/ccallback.hxx +++ b/NxWidgets/libnxwidgets/include/ccallback.hxx @@ -158,11 +158,11 @@ namespace NXWidgets * nxtk_openwindow, or nxtk_opentoolbar). */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void newMouseEvent(NXHANDLE hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); -#endif /* CONFIG_NX_MOUSE */ +#endif /* CONFIG_NX_XYINPUT */ /** * New keyboard/keypad data is available for the window. The new diff --git a/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx b/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx index 379ae4725..6a8fcbf0c 100644 --- a/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx +++ b/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx @@ -94,7 +94,7 @@ namespace NXWidgets * @param e The event data. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT virtual void handleMouseEvent(void) { } #endif diff --git a/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx b/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx index a076e63cf..e677339c2 100644 --- a/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx +++ b/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx @@ -149,7 +149,7 @@ namespace NXWidgets * Raise an NX mouse window input event. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void raiseMouseEvent(void); #endif diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx index 05c6d8422..34be7a788 100644 --- a/NxWidgets/libnxwidgets/include/nxconfig.hxx +++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx @@ -57,7 +57,7 @@ * * CONFIG_HAVE_CXX=y : C++ support is required * CONFIG_NX=y : NX graphics support must be enabled - * CONFIG_NX_MOUSE=y : Required to enable NX mouse/touchscreen support + * CONFIG_NX_XYINPUT=y : Required to enable NX mouse/touchscreen support * CONFIG_NX_KBD=y : Required to enabled NX keyboard support * CONFIG_NX_NPLANES=1 : Only a single video plane is supported * @@ -160,8 +160,8 @@ * Required to enable NX mouse/touchscreen support */ -#ifndef CONFIG_NX_MOUSE -# warning "NX mouse/touchscreen support is required (CONFIG_NX_MOUSE)" +#ifndef CONFIG_NX_XYINPUT +# warning "NX mouse/touchscreen support is required (CONFIG_NX_XYINPUT)" #endif /** diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx index 488016162..4550d24b0 100644 --- a/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/NxWidgets/libnxwidgets/src/ccallback.cxx @@ -77,7 +77,7 @@ CCallback::CCallback(CWidgetControl *widgetControl) m_callbacks.redraw = redraw; m_callbacks.position = position; -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT m_callbacks.mousein = newMouseEvent; #endif #ifdef CONFIG_NX_KBD @@ -165,7 +165,7 @@ void CCallback::position(NXHANDLE hwnd, * nxtk_openwindow, or nxtk_opentoolbar). */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void CCallback::newMouseEvent(NXHANDLE hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) @@ -181,7 +181,7 @@ void CCallback::newMouseEvent(NXHANDLE hwnd, This->m_widgetControl->newMouseEvent(pos, buttons); } -#endif /* CONFIG_NX_MOUSE */ +#endif /* CONFIG_NX_XYINPUT */ /** * New keyboard/keypad data is available for the window. The new keyboard diff --git a/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx b/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx index 2cb1a930d..aab75b84c 100644 --- a/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx +++ b/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx @@ -448,7 +448,7 @@ void CWidgetControl::redrawEvent(FAR const struct nxgl_rect_s *nxRect, bool more * @param buttons See NX_MOUSE_* definitions. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void CWidgetControl::newMouseEvent(FAR const struct nxgl_point_s *pos, uint8_t buttons) { // Save the mouse X/Y position diff --git a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx index 79dd97d7f..265fd7ff2 100644 --- a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx +++ b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx @@ -136,7 +136,7 @@ void CWindowEventHandlerList::raiseGeometryEvent(void) * Raise an NX mouse window input event. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void CWindowEventHandlerList::raiseMouseEvent(void) { for (int i = 0; i < m_eventHandlers.size(); ++i) diff --git a/NxWidgets/nxwm/include/cwindowmessenger.hxx b/NxWidgets/nxwm/include/cwindowmessenger.hxx index a30010fd8..3822813d1 100644 --- a/NxWidgets/nxwm/include/cwindowmessenger.hxx +++ b/NxWidgets/nxwm/include/cwindowmessenger.hxx @@ -103,7 +103,7 @@ namespace NxWM * @param e The event data. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void handleMouseEvent(void); #endif diff --git a/NxWidgets/nxwm/src/cwindowmessenger.cxx b/NxWidgets/nxwm/src/cwindowmessenger.cxx index 114690838..86120aacd 100644 --- a/NxWidgets/nxwm/src/cwindowmessenger.cxx +++ b/NxWidgets/nxwm/src/cwindowmessenger.cxx @@ -91,7 +91,7 @@ CWindowMessenger::~CWindowMessenger(void) * @param e The event data. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void CWindowMessenger::handleMouseEvent(void) { // The logic path here is tortuous but flexible: diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig index a1a6803e4..aea80e076 100644 --- a/apps/NxWidgets/Kconfig +++ b/apps/NxWidgets/Kconfig @@ -1113,6 +1113,7 @@ menu "NxWM Media Player Display Settings" config NXWM_MEDIAPLAYER bool "NxWM Media Player" default n + depends on FS_READABLE ---help--- Enable support for the MP3 Media Player. This features requires a board that includes an MP3 Codec chip, such as the Mikromedia diff --git a/apps/examples/nx/nx_events.c b/apps/examples/nx/nx_events.c index 329e5c533..934d4491a 100644 --- a/apps/examples/nx/nx_events.c +++ b/apps/examples/nx/nx_events.c @@ -69,7 +69,7 @@ static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -81,7 +81,7 @@ static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -99,7 +99,7 @@ const struct nx_callback_s g_nxcb = { nxeg_redraw, /* redraw */ nxeg_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxeg_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -112,7 +112,7 @@ const struct nx_callback_s g_tbcb = { nxeg_tbredraw, /* redraw */ nxeg_tbposition /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxeg_tbmousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -224,7 +224,7 @@ static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxeg_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { @@ -276,7 +276,7 @@ static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size, ****************************************************************************/ #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c index 7bfd19732..17e70e205 100644 --- a/apps/examples/nx/nx_main.c +++ b/apps/examples/nx/nx_main.c @@ -141,7 +141,7 @@ nxgl_mxpixel_t g_tbcolor[CONFIG_NX_NPLANES]; * Name: nxeg_drivemouse ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxeg_drivemouse(void) { nxgl_coord_t x; @@ -825,7 +825,7 @@ int nx_main(int argc, char *argv[]) /* Put mouse left-button clicks all over the screen and see who responds */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxeg_drivemouse(); /* Sleep a bit */ @@ -862,7 +862,7 @@ int nx_main(int argc, char *argv[]) /* Put mouse left-button clicks all over the screen and see who responds */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxeg_drivemouse(); #endif diff --git a/apps/examples/nxconsole/nxcon_toolbar.c b/apps/examples/nxconsole/nxcon_toolbar.c index d4432b2f4..767a1a3f3 100644 --- a/apps/examples/nxconsole/nxcon_toolbar.c +++ b/apps/examples/nxconsole/nxcon_toolbar.c @@ -71,7 +71,7 @@ static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -95,7 +95,7 @@ const struct nx_callback_s g_nxtoolcb = { nxtool_redraw, /* redraw */ nxtool_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxtool_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -147,7 +147,7 @@ static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxtool_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/apps/examples/nxconsole/nxcon_wndo.c b/apps/examples/nxconsole/nxcon_wndo.c index 083da739d..23a981b0f 100644 --- a/apps/examples/nxconsole/nxcon_wndo.c +++ b/apps/examples/nxconsole/nxcon_wndo.c @@ -72,7 +72,7 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -96,7 +96,7 @@ const struct nx_callback_s g_nxconcb = { nxwndo_redraw, /* redraw */ nxwndo_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxwndo_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -181,7 +181,7 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxwndo_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c index 053078655..08be6d3a9 100644 --- a/apps/examples/nxhello/nxhello_bkgd.c +++ b/apps/examples/nxhello/nxhello_bkgd.c @@ -94,7 +94,7 @@ static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -120,7 +120,7 @@ const struct nx_callback_s g_nxhellocb = { nxhello_redraw, /* redraw */ nxhello_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxhello_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -182,7 +182,7 @@ static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxhello_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/apps/examples/nximage/nximage_bkgd.c b/apps/examples/nximage/nximage_bkgd.c index ddd7b4a72..b20f777c1 100644 --- a/apps/examples/nximage/nximage_bkgd.c +++ b/apps/examples/nximage/nximage_bkgd.c @@ -127,7 +127,7 @@ static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -157,7 +157,7 @@ const struct nx_callback_s g_nximagecb = { nximage_redraw, /* redraw */ nximage_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nximage_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -231,7 +231,7 @@ static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/apps/examples/nxlines/nxlines_bkgd.c b/apps/examples/nxlines/nxlines_bkgd.c index 9dd785605..b9383fd1d 100644 --- a/apps/examples/nxlines/nxlines_bkgd.c +++ b/apps/examples/nxlines/nxlines_bkgd.c @@ -74,7 +74,7 @@ static void nxlines_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxlines_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -98,7 +98,7 @@ const struct nx_callback_s g_nxlinescb = { nxlines_redraw, /* redraw */ nxlines_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxlines_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -160,7 +160,7 @@ static void nxlines_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxlines_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxlines_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c index 2d65cbeae..e91ad0a91 100644 --- a/apps/examples/nxtext/nxtext_bkgd.c +++ b/apps/examples/nxtext/nxtext_bkgd.c @@ -71,7 +71,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -99,7 +99,7 @@ const struct nx_callback_s g_nxtextcb = { nxbg_redraw, /* redraw */ nxbg_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxbg_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -199,7 +199,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxbg_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index 4fcc80c13..25c86b460 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -73,7 +73,7 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -93,7 +93,7 @@ static const struct nx_callback_s g_pucb = { nxpu_redraw, /* redraw */ nxpu_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxpu_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -246,7 +246,7 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxpu_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index 743e0368a..af7392f5d 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -923,7 +923,7 @@ struct nx_callback_s FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -1001,7 +1001,7 @@ void position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, <h4>2.3.3.3 <a name="nxcbmousein"><code>mousein()</code></a></h4> <p><b>Callback Function Prototype:</b></p> <ul><pre> -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -1987,7 +1987,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch); #include <nuttx/nx/nxglib.h> #include <nuttx/nx/nx.h> -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons); #endif </pre></ul> @@ -3259,8 +3259,8 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <ul> <dl> - <dt><code>CONFIG_NX_MOUSE</code>: - <dd>Build in support for mouse input. + <dt><code>CONFIG_NX_XYINPUT</code>: + <dd>Build in support for an X/Y input such as a mouse or a touscreen. <dt><code>CONFIG_NX_KBD</code>: <dd>Build in support of keypad/keyboard input. <dt><code>CONFIG_NX_WRITEONLY</code>: diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig index a1e0ee9f0..0a31a7dd0 100644 --- a/nuttx/configs/compal_e99/nsh_highram/defconfig +++ b/nuttx/configs/compal_e99/nsh_highram/defconfig @@ -412,7 +412,7 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index 84eb723aa..b109b1828 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -542,7 +542,7 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set # CONFIG_NX_KBD is not set # diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 3efc1e2d5..51a179378 100644 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -465,7 +465,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index d66d298e1..ca5db5fff 100644 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -473,7 +473,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig index 4df3778a5..48bb6b3a9 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig @@ -526,7 +526,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/maple/nx/defconfig b/nuttx/configs/maple/nx/defconfig index 578076da6..f1f5b5533 100644 --- a/nuttx/configs/maple/nx/defconfig +++ b/nuttx/configs/maple/nx/defconfig @@ -625,7 +625,7 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set # CONFIG_NX_KBD is not set # diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig index ac2f4ddc1..2826d98fc 100644 --- a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig @@ -759,7 +759,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/mikroe-stm32f4/nx/defconfig b/nuttx/configs/mikroe-stm32f4/nx/defconfig index dacf49571..4f9916a54 100644 --- a/nuttx/configs/mikroe-stm32f4/nx/defconfig +++ b/nuttx/configs/mikroe-stm32f4/nx/defconfig @@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set # CONFIG_NX_KBD is not set # diff --git a/nuttx/configs/mikroe-stm32f4/nxlines/defconfig b/nuttx/configs/mikroe-stm32f4/nxlines/defconfig index 70a5e4b9f..439d843b9 100644 --- a/nuttx/configs/mikroe-stm32f4/nxlines/defconfig +++ b/nuttx/configs/mikroe-stm32f4/nxlines/defconfig @@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set # CONFIG_NX_KBD is not set # diff --git a/nuttx/configs/mikroe-stm32f4/nxtext/defconfig b/nuttx/configs/mikroe-stm32f4/nxtext/defconfig index 045d9f54f..53d51d7e4 100644 --- a/nuttx/configs/mikroe-stm32f4/nxtext/defconfig +++ b/nuttx/configs/mikroe-stm32f4/nxtext/defconfig @@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set # CONFIG_NX_KBD is not set # diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index 5632b6886..ea08b2f8b 100644 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -537,7 +537,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/open1788/nxlines/defconfig b/nuttx/configs/open1788/nxlines/defconfig index 7bf9d037c..d7cea2ce3 100644 --- a/nuttx/configs/open1788/nxlines/defconfig +++ b/nuttx/configs/open1788/nxlines/defconfig @@ -451,7 +451,7 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set # CONFIG_NX_KBD is not set # diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index a3d754fce..8ccc5cdb8 100644 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -509,7 +509,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sam3u-ek/nxwm/defconfig b/nuttx/configs/sam3u-ek/nxwm/defconfig index 77b47d335..4cf822037 100644 --- a/nuttx/configs/sam3u-ek/nxwm/defconfig +++ b/nuttx/configs/sam3u-ek/nxwm/defconfig @@ -538,7 +538,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sama5d3x-ek/nx/defconfig b/nuttx/configs/sama5d3x-ek/nx/defconfig index cfe518ac4..226435765 100644 --- a/nuttx/configs/sama5d3x-ek/nx/defconfig +++ b/nuttx/configs/sama5d3x-ek/nx/defconfig @@ -581,7 +581,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig index bd1a6052e..80fe5e08f 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig @@ -638,7 +638,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt index c087de4f0..1bb48696d 100644 --- a/nuttx/configs/sama5d4-ek/README.txt +++ b/nuttx/configs/sama5d4-ek/README.txt @@ -2944,7 +2944,7 @@ TM7000 LCD/Touchscreen CONFIG_NX_DISABLE_32BPP=y Graphics Support -> Input Devices -> - CONFIG_NX_MOUSE=y : Build in mouse/touchscreen support (not used) + CONFIG_NX_XYINPUT=y : Build in mouse/touchscreen support (not used) CONFIG_NX_KBD=y : Build in keyboard support (not used) Graphics Support -> Framed Window Borders -> diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig index b66c0a7f5..103e050a9 100644 --- a/nuttx/configs/sama5d4-ek/nsh/defconfig +++ b/nuttx/configs/sama5d4-ek/nsh/defconfig @@ -848,7 +848,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sama5d4-ek/nxwm/defconfig b/nuttx/configs/sama5d4-ek/nxwm/defconfig index 49219978d..01ede6c98 100644 --- a/nuttx/configs/sama5d4-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d4-ek/nxwm/defconfig @@ -852,7 +852,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig index 2238901eb..33e80895e 100644 --- a/nuttx/configs/shenzhou/nxwm/defconfig +++ b/nuttx/configs/shenzhou/nxwm/defconfig @@ -698,7 +698,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig index 7959821ed..0be30d738 100644 --- a/nuttx/configs/sim/nsh2/defconfig +++ b/nuttx/configs/sim/nsh2/defconfig @@ -318,7 +318,10 @@ CONFIG_NX_DISABLE_24BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index 77423e1d8..027cafc0e 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -343,7 +343,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig index 5b093bf96..d254a6879 100644 --- a/nuttx/configs/sim/nx11/defconfig +++ b/nuttx/configs/sim/nx11/defconfig @@ -344,7 +344,10 @@ CONFIG_NX_DISABLE_24BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sim/nxlines/defconfig b/nuttx/configs/sim/nxlines/defconfig index 8634930f4..64bd0c8e5 100644 --- a/nuttx/configs/sim/nxlines/defconfig +++ b/nuttx/configs/sim/nxlines/defconfig @@ -340,7 +340,10 @@ CONFIG_NX_DISABLE_24BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig index 66b0548f2..437f1464e 100644 --- a/nuttx/configs/sim/nxwm/defconfig +++ b/nuttx/configs/sim/nxwm/defconfig @@ -337,7 +337,7 @@ CONFIG_NX_DISABLE_24BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig index a649105a1..0a598373d 100644 --- a/nuttx/configs/sim/touchscreen/defconfig +++ b/nuttx/configs/sim/touchscreen/defconfig @@ -352,7 +352,10 @@ CONFIG_NX_DISABLE_24BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index a4fbd4040..361c34e7d 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -716,7 +716,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index 83ff4d71c..25e77c610 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/configs/stm3210e-eval/nx/defconfig @@ -642,7 +642,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig index 20d25b926..c506799e6 100644 --- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig @@ -619,7 +619,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig index 54e913fa1..5ab88d602 100644 --- a/nuttx/configs/stm3210e-eval/pm/defconfig +++ b/nuttx/configs/stm3210e-eval/pm/defconfig @@ -640,7 +640,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig index 2dfd0b354..a52ccd89b 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig @@ -752,7 +752,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3240g-eval/knxwm/defconfig b/nuttx/configs/stm3240g-eval/knxwm/defconfig index f43b07159..340d32692 100644 --- a/nuttx/configs/stm3240g-eval/knxwm/defconfig +++ b/nuttx/configs/stm3240g-eval/knxwm/defconfig @@ -668,7 +668,7 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig index 7ca838802..22cc4a9cd 100644 --- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig @@ -725,7 +725,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig index d62ef1b13..119448ec3 100644 --- a/nuttx/configs/stm3240g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig @@ -747,7 +747,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +# CONFIG_NX_XYINPUT_MOUSE is not set +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX_KBD=y # diff --git a/nuttx/configs/stm32f4discovery/nxlines/defconfig b/nuttx/configs/stm32f4discovery/nxlines/defconfig index a0fbe5ec9..1be726ab7 100644 --- a/nuttx/configs/stm32f4discovery/nxlines/defconfig +++ b/nuttx/configs/stm32f4discovery/nxlines/defconfig @@ -628,7 +628,10 @@ CONFIG_NX_DISABLE_32BPP=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/zkit-arm-1769/nxhello/defconfig b/nuttx/configs/zkit-arm-1769/nxhello/defconfig index aa3e38161..0c9369c19 100644 --- a/nuttx/configs/zkit-arm-1769/nxhello/defconfig +++ b/nuttx/configs/zkit-arm-1769/nxhello/defconfig @@ -631,7 +631,10 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -CONFIG_NX_MOUSE=y +CONFIG_NX_XYINPUT=y +# CONFIG_NX_XYINPUT_NONE is not set +CONFIG_NX_XYINPUT_MOUSE=y +# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set CONFIG_NX_KBD=y # diff --git a/nuttx/configs/zp214xpa/nxlines/defconfig b/nuttx/configs/zp214xpa/nxlines/defconfig index cdcf61760..d024b0304 100644 --- a/nuttx/configs/zp214xpa/nxlines/defconfig +++ b/nuttx/configs/zp214xpa/nxlines/defconfig @@ -346,7 +346,7 @@ CONFIG_NX_PACKEDMSFIRST=y # # Input Devices # -# CONFIG_NX_MOUSE is not set +# CONFIG_NX_XYINPUT is not set # CONFIG_NX_KBD is not set # diff --git a/nuttx/graphics/Kconfig b/nuttx/graphics/Kconfig index 85e2164a8..187089b54 100644 --- a/nuttx/graphics/Kconfig +++ b/nuttx/graphics/Kconfig @@ -118,11 +118,42 @@ config NX_PACKEDMSFIRST menu "Input Devices" -config NX_MOUSE - bool "Mouse/Touchscreen Support" +config NX_XYINPUT + bool default n + +choice + prompt "Mouse/Touchscreen Support" + default NX_XYINPUT_NONE + +config NX_XYINPUT_NONE + bool "No X/Y input device" + ---help--- + There is no X/Y positional input device connected + +config NX_XYINPUT_MOUSE + bool "Mouse device support" + select NX_XYINPUT ---help--- - Build in support for mouse or touchscreeninput. + X/Y positional input is provided by a mouse. The only difference + between the mouse and touchscreen selection is in the presence or + absence of the mouse buttons. This difference is not used within + NuttX itself, however, graphics applications may need this + information, for example, to handle the different ways that graphic + elements are selected and dragged. + +config NX_XYINPUT_TOUCHSCREEN + bool "Touchscreen device support" + select NX_XYINPUT + ---help--- + X/Y positional input is provided by a touchscreen. The only difference + between the mouse and touchscreen selection is in the presence or + absence of the mouse buttons. This difference is not used within + NuttX itself, however, graphics applications may need this + information, for example, to handle the different ways that graphic + elements are selected and dragged. + +endchoice # Mouse/Touchscreen Support config NX_KBD bool "Keyboard Support" diff --git a/nuttx/graphics/README.txt b/nuttx/graphics/README.txt index 1532c66b5..a0902546a 100644 --- a/nuttx/graphics/README.txt +++ b/nuttx/graphics/README.txt @@ -275,8 +275,9 @@ CONFIG_NX_DISABLE_32BPP CONFIG_NX_PACKEDMSFIRST If a pixel depth of less than 8-bits is used, then NX needs to know if the pixels pack from the MS to LS or from LS to MS -CONFIG_NX_MOUSE - Build in support for mouse input. +CONFIG_NX_XYINPUT + Build in support for a X/Y positional input device such as a mouse or a + touchscreen. CONFIG_NX_KBD Build in support of keypad/keyboard input. CONFIG_NXTK_BORDERWIDTH diff --git a/nuttx/graphics/nxconsole/nxcon_internal.h b/nuttx/graphics/nxconsole/nxcon_internal.h index dc976a662..37bb73aec 100644 --- a/nuttx/graphics/nxconsole/nxcon_internal.h +++ b/nuttx/graphics/nxconsole/nxcon_internal.h @@ -188,7 +188,7 @@ struct nxcon_state_s */ #ifndef CONFIG_DISABLE_POLL - struct pollfd *fds[CONFIG_RAMLOG_NPOLLWAITERS]; + struct pollfd *fds[CONFIG_NXCONSOLE_NPOLLWAITERS]; #endif #endif /* CONFIG_NXCONSOLE_NXKBDIN */ }; diff --git a/nuttx/graphics/nxmu/nxfe.h b/nuttx/graphics/nxmu/nxfe.h index 42e768267..00db9bb58 100644 --- a/nuttx/graphics/nxmu/nxfe.h +++ b/nuttx/graphics/nxmu/nxfe.h @@ -220,7 +220,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, * ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void nxmu_mouseinit(int x, int y); #endif @@ -238,7 +238,7 @@ void nxmu_mouseinit(int x, int y); * ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT int nxmu_mousereport(struct nxbe_window_s *wnd); #endif @@ -252,7 +252,7 @@ int nxmu_mousereport(struct nxbe_window_s *wnd); * ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT int nxmu_mousein(FAR struct nxfe_state_s *fe, FAR const struct nxgl_point_s *pos, int button); #endif diff --git a/nuttx/graphics/nxmu/nxmu_mouse.c b/nuttx/graphics/nxmu/nxmu_mouse.c index 1b8f4a592..90378a02d 100644 --- a/nuttx/graphics/nxmu/nxmu_mouse.c +++ b/nuttx/graphics/nxmu/nxmu_mouse.c @@ -47,7 +47,7 @@ #include <nuttx/nx/nx.h> #include "nxfe.h" -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT /**************************************************************************** * Pre-Processor Definitions @@ -232,4 +232,4 @@ int nxmu_mousein(FAR struct nxfe_state_s *fe, return OK; } -#endif /* CONFIG_NX_MOUSE */ +#endif /* CONFIG_NX_XYINPUT */ diff --git a/nuttx/graphics/nxmu/nxmu_openwindow.c b/nuttx/graphics/nxmu/nxmu_openwindow.c index 395f0a770..c159045b7 100644 --- a/nuttx/graphics/nxmu/nxmu_openwindow.c +++ b/nuttx/graphics/nxmu/nxmu_openwindow.c @@ -107,7 +107,7 @@ void nxmu_openwindow(FAR struct nxbe_state_s *be, FAR struct nxbe_window_s *wnd) /* Provide the initial mouse settings to the client */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxmu_mousereport(wnd); #endif } diff --git a/nuttx/graphics/nxmu/nxmu_requestbkgd.c b/nuttx/graphics/nxmu/nxmu_requestbkgd.c index 47b1ad13f..ef7c9f1c0 100644 --- a/nuttx/graphics/nxmu/nxmu_requestbkgd.c +++ b/nuttx/graphics/nxmu/nxmu_requestbkgd.c @@ -117,7 +117,7 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn, /* Provide the mouse settings */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxmu_mousereport(&be->bkgd); #endif } diff --git a/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c index 4cb1246b5..b96b4f8b8 100644 --- a/nuttx/graphics/nxmu/nxmu_server.c +++ b/nuttx/graphics/nxmu/nxmu_server.c @@ -259,7 +259,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev, /* Initialize the mouse position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxmu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres); #endif return OK; @@ -501,7 +501,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev) } break; -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT case NX_SVRMSG_MOUSEIN: /* New mouse report from mouse client */ { FAR struct nxsvrmsg_mousein_s *mousemsg = (FAR struct nxsvrmsg_mousein_s *)buffer; diff --git a/nuttx/graphics/nxsu/nx_constructwindow.c b/nuttx/graphics/nxsu/nx_constructwindow.c index d4e90dbfb..f5f5720a9 100644 --- a/nuttx/graphics/nxsu/nx_constructwindow.c +++ b/nuttx/graphics/nxsu/nx_constructwindow.c @@ -144,7 +144,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd, /* Provide the initial mouse settings */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxsu_mousereport(wnd); #endif diff --git a/nuttx/graphics/nxsu/nx_mousein.c b/nuttx/graphics/nxsu/nx_mousein.c index 5b268358b..551737779 100644 --- a/nuttx/graphics/nxsu/nx_mousein.c +++ b/nuttx/graphics/nxsu/nx_mousein.c @@ -48,7 +48,7 @@ #include "nxfe.h" -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT /**************************************************************************** * Pre-Processor Definitions @@ -215,4 +215,4 @@ int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons) return OK; } -#endif /* CONFIG_NX_MOUSE */ +#endif /* CONFIG_NX_XYINPUT */ diff --git a/nuttx/graphics/nxsu/nx_open.c b/nuttx/graphics/nxsu/nx_open.c index a8956d8af..0de1159ae 100644 --- a/nuttx/graphics/nxsu/nx_open.c +++ b/nuttx/graphics/nxsu/nx_open.c @@ -78,7 +78,7 @@ const struct nx_callback_s g_bkgdcb = { nxsu_bkgdredraw, /* redraw */ NULL /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , NULL /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -153,7 +153,7 @@ static inline int nxsu_setup(FAR NX_DRIVERTYPE *dev, /* Initialize the mouse position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxsu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres); #endif return OK; diff --git a/nuttx/graphics/nxsu/nx_requestbkgd.c b/nuttx/graphics/nxsu/nx_requestbkgd.c index 7f0ab12f2..a62b37cec 100644 --- a/nuttx/graphics/nxsu/nx_requestbkgd.c +++ b/nuttx/graphics/nxsu/nx_requestbkgd.c @@ -138,7 +138,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb, /* Provide the mouse settings to the client */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT nxsu_mousereport(&be->bkgd); #endif diff --git a/nuttx/graphics/nxsu/nxfe.h b/nuttx/graphics/nxsu/nxfe.h index 82c1d832b..e3f9ac357 100644 --- a/nuttx/graphics/nxsu/nxfe.h +++ b/nuttx/graphics/nxsu/nxfe.h @@ -122,7 +122,7 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd); * ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void nxsu_mouseinit(int x, int y); #endif @@ -140,7 +140,7 @@ void nxsu_mouseinit(int x, int y); * ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT int nxsu_mousereport(struct nxbe_window_s *wnd); #endif diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h index 96584db7d..6093a0878 100644 --- a/nuttx/include/nuttx/nx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -164,7 +164,7 @@ struct nx_callback_s * **************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -917,7 +917,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch); * ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons); #endif diff --git a/nuttx/include/nuttx/nx/nxmu.h b/nuttx/include/nuttx/nx/nxmu.h index 019a8a35f..711365f74 100644 --- a/nuttx/include/nuttx/nx/nxmu.h +++ b/nuttx/include/nuttx/nx/nxmu.h @@ -209,7 +209,7 @@ struct nxclimsg_newposition_s /* This message reports a new mouse event to a particular window */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT struct nxclimsg_mousein_s { uint32_t msgid; /* NX_SVRMSG_MOUSEIN */ @@ -423,7 +423,7 @@ struct nxsvrmsg_setbgcolor_s * interrupt handler). */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT struct nxsvrmsg_mousein_s { uint32_t msgid; /* NX_SVRMSG_MOUSEIN */ diff --git a/nuttx/libnx/nxmu/nx_eventhandler.c b/nuttx/libnx/nxmu/nx_eventhandler.c index 338f5de4e..e9ba2a39a 100644 --- a/nuttx/libnx/nxmu/nx_eventhandler.c +++ b/nuttx/libnx/nxmu/nx_eventhandler.c @@ -213,7 +213,7 @@ int nx_eventhandler(NXHANDLE handle) } break; -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT case NX_CLIMSG_MOUSEIN: { FAR struct nxclimsg_mousein_s *mouse = (FAR struct nxclimsg_mousein_s *)buffer; diff --git a/nuttx/libnx/nxmu/nx_mousein.c b/nuttx/libnx/nxmu/nx_mousein.c index 19ceb9cc2..ea10ca005 100644 --- a/nuttx/libnx/nxmu/nx_mousein.c +++ b/nuttx/libnx/nxmu/nx_mousein.c @@ -46,7 +46,7 @@ #include <nuttx/nx/nx.h> #include <nuttx/nx/nxmu.h> -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT /**************************************************************************** * Pre-Processor Definitions @@ -97,4 +97,4 @@ int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons) return nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_mousein_s)); } -#endif /* CONFIG_NX_MOUSE */ +#endif /* CONFIG_NX_XYINPUT */ diff --git a/nuttx/libnx/nxtk/nxtk_events.c b/nuttx/libnx/nxtk/nxtk_events.c index 513bc98a8..d22d04aa8 100644 --- a/nuttx/libnx/nxtk/nxtk_events.c +++ b/nuttx/libnx/nxtk/nxtk_events.c @@ -68,7 +68,7 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -92,7 +92,7 @@ const struct nx_callback_s g_nxtkcb = { nxtk_redraw, /* redraw */ nxtk_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxtk_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -218,7 +218,7 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxtk_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { |