Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT…

…_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN
priseborough · Jul 16, 2014 · 8182037 · 8182037
1 parent d70769a
commit 8182037
Show file tree

Hide file tree

Showing 56 changed files with 185 additions and 75 deletions.
diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html
@@ -923,7 +923,7 @@ <h3>2.3.2 <a name="nxtypes">NX Types</a></h3>
                    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 @@ <h4>2.3.3.2 <a name="nxcbposition"><code>position()</code></a></h4>
 <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 @@ <h3>2.3.30 <a name="nxmousein"><code>nx_mousein()</code></a></h3>
 #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 @@ <h2>B.3 <a name="nxconfig">NX Configuration Settings</a></h2>
 
 <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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -668,7 +668,7 @@ CONFIG_NX_DISABLE_32BPP=y
 #
 # Input Devices
 #
-CONFIG_NX_MOUSE=y
+CONFIG_NX_XYINPUT=y
 CONFIG_NX_KBD=y
 
 #