From 72754295cabf0096cbc6f2ec693f1e5e362d8c56 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 16 Jul 2014 16:31:31 -0600
Subject: Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add
 CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN

---
 apps/examples/nx/nx_events.c | 12 ++++++------
 apps/examples/nx/nx_main.c   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'apps/examples/nx')

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
 
-- 
cgit v1.2.3