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

---
 Documentation/NXGraphicsSubsystem.html     | 10 +++---
 configs/compal_e99/nsh_highram/defconfig   |  2 +-
 configs/hymini-stm32v/nsh2/defconfig       |  2 +-
 configs/lm3s6965-ek/nx/defconfig           |  5 ++-
 configs/lm3s8962-ek/nx/defconfig           |  5 ++-
 configs/lpcxpresso-lpc1768/nx/defconfig    |  5 ++-
 configs/maple/nx/defconfig                 |  2 +-
 configs/mikroe-stm32f4/fulldemo/defconfig  |  5 ++-
 configs/mikroe-stm32f4/nx/defconfig        |  2 +-
 configs/mikroe-stm32f4/nxlines/defconfig   |  2 +-
 configs/mikroe-stm32f4/nxtext/defconfig    |  2 +-
 configs/olimex-lpc1766stk/nx/defconfig     |  5 ++-
 configs/open1788/nxlines/defconfig         |  2 +-
 configs/sam3u-ek/nx/defconfig              |  5 ++-
 configs/sam3u-ek/nxwm/defconfig            |  5 ++-
 configs/sama5d3x-ek/nx/defconfig           |  5 ++-
 configs/sama5d3x-ek/nxwm/defconfig         |  5 ++-
 configs/sama5d4-ek/README.txt              |  2 +-
 configs/sama5d4-ek/nsh/defconfig           |  5 ++-
 configs/sama5d4-ek/nxwm/defconfig          |  5 ++-
 configs/shenzhou/nxwm/defconfig            |  5 ++-
 configs/sim/nsh2/defconfig                 |  5 ++-
 configs/sim/nx/defconfig                   |  5 ++-
 configs/sim/nx11/defconfig                 |  5 ++-
 configs/sim/nxlines/defconfig              |  5 ++-
 configs/sim/nxwm/defconfig                 |  2 +-
 configs/sim/touchscreen/defconfig          |  5 ++-
 configs/stm3210e-eval/nsh2/defconfig       |  5 ++-
 configs/stm3210e-eval/nx/defconfig         |  5 ++-
 configs/stm3210e-eval/nxconsole/defconfig  |  5 ++-
 configs/stm3210e-eval/pm/defconfig         |  5 ++-
 configs/stm3220g-eval/nxwm/defconfig       |  5 ++-
 configs/stm3240g-eval/knxwm/defconfig      |  2 +-
 configs/stm3240g-eval/nxconsole/defconfig  |  5 ++-
 configs/stm3240g-eval/nxwm/defconfig       |  5 ++-
 configs/stm32f4discovery/nxlines/defconfig |  5 ++-
 configs/zkit-arm-1769/nxhello/defconfig    |  5 ++-
 configs/zp214xpa/nxlines/defconfig         |  2 +-
 graphics/Kconfig                           | 37 ++++++++++++++++++++--
 graphics/README.txt                        |  5 +--
 graphics/nxconsole/nxcon_internal.h        |  2 +-
 graphics/nxmu/nxfe.h                       |  6 ++--
 graphics/nxmu/nxmu_mouse.c                 |  4 +--
 graphics/nxmu/nxmu_openwindow.c            |  2 +-
 graphics/nxmu/nxmu_requestbkgd.c           |  2 +-
 graphics/nxmu/nxmu_server.c                |  4 +--
 graphics/nxsu/nx_constructwindow.c         |  2 +-
 graphics/nxsu/nx_mousein.c                 |  4 +--
 graphics/nxsu/nx_open.c                    |  4 +--
 graphics/nxsu/nx_requestbkgd.c             |  2 +-
 graphics/nxsu/nxfe.h                       |  4 +--
 include/nuttx/nx/nx.h                      |  4 +--
 include/nuttx/nx/nxmu.h                    |  4 +--
 libnx/nxmu/nx_eventhandler.c               |  2 +-
 libnx/nxmu/nx_mousein.c                    |  4 +--
 libnx/nxtk/nxtk_events.c                   |  6 ++--
 56 files changed, 185 insertions(+), 75 deletions(-)

diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html
index 743e0368aa..af7392f5de 100644
--- a/Documentation/NXGraphicsSubsystem.html
+++ b/Documentation/NXGraphicsSubsystem.html
@@ -923,7 +923,7 @@ struct nx_callback_s
                    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
   void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
                   uint8_t buttons, FAR void *arg);
 #endif
@@ -1001,7 +1001,7 @@ void position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 <h4>2.3.3.3 <a name="nxcbmousein"><code>mousein()</code></a></h4>
 <p><b>Callback Function Prototype:</b></p>
 <ul><pre>
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
              uint8_t buttons, FAR void *arg);
 #endif
@@ -1987,7 +1987,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);
 #include &lt;nuttx/nx/nxglib.h&gt;
 #include &lt;nuttx/nx/nx.h&gt;
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons);
 #endif
 </pre></ul>
@@ -3259,8 +3259,8 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
 
 <ul>
   <dl>
-    <dt><code>CONFIG_NX_MOUSE</code>:
-      <dd>Build in support for mouse input.
+    <dt><code>CONFIG_NX_XYINPUT</code>:
+      <dd>Build in support for an X/Y input such as a mouse or a touscreen.
     <dt><code>CONFIG_NX_KBD</code>:
       <dd>Build in support of keypad/keyboard input.
     <dt><code>CONFIG_NX_WRITEONLY</code>:
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index a1e0ee9f01..0a31a7dd04 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -412,7 +412,7 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 84eb723aaf..b109b18283 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -542,7 +542,7 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 # CONFIG_NX_KBD is not set
 
 #
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 3efc1e2d52..51a1793786 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -465,7 +465,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index d66d298e1f..ca5db5fff9 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -473,7 +473,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index 4df3778a5f..48bb6b3a95 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -526,7 +526,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index 578076da6c..f1f5b55330 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -625,7 +625,7 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 # CONFIG_NX_KBD is not set
 
 #
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index ac2f4ddc10..2826d98fcb 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -759,7 +759,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index dacf495711..4f9916a541 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 # CONFIG_NX_KBD is not set
 
 #
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 70a5e4b9f4..439d843b96 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 # CONFIG_NX_KBD is not set
 
 #
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index 045d9f54f5..53d51d7e4d 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 # CONFIG_NX_KBD is not set
 
 #
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 5632b68867..ea08b2f8bf 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -537,7 +537,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index 7bf9d037ce..d7cea2ce3c 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -451,7 +451,7 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 # CONFIG_NX_KBD is not set
 
 #
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index a3d754fce2..8ccc5cdb8e 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -509,7 +509,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 77b47d3355..4cf822037f 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -538,7 +538,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index cfe518ac4f..226435765f 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -581,7 +581,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index bd1a6052e4..80fe5e08f0 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -638,7 +638,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt
index c087de4f05..1bb48696d6 100644
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@@ -2944,7 +2944,7 @@ TM7000 LCD/Touchscreen
     CONFIG_NX_DISABLE_32BPP=y
 
     Graphics Support -> Input Devices ->
-    CONFIG_NX_MOUSE=y                      : Build in mouse/touchscreen support (not used)
+    CONFIG_NX_XYINPUT=y                      : Build in mouse/touchscreen support (not used)
     CONFIG_NX_KBD=y                        : Build in keyboard support (not used)
 
     Graphics Support -> Framed Window Borders ->
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index b66c0a7f5a..103e050a9b 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -848,7 +848,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index 49219978d3..01ede6c98d 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -852,7 +852,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index 2238901eb8..33e80895ef 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -698,7 +698,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 7959821eda..0be30d738e 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -318,7 +318,10 @@ CONFIG_NX_DISABLE_24BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 77423e1d83..027cafc0e4 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -343,7 +343,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index 5b093bf961..d254a6879f 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -344,7 +344,10 @@ CONFIG_NX_DISABLE_24BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index 8634930f43..64bd0c8e53 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -340,7 +340,10 @@ CONFIG_NX_DISABLE_24BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 66b0548f2e..437f1464e0 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -337,7 +337,7 @@ CONFIG_NX_DISABLE_24BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index a649105a1f..0a598373df 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -352,7 +352,10 @@ CONFIG_NX_DISABLE_24BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index a4fbd40402..361c34e7d2 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -716,7 +716,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index 83ff4d71c7..25e77c6104 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -642,7 +642,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig
index 20d25b9266..c506799e6f 100644
--- a/configs/stm3210e-eval/nxconsole/defconfig
+++ b/configs/stm3210e-eval/nxconsole/defconfig
@@ -619,7 +619,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 54e913fa19..5ab88d602c 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -640,7 +640,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 2dfd0b3543..a52ccd89ba 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -752,7 +752,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index f43b07159e..340d32692c 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -668,7 +668,7 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig
index 7ca8388022..22cc4a9cd7 100644
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@@ -725,7 +725,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index d62ef1b131..119448ec37 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -747,7 +747,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+# CONFIG_NX_XYINPUT_MOUSE is not set
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index a0fbe5ec94..1be726ab78 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -628,7 +628,10 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index aa3e38161d..0c9369c192 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -631,7 +631,10 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
+# CONFIG_NX_XYINPUT_NONE is not set
+CONFIG_NX_XYINPUT_MOUSE=y
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 CONFIG_NX_KBD=y
 
 #
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index cdcf617601..d024b03047 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -346,7 +346,7 @@ CONFIG_NX_PACKEDMSFIRST=y
 #
 # Input Devices
 #
