sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-16 16:31:31 -06:00
parent ef1112d774
commit b1e7a4e4f8
10 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kconfig
View File

@ -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

4
libnxwidgets/include/ccallback.hxx
View File

@ -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

2
libnxwidgets/include/cwindoweventhandler.hxx
View File

@ -94,7 +94,7 @@ namespace NXWidgets
* @param e The event data.
*/
#ifdef CONFIG_NX_MOUSE
#ifdef CONFIG_NX_XYINPUT
virtual void handleMouseEvent(void) { }
#endif

2
libnxwidgets/include/cwindoweventhandlerlist.hxx
View File

@ -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

6
libnxwidgets/include/nxconfig.hxx
View File

@ -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
/**

6
libnxwidgets/src/ccallback.cxx
View File

@ -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

2
libnxwidgets/src/cwidgetcontrol.cxx
View File

@ -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

2
libnxwidgets/src/cwindoweventhandlerlist.cxx
View File

@ -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)

2
nxwm/include/cwindowmessenger.hxx
View File

@ -103,7 +103,7 @@ namespace NxWM
* @param e The event data.
*/
#ifdef CONFIG_NX_MOUSE
#ifdef CONFIG_NX_XYINPUT
void handleMouseEvent(void);
#endif

2
nxwm/src/cwindowmessenger.cxx
View File

@ -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: