summaryrefslogtreecommitdiff
path: root/nuttx/graphics/nxsu
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/graphics/nxsu')
-rw-r--r--nuttx/graphics/nxsu/nx_constructwindow.c2
-rw-r--r--nuttx/graphics/nxsu/nx_mousein.c4
-rw-r--r--nuttx/graphics/nxsu/nx_open.c4
-rw-r--r--nuttx/graphics/nxsu/nx_requestbkgd.c2
-rw-r--r--nuttx/graphics/nxsu/nxfe.h4
5 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/graphics/nxsu/nx_constructwindow.c b/nuttx/graphics/nxsu/nx_constructwindow.c
index d4e90dbfb..f5f5720a9 100644
--- a/nuttx/graphics/nxsu/nx_constructwindow.c
+++ b/nuttx/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/nuttx/graphics/nxsu/nx_mousein.c b/nuttx/graphics/nxsu/nx_mousein.c
index 5b268358b..551737779 100644
--- a/nuttx/graphics/nxsu/nx_mousein.c
+++ b/nuttx/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/nuttx/graphics/nxsu/nx_open.c b/nuttx/graphics/nxsu/nx_open.c
index a8956d8af..0de1159ae 100644
--- a/nuttx/graphics/nxsu/nx_open.c
+++ b/nuttx/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/nuttx/graphics/nxsu/nx_requestbkgd.c b/nuttx/graphics/nxsu/nx_requestbkgd.c
index 7f0ab12f2..a62b37cec 100644
--- a/nuttx/graphics/nxsu/nx_requestbkgd.c
+++ b/nuttx/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/nuttx/graphics/nxsu/nxfe.h b/nuttx/graphics/nxsu/nxfe.h
index 82c1d832b..e3f9ac357 100644
--- a/nuttx/graphics/nxsu/nxfe.h
+++ b/nuttx/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