-# CONFIG_NX_MOUSE is not set
+# CONFIG_NX_XYINPUT is not set
 # CONFIG_NX_KBD is not set
 
 #
diff --git a/graphics/Kconfig b/graphics/Kconfig
index 85e2164a8c..187089b543 100644
--- a/graphics/Kconfig
+++ b/graphics/Kconfig
@@ -118,11 +118,42 @@ config NX_PACKEDMSFIRST
 
 menu "Input Devices"
 
-config NX_MOUSE
-	bool "Mouse/Touchscreen Support"
+config NX_XYINPUT
+	bool
 	default n
+
+choice
+	prompt "Mouse/Touchscreen Support"
+	default NX_XYINPUT_NONE
+
+config NX_XYINPUT_NONE
+	bool "No X/Y input device"
 	---help---
-		Build in support for mouse or touchscreeninput.
+		There is no X/Y positional input device connected
+
+config NX_XYINPUT_MOUSE
+	bool "Mouse device support"
+	select NX_XYINPUT
+	---help---
+		X/Y positional input is provided by a mouse.  The only difference
+		between the mouse and touchscreen selection is in the presence or
+		absence of the mouse buttons.  This difference is not used within
+		NuttX itself, however, graphics applications may need this
+		information, for example, to handle the different ways that graphic
+		elements are selected and dragged.
+
+config NX_XYINPUT_TOUCHSCREEN
+	bool "Touchscreen device support"
+	select NX_XYINPUT
+	---help---
+		X/Y positional input is provided by a touchscreen.  The only difference
+		between the mouse and touchscreen selection is in the presence or
+		absence of the mouse buttons.  This difference is not used within
+		NuttX itself, however, graphics applications may need this
+		information, for example, to handle the different ways that graphic
+		elements are selected and dragged.
+
+endchoice # Mouse/Touchscreen Support
 
 config NX_KBD
 	bool "Keyboard Support"
diff --git a/graphics/README.txt b/graphics/README.txt
index 1532c66b5f..a0902546a1 100644
--- a/graphics/README.txt
+++ b/graphics/README.txt
@@ -275,8 +275,9 @@ CONFIG_NX_DISABLE_32BPP
 CONFIG_NX_PACKEDMSFIRST
   If a pixel depth of less than 8-bits is used, then NX needs to know if the
   pixels pack from the MS to LS or from LS to MS
-CONFIG_NX_MOUSE
-  Build in support for mouse input.
+CONFIG_NX_XYINPUT
+  Build in support for a X/Y positional input device such as a mouse or a
+  touchscreen.
 CONFIG_NX_KBD
   Build in support of keypad/keyboard input.
 CONFIG_NXTK_BORDERWIDTH
diff --git a/graphics/nxconsole/nxcon_internal.h b/graphics/nxconsole/nxcon_internal.h
index dc976a6620..37bb73aecf 100644
--- a/graphics/nxconsole/nxcon_internal.h
+++ b/graphics/nxconsole/nxcon_internal.h
@@ -188,7 +188,7 @@ struct nxcon_state_s
    */
 
 #ifndef CONFIG_DISABLE_POLL
-  struct pollfd *fds[CONFIG_RAMLOG_NPOLLWAITERS];
+  struct pollfd *fds[CONFIG_NXCONSOLE_NPOLLWAITERS];
 #endif
 #endif /* CONFIG_NXCONSOLE_NXKBDIN */
 };
