sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VNC: Finish initializing the VNC server once we have the NX handle

Browse Source
This commit is contained in:
Gregory Nutt 2016-04-22 13:39:35 -06:00
parent 47c2b3d4a7
commit 8c1534e3ed
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configs/sim/src/sim_touchscreen.c
View File

@ -50,6 +50,10 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#ifdef CONFIG_VNCSERVER
# include <nuttx/video/vnc.h>
#endif
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
@ -130,6 +134,17 @@ int board_tsc_setup(int minor)
goto errout_with_fb; goto errout_with_fb;
} }
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
ret = vnc_default_fbinitialize(0, g_simtc.hnx);
if (ret < 0)
{
idbg("vnc_default_fbinitialize failed: %d\n", ret);
goto errout_with_fb;
}
#endif
/* Set the background to the configured background color */ /* Set the background to the configured background color */
ivdbg("Set background color=%d\n", CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR); ivdbg("Set background color=%d\n", CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR);

16
graphics/nxmu/nx_start.c
View File

@ -53,22 +53,6 @@
#ifdef CONFIG_NX_NXSTART #ifdef CONFIG_NX_NXSTART
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

2
include/nuttx/video/vnc.h
View File

@ -180,7 +180,7 @@ void vnc_mouseout(FAR void *arg, nxgl_coord_t x, nxgl_coord_t y,
* *
****************************************************************************/ ****************************************************************************/
/* int vnc_default_fbinitialize(nt display, NXHANDLE handle); */ /* int vnc_default_fbinitialize(int display, NXHANDLE handle); */
#if defined(CONFIG_NX_KBD) && defined(CONFIG_NX_XYINPUT) #if defined(CONFIG_NX_KBD) && defined(CONFIG_NX_XYINPUT)