Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-10-10 23:40:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apps/graphics/twm4nx: Additional changes needed to use touchscreen with no keyboard.

Browse source
This commit is contained in:
Gregory Nutt 2019-05-04 14:51:49 -06:00
parent afbb51eb1e
commit f64df4a376
5 changed files with 147 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/graphics/twm4nx/cinput.hxx
View file

@ -89,12 +89,17 @@ namespace Twm4Nx
*/
CTwm4Nx *m_twm4nx; /**< The Twm4Nx session */
#ifndef CONFIG_TWM4NX_NOKEYBOARD
int m_kbdFd; /**< File descriptor of the opened keyboard device */
#endif
#ifndef CONFIG_TWM4NX_NOMOUSE
int m_mouseFd; /**< File descriptor of the opened mouse device */
#endif
pthread_t m_thread; /**< The listener thread ID */
volatile enum EListenerState m_state; /**< The state of the listener thread */
sem_t m_waitSem; /**< Used to synchronize with the listener thread */
#ifndef CONFIG_TWM4NX_NOKEYBOARD
/**
* Open the keyboard device. Not very interesting for the case of
* standard device but much more interesting for a USB keyboard device
@ -110,7 +115,9 @@ namespace Twm4Nx
*/
inline int keyboardOpen(void);
#endif
#ifndef CONFIG_TWM4NX_NOMOUSE
/**
* Open the mouse/touchscreen input device. Not very interesting for the
* case of standard character device but much more interesting for
@ -126,7 +133,9 @@ namespace Twm4Nx
*/
inline int mouseOpen(void);
#endif
#ifndef CONFIG_TWM4NX_NOKEYBOARD
/**
* Read data from the keyboard device and inject the keyboard data
* into NX for proper distribution.
@ -136,9 +145,11 @@ namespace Twm4Nx
*/
inline int keyboardInput(void);
#endif
#ifndef CONFIG_TWM4NX_NOMOUSE
/**
* Read data from the mouse/touchscreen device. if the input device
* Read data from the mouse/touchscreen device. If the input device
* is a mouse, then update the cursor position. And, in either case,
* inject the mouse data into NX for proper distribution.
*
@ -147,6 +158,7 @@ namespace Twm4Nx
*/
inline int mouseInput(void);
#endif
/**
* This is the heart of the keyboard/mouse listener thread. It

2
include/graphics/twm4nx/ctwm4nx.hxx
View file

@ -117,7 +117,7 @@ namespace Twm4Nx
FAR CFonts *m_fonts; /**< The cached Cfonts instance */
FAR CResize *m_resize; /**< The cached CResize instance */
#if !defined(CONFIG_TWM4NX_NOKEYBOARD) && !defined(CONFIG_TWM4NX_NOMOUSE)
#if !defined(CONFIG_TWM4NX_NOKEYBOARD) || !defined(CONFIG_TWM4NX_NOMOUSE)
FAR CInput *m_input; /**< Keyboard/mouse input injector */
#endif
/* Display properties */

4
include/graphics/twm4nx/twm4nx_config.hxx
View file

@ -432,7 +432,7 @@
* CONFIG_TWM4NX_MOUSE_USBHOST - Indicates the the mouse is attached via
* USB
* CONFIG_TWM4NX_MOUSE_BUFSIZE - The size of the mouse read data buffer.
* Default: sizeof(struct mouse_report_s)
* Default: sizeof(struct mouse_report_s) or SIZEOF_TOUCH_SAMPLE_S(1)
*/
#ifndef CONFIG_TWM4NX_MOUSE_DEVPATH
@ -447,7 +447,7 @@
# ifdef CONFIG_TWM4NX_MOUSE
# define CONFIG_TWM4NX_MOUSE_BUFSIZE sizeof(struct mouse_report_s)
# else
# define CONFIG_TWM4NX_MOUSE_BUFSIZE sizeof(SIZEOF_TOUCH_SAMPLE_S(1))
# define CONFIG_TWM4NX_MOUSE_BUFSIZE SIZEOF_TOUCH_SAMPLE_S(1)
# endif
#endif