diff --git a/graphics/nxmu/nxfe.h b/graphics/nxmu/nxfe.h
index 42e768267b..00db9bb588 100644
--- a/graphics/nxmu/nxfe.h
+++ b/graphics/nxmu/nxfe.h
@@ -220,7 +220,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd,
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 void nxmu_mouseinit(int x, int y);
 #endif
 
@@ -238,7 +238,7 @@ void nxmu_mouseinit(int x, int y);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 int nxmu_mousereport(struct nxbe_window_s *wnd);
 #endif
 
@@ -252,7 +252,7 @@ int nxmu_mousereport(struct nxbe_window_s *wnd);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 int nxmu_mousein(FAR struct nxfe_state_s *fe,
                  FAR const struct nxgl_point_s *pos, int button);
 #endif
diff --git a/graphics/nxmu/nxmu_mouse.c b/graphics/nxmu/nxmu_mouse.c
index 1b8f4a5921..90378a02d4 100644
--- a/graphics/nxmu/nxmu_mouse.c
+++ b/graphics/nxmu/nxmu_mouse.c
@@ -47,7 +47,7 @@
 #include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -232,4 +232,4 @@ int nxmu_mousein(FAR struct nxfe_state_s *fe,
   return OK;
 }
 
-#endif /* CONFIG_NX_MOUSE */
+#endif /* CONFIG_NX_XYINPUT */
diff --git a/graphics/nxmu/nxmu_openwindow.c b/graphics/nxmu/nxmu_openwindow.c
index 395f0a7701..c159045b7a 100644
--- a/graphics/nxmu/nxmu_openwindow.c
+++ b/graphics/nxmu/nxmu_openwindow.c
@@ -107,7 +107,7 @@ void nxmu_openwindow(FAR struct nxbe_state_s *be, FAR struct nxbe_window_s *wnd)
 
   /* Provide the initial mouse settings to the client */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   nxmu_mousereport(wnd);
 #endif
 }
diff --git a/graphics/nxmu/nxmu_requestbkgd.c b/graphics/nxmu/nxmu_requestbkgd.c
index 47b1ad13fb..ef7c9f1c06 100644
--- a/graphics/nxmu/nxmu_requestbkgd.c
+++ b/graphics/nxmu/nxmu_requestbkgd.c
@@ -117,7 +117,7 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
 
   /* Provide the mouse settings */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   nxmu_mousereport(&be->bkgd);
 #endif
 }
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index 4cb1246b57..b96b4f8b88 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -259,7 +259,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
 
   /* Initialize the mouse position */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   nxmu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres);
 #endif
   return OK;
@@ -501,7 +501,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
            }
            break;
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
          case NX_SVRMSG_MOUSEIN: /* New mouse report from mouse client */
            {
              FAR struct nxsvrmsg_mousein_s *mousemsg = (FAR struct nxsvrmsg_mousein_s *)buffer;
diff --git a/graphics/nxsu/nx_constructwindow.c b/graphics/nxsu/nx_constructwindow.c
index d4e90dbfb0..f5f5720a97 100644
--- a/graphics/nxsu/nx_constructwindow.c
+++ b/graphics/nxsu/nx_constructwindow.c
@@ -144,7 +144,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
 
   /* Provide the initial mouse settings */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   nxsu_mousereport(wnd);
 #endif
 
diff --git a/graphics/nxsu/nx_mousein.c b/graphics/nxsu/nx_mousein.c
index 5b268358bf..551737779f 100644
--- a/graphics/nxsu/nx_mousein.c
+++ b/graphics/nxsu/nx_mousein.c
@@ -48,7 +48,7 @@
 
 #include "nxfe.h"
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -215,4 +215,4 @@ int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons)
   return OK;
 }
 
