diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 16:31:31 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 16:31:31 -0600 |
| commit | 72754295cabf0096cbc6f2ec693f1e5e362d8c56 (patch) | |
| tree | d541af4e4c2a1ba416aa775623d658d926b282b8 /nuttx/include | |
| parent | 80ea5737ca7bbdb33ba3ccf37a7c919338876222 (diff) | |
| download | px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.gz px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.bz2 px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.zip | |
Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/nx/nx.h | 4 | ||||
| -rw-r--r-- | nuttx/include/nuttx/nx/nxmu.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h index 96584db7d..6093a0878 100644 --- a/nuttx/include/nuttx/nx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -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 diff --git a/nuttx/include/nuttx/nx/nxmu.h b/nuttx/include/nuttx/nx/nxmu.h index 019a8a35f..711365f74 100644 --- a/nuttx/include/nuttx/nx/nxmu.h +++ b/nuttx/include/nuttx/nx/nxmu.h @@ -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 */ |