lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN

Browse source
This commit is contained in:
Gregory Nutt 2014-07-16 16:31:31 -06:00
parent d70769a832
commit 8182037783
56 changed files with 185 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/NXGraphicsSubsystem.html
View file

@ -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>:

2
configs/compal_e99/nsh_highram/defconfig
View file

@ -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
#

2
configs/hymini-stm32v/nsh2/defconfig
View file

@ -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
#

5
configs/lm3s6965-ek/nx/defconfig
View file

@ -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
#

5
configs/lm3s8962-ek/nx/defconfig
View file

@ -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
#

5
configs/lpcxpresso-lpc1768/nx/defconfig
View file

@ -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
#

2
configs/maple/nx/defconfig
View file

@ -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
#

5
configs/mikroe-stm32f4/fulldemo/defconfig
View file

@ -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
#

2
configs/mikroe-stm32f4/nx/defconfig
View file

@ -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
#

2
configs/mikroe-stm32f4/nxlines/defconfig
View file

@ -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
#

2
configs/mikroe-stm32f4/nxtext/defconfig
View file

@ -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
#

5
configs/olimex-lpc1766stk/nx/defconfig
View file

@ -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
#

2
configs/open1788/nxlines/defconfig
View file

@ -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
#

5
configs/sam3u-ek/nx/defconfig
View file

@ -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
#

5
configs/sam3u-ek/nxwm/defconfig
View file

@ -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
#

5
configs/sama5d3x-ek/nx/defconfig
View file

@ -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
#

5
configs/sama5d3x-ek/nxwm/defconfig
View file

@ -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
#

2
configs/sama5d4-ek/README.txt
View file

@ -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 ->

5
configs/sama5d4-ek/nsh/defconfig
View file

@ -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
#

5
configs/sama5d4-ek/nxwm/defconfig
View file

@ -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
#

5
configs/shenzhou/nxwm/defconfig
View file

@ -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
#

5
configs/sim/nsh2/defconfig
View file

@ -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
#

5
configs/sim/nx/defconfig
View file

@ -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
#

5
configs/sim/nx11/defconfig
View file

@ -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
#

5
configs/sim/nxlines/defconfig
View file

@ -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
#

2
configs/sim/nxwm/defconfig
View file

@ -337,7 +337,7 @@ CONFIG_NX_DISABLE_24BPP=y
#
# Input Devices
#
CONFIG_NX_MOUSE=y
CONFIG_NX_XYINPUT=y
CONFIG_NX_KBD=y
#

5
configs/sim/touchscreen/defconfig
View file

@ -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
#

5
configs/stm3210e-eval/nsh2/defconfig
View file

@ -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
#

5
configs/stm3210e-eval/nx/defconfig
View file

@ -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
#

5
configs/stm3210e-eval/nxconsole/defconfig
View file

@ -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
#

5
configs/stm3210e-eval/pm/defconfig
View file

@ -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
#

5
configs/stm3220g-eval/nxwm/defconfig
View file

@ -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
#

2
configs/stm3240g-eval/knxwm/defconfig
View file

@ -668,7 +668,7 @@ CONFIG_NX_DISABLE_32BPP=y
#
# Input Devices
#
CONFIG_NX_MOUSE=y
CONFIG_NX_XYINPUT=y
CONFIG_NX_KBD=y
#

5
configs/stm3240g-eval/nxconsole/defconfig
View file

@ -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
#

5
configs/stm3240g-eval/nxwm/defconfig
View file

@ -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
#

5
configs/stm32f4discovery/nxlines/defconfig
View file

@ -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
#

5
configs/zkit-arm-1769/nxhello/defconfig
View file

@ -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
#

2
configs/zp214xpa/nxlines/defconfig
View file

@ -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
#

37
graphics/Kconfig
View file

@ -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"

5
graphics/README.txt
View file

@ -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

2
graphics/nxconsole/nxcon_internal.h
View file

@ -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 */
};

6
graphics/nxmu/nxfe.h
View file

@ -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

4
graphics/nxmu/nxmu_mouse.c
View file

@ -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 */

2
graphics/nxmu/nxmu_openwindow.c
View file

@ -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
}

2
graphics/nxmu/nxmu_requestbkgd.c
View file

@ -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
}

4
graphics/nxmu/nxmu_server.c
View file

@ -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;

2
graphics/nxsu/nx_constructwindow.c
View file

@ -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

4
graphics/nxsu/nx_mousein.c
View file

@ -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 */

4
graphics/nxsu/nx_open.c
View file

@ -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;

2
graphics/nxsu/nx_requestbkgd.c
View file

@ -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

4
graphics/nxsu/nxfe.h
View file

@ -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

4
include/nuttx/nx/nx.h
View file

@ -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

4
include/nuttx/nx/nxmu.h
View file

@ -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 */

2
libnx/nxmu/nx_eventhandler.c
View file

@ -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;

4
libnx/nxmu/nx_mousein.c
View file

@ -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 */

6
libnx/nxtk/nxtk_events.c
View file

@ -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)
{