-#endif /* CONFIG_NX_MOUSE */
+#endif /* CONFIG_NX_XYINPUT */
diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c
index a8956d8afe..0de1159ae0 100644
--- a/graphics/nxsu/nx_open.c
+++ b/graphics/nxsu/nx_open.c
@@ -78,7 +78,7 @@ const struct nx_callback_s g_bkgdcb =
 {
   nxsu_bkgdredraw,   /* redraw */
   NULL               /* position */
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   , NULL             /* mousein */
 #endif
 #ifdef CONFIG_NX_KBD
@@ -153,7 +153,7 @@ static inline int nxsu_setup(FAR NX_DRIVERTYPE *dev,
 
  /* Initialize the mouse position */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   nxsu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres);
 #endif
   return OK;
diff --git a/graphics/nxsu/nx_requestbkgd.c b/graphics/nxsu/nx_requestbkgd.c
index 7f0ab12f25..a62b37cec7 100644
--- a/graphics/nxsu/nx_requestbkgd.c
+++ b/graphics/nxsu/nx_requestbkgd.c
@@ -138,7 +138,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
 
   /* Provide the mouse settings to the client */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   nxsu_mousereport(&be->bkgd);
 #endif
 
diff --git a/graphics/nxsu/nxfe.h b/graphics/nxsu/nxfe.h
index 82c1d832be..e3f9ac3574 100644
--- a/graphics/nxsu/nxfe.h
+++ b/graphics/nxsu/nxfe.h
@@ -122,7 +122,7 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 void nxsu_mouseinit(int x, int y);
 #endif
 
@@ -140,7 +140,7 @@ void nxsu_mouseinit(int x, int y);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 int nxsu_mousereport(struct nxbe_window_s *wnd);
 #endif
 
diff --git a/include/nuttx/nx/nx.h b/include/nuttx/nx/nx.h
index 96584db7d8..6093a0878a 100644
--- a/include/nuttx/nx/nx.h
+++ b/include/nuttx/nx/nx.h
@@ -164,7 +164,7 @@ struct nx_callback_s
    *
    **************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
                   uint8_t buttons, FAR void *arg);
 #endif
@@ -917,7 +917,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons);
 #endif
 
diff --git a/include/nuttx/nx/nxmu.h b/include/nuttx/nx/nxmu.h
index 019a8a35f3..711365f741 100644
--- a/include/nuttx/nx/nxmu.h
+++ b/include/nuttx/nx/nxmu.h
@@ -209,7 +209,7 @@ struct nxclimsg_newposition_s
 
 /* This message reports a new mouse event to a particular window */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 struct nxclimsg_mousein_s
 {
   uint32_t msgid;                /* NX_SVRMSG_MOUSEIN */
@@ -423,7 +423,7 @@ struct nxsvrmsg_setbgcolor_s
  * interrupt handler).
  */
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 struct nxsvrmsg_mousein_s
 {
   uint32_t msgid;                  /* NX_SVRMSG_MOUSEIN */
diff --git a/libnx/nxmu/nx_eventhandler.c b/libnx/nxmu/nx_eventhandler.c
index 338f5de4e0..e9ba2a39ac 100644
--- a/libnx/nxmu/nx_eventhandler.c
+++ b/libnx/nxmu/nx_eventhandler.c
@@ -213,7 +213,7 @@ int nx_eventhandler(NXHANDLE handle)
       }
       break;
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
     case NX_CLIMSG_MOUSEIN:
       {
         FAR struct nxclimsg_mousein_s *mouse = (FAR struct nxclimsg_mousein_s *)buffer;
diff --git a/libnx/nxmu/nx_mousein.c b/libnx/nxmu/nx_mousein.c
index 19ceb9cc24..ea10ca005f 100644
--- a/libnx/nxmu/nx_mousein.c
+++ b/libnx/nxmu/nx_mousein.c
@@ -46,7 +46,7 @@
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxmu.h>
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -97,4 +97,4 @@ int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons)
   return nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_mousein_s));
 }
 
-#endif /* CONFIG_NX_MOUSE */
+#endif /* CONFIG_NX_XYINPUT */
diff --git a/libnx/nxtk/nxtk_events.c b/libnx/nxtk/nxtk_events.c
index 513bc98a8a..d22d04aa85 100644
--- a/libnx/nxtk/nxtk_events.c
+++ b/libnx/nxtk/nxtk_events.c
@@ -68,7 +68,7 @@ static void nxtk_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 nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
                          uint8_t buttons, FAR void *arg);
 #endif
@@ -92,7 +92,7 @@ const struct nx_callback_s g_nxtkcb =
 {
   nxtk_redraw,    /* redraw */
   nxtk_position   /* position */
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
   , nxtk_mousein  /* mousein */
 #endif
 #ifdef CONFIG_NX_KBD
@@ -218,7 +218,7 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
  * Name: nxtk_mousein
  ****************************************************************************/
 
-#ifdef CONFIG_NX_MOUSE
+#ifdef CONFIG_NX_XYINPUT
 static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
                           uint8_t buttons, FAR void *arg)
 {