mirror of
https://github.com/apache/nuttx.git
synced 2026-05-31 23:40:19 +08:00
Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN
This commit is contained in:
@@ -923,7 +923,7 @@ struct nx_callback_s
|
|||||||
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
|
||||||
void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
|
void (*mousein)(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
|
||||||
uint8_t buttons, FAR void *arg);
|
uint8_t buttons, FAR void *arg);
|
||||||
#endif
|
#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>
|
<h4>2.3.3.3 <a name="nxcbmousein"><code>mousein()</code></a></h4>
|
||||||
<p><b>Callback Function Prototype:</b></p>
|
<p><b>Callback Function Prototype:</b></p>
|
||||||
<ul><pre>
|
<ul><pre>
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
|
void mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
|
||||||
uint8_t buttons, FAR void *arg);
|
uint8_t buttons, FAR void *arg);
|
||||||
#endif
|
#endif
|
||||||
@@ -1987,7 +1987,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);
|
|||||||
#include <nuttx/nx/nxglib.h>
|
#include <nuttx/nx/nxglib.h>
|
||||||
#include <nuttx/nx/nx.h>
|
#include <nuttx/nx/nx.h>
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons);
|
int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons);
|
||||||
#endif
|
#endif
|
||||||
</pre></ul>
|
</pre></ul>
|
||||||
@@ -3259,8 +3259,8 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
|
|||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<dl>
|
<dl>
|
||||||
<dt><code>CONFIG_NX_MOUSE</code>:
|
<dt><code>CONFIG_NX_XYINPUT</code>:
|
||||||
<dd>Build in support for mouse input.
|
<dd>Build in support for an X/Y input such as a mouse or a touscreen.
|
||||||
<dt><code>CONFIG_NX_KBD</code>:
|
<dt><code>CONFIG_NX_KBD</code>:
|
||||||
<dd>Build in support of keypad/keyboard input.
|
<dd>Build in support of keypad/keyboard input.
|
||||||
<dt><code>CONFIG_NX_WRITEONLY</code>:
|
<dt><code>CONFIG_NX_WRITEONLY</code>:
|
||||||
|
|||||||
@@ -412,7 +412,7 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
CONFIG_NX_KBD=y
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -542,7 +542,7 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
# CONFIG_NX_KBD is not set
|
# CONFIG_NX_KBD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -465,7 +465,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -473,7 +473,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -526,7 +526,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -625,7 +625,7 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
# CONFIG_NX_KBD is not set
|
# CONFIG_NX_KBD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -759,7 +759,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
# CONFIG_NX_KBD is not set
|
# CONFIG_NX_KBD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
# CONFIG_NX_KBD is not set
|
# CONFIG_NX_KBD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -546,7 +546,7 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
# CONFIG_NX_KBD is not set
|
# CONFIG_NX_KBD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -537,7 +537,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -451,7 +451,7 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
# CONFIG_NX_KBD is not set
|
# CONFIG_NX_KBD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -509,7 +509,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -538,7 +538,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -581,7 +581,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -638,7 +638,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -2944,7 +2944,7 @@ TM7000 LCD/Touchscreen
|
|||||||
CONFIG_NX_DISABLE_32BPP=y
|
CONFIG_NX_DISABLE_32BPP=y
|
||||||
|
|
||||||
Graphics Support -> Input Devices ->
|
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)
|
CONFIG_NX_KBD=y : Build in keyboard support (not used)
|
||||||
|
|
||||||
Graphics Support -> Framed Window Borders ->
|
Graphics Support -> Framed Window Borders ->
|
||||||
|
|||||||
@@ -848,7 +848,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -852,7 +852,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -698,7 +698,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -318,7 +318,10 @@ CONFIG_NX_DISABLE_24BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -343,7 +343,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -344,7 +344,10 @@ CONFIG_NX_DISABLE_24BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -340,7 +340,10 @@ CONFIG_NX_DISABLE_24BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -337,7 +337,7 @@ CONFIG_NX_DISABLE_24BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
CONFIG_NX_MOUSE=y
|
CONFIG_NX_XYINPUT=y
|
||||||
CONFIG_NX_KBD=y
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -352,7 +352,10 @@ CONFIG_NX_DISABLE_24BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -716,7 +716,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -642,7 +642,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -619,7 +619,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -640,7 +640,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -752,7 +752,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -668,7 +668,7 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
CONFIG_NX_MOUSE=y
|
CONFIG_NX_XYINPUT=y
|
||||||
CONFIG_NX_KBD=y
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -725,7 +725,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -747,7 +747,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -628,7 +628,10 @@ CONFIG_NX_DISABLE_32BPP=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -631,7 +631,10 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# 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
|
CONFIG_NX_KBD=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -346,7 +346,7 @@ CONFIG_NX_PACKEDMSFIRST=y
|
|||||||
#
|
#
|
||||||
# Input Devices
|
# Input Devices
|
||||||
#
|
#
|
||||||
# CONFIG_NX_MOUSE is not set
|
# CONFIG_NX_XYINPUT is not set
|
||||||
# CONFIG_NX_KBD is not set
|
# CONFIG_NX_KBD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
+34
-3
@@ -118,11 +118,42 @@ config NX_PACKEDMSFIRST
|
|||||||
|
|
||||||
menu "Input Devices"
|
menu "Input Devices"
|
||||||
|
|
||||||
config NX_MOUSE
|
config NX_XYINPUT
|
||||||
bool "Mouse/Touchscreen Support"
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
||||||
|
choice
|
||||||
|
prompt "Mouse/Touchscreen Support"
|
||||||
|
default NX_XYINPUT_NONE
|
||||||
|
|
||||||
|
config NX_XYINPUT_NONE
|
||||||
|
bool "No X/Y input device"
|
||||||
---help---
|
---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
|
config NX_KBD
|
||||||
bool "Keyboard Support"
|
bool "Keyboard Support"
|
||||||
|
|||||||
+3
-2
@@ -275,8 +275,9 @@ CONFIG_NX_DISABLE_32BPP
|
|||||||
CONFIG_NX_PACKEDMSFIRST
|
CONFIG_NX_PACKEDMSFIRST
|
||||||
If a pixel depth of less than 8-bits is used, then NX needs to know if the
|
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
|
pixels pack from the MS to LS or from LS to MS
|
||||||
CONFIG_NX_MOUSE
|
CONFIG_NX_XYINPUT
|
||||||
Build in support for mouse input.
|
Build in support for a X/Y positional input device such as a mouse or a
|
||||||
|
touchscreen.
|
||||||
CONFIG_NX_KBD
|
CONFIG_NX_KBD
|
||||||
Build in support of keypad/keyboard input.
|
Build in support of keypad/keyboard input.
|
||||||
CONFIG_NXTK_BORDERWIDTH
|
CONFIG_NXTK_BORDERWIDTH
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ struct nxcon_state_s
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_DISABLE_POLL
|
#ifndef CONFIG_DISABLE_POLL
|
||||||
struct pollfd *fds[CONFIG_RAMLOG_NPOLLWAITERS];
|
struct pollfd *fds[CONFIG_NXCONSOLE_NPOLLWAITERS];
|
||||||
#endif
|
#endif
|
||||||
#endif /* CONFIG_NXCONSOLE_NXKBDIN */
|
#endif /* CONFIG_NXCONSOLE_NXKBDIN */
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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);
|
void nxmu_mouseinit(int x, int y);
|
||||||
#endif
|
#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);
|
int nxmu_mousereport(struct nxbe_window_s *wnd);
|
||||||
#endif
|
#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,
|
int nxmu_mousein(FAR struct nxfe_state_s *fe,
|
||||||
FAR const struct nxgl_point_s *pos, int button);
|
FAR const struct nxgl_point_s *pos, int button);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
#include <nuttx/nx/nx.h>
|
#include <nuttx/nx/nx.h>
|
||||||
#include "nxfe.h"
|
#include "nxfe.h"
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Pre-Processor Definitions
|
* Pre-Processor Definitions
|
||||||
@@ -232,4 +232,4 @@ int nxmu_mousein(FAR struct nxfe_state_s *fe,
|
|||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NX_MOUSE */
|
#endif /* CONFIG_NX_XYINPUT */
|
||||||
|
|||||||
@@ -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 */
|
/* Provide the initial mouse settings to the client */
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
nxmu_mousereport(wnd);
|
nxmu_mousereport(wnd);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
|
|||||||
|
|
||||||
/* Provide the mouse settings */
|
/* Provide the mouse settings */
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
nxmu_mousereport(&be->bkgd);
|
nxmu_mousereport(&be->bkgd);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
|
|||||||
|
|
||||||
/* Initialize the mouse position */
|
/* Initialize the mouse position */
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
nxmu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres);
|
nxmu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres);
|
||||||
#endif
|
#endif
|
||||||
return OK;
|
return OK;
|
||||||
@@ -501,7 +501,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
case NX_SVRMSG_MOUSEIN: /* New mouse report from mouse client */
|
case NX_SVRMSG_MOUSEIN: /* New mouse report from mouse client */
|
||||||
{
|
{
|
||||||
FAR struct nxsvrmsg_mousein_s *mousemsg = (FAR struct nxsvrmsg_mousein_s *)buffer;
|
FAR struct nxsvrmsg_mousein_s *mousemsg = (FAR struct nxsvrmsg_mousein_s *)buffer;
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
|
|||||||
|
|
||||||
/* Provide the initial mouse settings */
|
/* Provide the initial mouse settings */
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
nxsu_mousereport(wnd);
|
nxsu_mousereport(wnd);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
#include "nxfe.h"
|
#include "nxfe.h"
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Pre-Processor Definitions
|
* 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;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NX_MOUSE */
|
#endif /* CONFIG_NX_XYINPUT */
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ const struct nx_callback_s g_bkgdcb =
|
|||||||
{
|
{
|
||||||
nxsu_bkgdredraw, /* redraw */
|
nxsu_bkgdredraw, /* redraw */
|
||||||
NULL /* position */
|
NULL /* position */
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
, NULL /* mousein */
|
, NULL /* mousein */
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_NX_KBD
|
#ifdef CONFIG_NX_KBD
|
||||||
@@ -153,7 +153,7 @@ static inline int nxsu_setup(FAR NX_DRIVERTYPE *dev,
|
|||||||
|
|
||||||
/* Initialize the mouse position */
|
/* Initialize the mouse position */
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
nxsu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres);
|
nxsu_mouseinit(fe->be.vinfo.xres, fe->be.vinfo.yres);
|
||||||
#endif
|
#endif
|
||||||
return OK;
|
return OK;
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
|
|||||||
|
|
||||||
/* Provide the mouse settings to the client */
|
/* Provide the mouse settings to the client */
|
||||||
|
|
||||||
#ifdef CONFIG_NX_MOUSE
|
#ifdef CONFIG_NX_XYINPUT
|
||||||
nxsu_mousereport(&be->bkgd);
|
nxsu_mousereport(&be->bkgd);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user