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 /NxWidgets | |
parent | 80ea5737ca7bbdb33ba3ccf37a7c919338876222 (diff) | |
download | nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.gz nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.bz2 nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.zip |
Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN
Diffstat (limited to 'NxWidgets')
-rw-r--r-- | NxWidgets/Kconfig | 1 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/ccallback.hxx | 4 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/nxconfig.hxx | 6 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/ccallback.cxx | 6 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/include/cwindowmessenger.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/cwindowmessenger.cxx | 2 |
10 files changed, 15 insertions, 14 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: |