diff options
Diffstat (limited to 'nuttx/graphics/nxmu')
-rw-r--r-- | nuttx/graphics/nxmu/nxfe.h | 6 | ||||
-rw-r--r-- | nuttx/graphics/nxmu/nxmu_mouse.c | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxmu/nxmu_openwindow.c | 2 | ||||
-rw-r--r-- | nuttx/graphics/nxmu/nxmu_requestbkgd.c | 2 | ||||
-rw-r--r-- | nuttx/graphics/nxmu/nxmu_server.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/graphics/nxmu/nxfe.h b/nuttx/graphics/nxmu/nxfe.h index 42e768267..00db9bb58 100644 --- a/nuttx/graphics/nxmu/nxfe.h +++ b/nuttx/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/nuttx/graphics/nxmu/nxmu_mouse.c b/nuttx/graphics/nxmu/nxmu_mouse.c index 1b8f4a592..90378a02d 100644 --- a/nuttx/graphics/nxmu/nxmu_mouse.c +++ b/nuttx/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/nuttx/graphics/nxmu/nxmu_openwindow.c b/nuttx/graphics/nxmu/nxmu_openwindow.c index 395f0a770..c159045b7 100644 --- a/nuttx/graphics/nxmu/nxmu_openwindow.c +++ b/nuttx/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/nuttx/graphics/nxmu/nxmu_requestbkgd.c b/nuttx/graphics/nxmu/nxmu_requestbkgd.c index 47b1ad13f..ef7c9f1c0 100644 --- a/nuttx/graphics/nxmu/nxmu_requestbkgd.c +++ b/nuttx/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/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c index 4cb1246b5..b96b4f8b8 100644 --- a/nuttx/graphics/nxmu/nxmu_server.c +++ b/nuttx/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; |