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 /apps | |
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 'apps')
-rw-r--r-- | apps/NxWidgets/Kconfig | 1 | ||||
-rw-r--r-- | apps/examples/nx/nx_events.c | 12 | ||||
-rw-r--r-- | apps/examples/nx/nx_main.c | 6 | ||||
-rw-r--r-- | apps/examples/nxconsole/nxcon_toolbar.c | 6 | ||||
-rw-r--r-- | apps/examples/nxconsole/nxcon_wndo.c | 6 | ||||
-rw-r--r-- | apps/examples/nxhello/nxhello_bkgd.c | 6 | ||||
-rw-r--r-- | apps/examples/nximage/nximage_bkgd.c | 6 | ||||
-rw-r--r-- | apps/examples/nxlines/nxlines_bkgd.c | 6 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_bkgd.c | 6 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_popup.c | 6 |
10 files changed, 31 insertions, 30 deletions
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) { |