sergiotarxz/nuttx-apps
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 cf8f042143
commit 3f81481e37
10 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NxWidgets/Kconfig
View File

@ -1113,6 +1113,7 @@ menu "NxWM Media Player Display Settings"
config NXWM_MEDIAPLAYER config NXWM_MEDIAPLAYER
bool "NxWM Media Player" bool "NxWM Media Player"
default n default n
depends on FS_READABLE
---help--- ---help---
Enable support for the MP3 Media Player. This features requires Enable support for the MP3 Media Player. This features requires
a board that includes an MP3 Codec chip, such as the Mikromedia a board that includes an MP3 Codec chip, such as the Mikromedia

12
examples/nx/nx_events.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -99,7 +99,7 @@ const struct nx_callback_s g_nxcb =
{ {
nxeg_redraw, /* redraw */ nxeg_redraw, /* redraw */
nxeg_position /* position */ nxeg_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxeg_mousein /* mousein */ , nxeg_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -112,7 +112,7 @@ const struct nx_callback_s g_tbcb =
{ {
nxeg_tbredraw, /* redraw */ nxeg_tbredraw, /* redraw */
nxeg_tbposition /* position */ nxeg_tbposition /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxeg_tbmousein /* mousein */ , nxeg_tbmousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -224,7 +224,7 @@ static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
* Name: nxeg_mousein * Name: nxeg_mousein
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) 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 #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, static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {

6
examples/nx/nx_main.c
View File

@ -141,7 +141,7 @@ nxgl_mxpixel_t g_tbcolor[CONFIG_NX_NPLANES];
* Name: nxeg_drivemouse * Name: nxeg_drivemouse
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxeg_drivemouse(void) static void nxeg_drivemouse(void)
{ {
nxgl_coord_t x; 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 */ /* Put mouse left-button clicks all over the screen and see who responds */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
nxeg_drivemouse(); nxeg_drivemouse();
/* Sleep a bit */ /* 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 */ /* Put mouse left-button clicks all over the screen and see who responds */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
nxeg_drivemouse(); nxeg_drivemouse();
#endif #endif

6
examples/nxconsole/nxcon_toolbar.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -95,7 +95,7 @@ const struct nx_callback_s g_nxtoolcb =
{ {
nxtool_redraw, /* redraw */ nxtool_redraw, /* redraw */
nxtool_position /* position */ nxtool_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxtool_mousein /* mousein */ , nxtool_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -147,7 +147,7 @@ static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
* Name: nxtool_mousein * Name: nxtool_mousein
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {

6
examples/nxconsole/nxcon_wndo.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -96,7 +96,7 @@ const struct nx_callback_s g_nxconcb =
{ {
nxwndo_redraw, /* redraw */ nxwndo_redraw, /* redraw */
nxwndo_position /* position */ nxwndo_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxwndo_mousein /* mousein */ , nxwndo_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -181,7 +181,7 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
* Name: nxwndo_mousein * Name: nxwndo_mousein
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {

6
examples/nxhello/nxhello_bkgd.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -120,7 +120,7 @@ const struct nx_callback_s g_nxhellocb =
{ {
nxhello_redraw, /* redraw */ nxhello_redraw, /* redraw */
nxhello_position /* position */ nxhello_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxhello_mousein /* mousein */ , nxhello_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -182,7 +182,7 @@ static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
* Name: nxhello_mousein * Name: nxhello_mousein
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {

6
examples/nximage/nximage_bkgd.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -157,7 +157,7 @@ const struct nx_callback_s g_nximagecb =
{ {
nximage_redraw, /* redraw */ nximage_redraw, /* redraw */
nximage_position /* position */ nximage_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nximage_mousein /* mousein */ , nximage_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #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, static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {

6
examples/nxlines/nxlines_bkgd.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxlines_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxlines_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -98,7 +98,7 @@ const struct nx_callback_s g_nxlinescb =
{ {
nxlines_redraw, /* redraw */ nxlines_redraw, /* redraw */
nxlines_position /* position */ nxlines_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxlines_mousein /* mousein */ , nxlines_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -160,7 +160,7 @@ static void nxlines_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
* Name: nxlines_mousein * Name: nxlines_mousein
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxlines_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxlines_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {

6
examples/nxtext/nxtext_bkgd.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -99,7 +99,7 @@ const struct nx_callback_s g_nxtextcb =
{ {
nxbg_redraw, /* redraw */ nxbg_redraw, /* redraw */
nxbg_position /* position */ nxbg_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxbg_mousein /* mousein */ , nxbg_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -199,7 +199,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
* Name: nxbg_mousein * Name: nxbg_mousein
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {

6
examples/nxtext/nxtext_popup.c
View File

@ -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_point_s *pos,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
FAR void *arg); FAR void *arg);
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg); uint8_t buttons, FAR void *arg);
#endif #endif
@ -93,7 +93,7 @@ static const struct nx_callback_s g_pucb =
{ {
nxpu_redraw, /* redraw */ nxpu_redraw, /* redraw */
nxpu_position /* position */ nxpu_position /* position */
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
, nxpu_mousein /* mousein */ , nxpu_mousein /* mousein */
#endif #endif
#ifdef CONFIG_NX_KBD #ifdef CONFIG_NX_KBD
@ -246,7 +246,7 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
* Name: nxpu_mousein * Name: nxpu_mousein
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NX_MOUSE #ifdef CONFIG_NX_XYINPUT
static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg) uint8_t buttons, FAR void *arg)
{ {