sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
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:12 -06:00
parent 909b081113
commit d7226cc6ba
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libnxwidgets/src/cnxserver.cxx
View File

@ -56,6 +56,10 @@
# include <pthread.h> # include <pthread.h>
#endif #endif
#ifdef CONFIG_VNCSERVER
# include <nuttx/video/vnc.h>
#endif
#include "nxconfig.hxx" #include "nxconfig.hxx"
#include "singletons.hxx" #include "singletons.hxx"
#include "cnxserver.hxx" #include "cnxserver.hxx"
@ -203,6 +207,18 @@ bool CNxServer::connect(void)
return false; return false;
} }
#ifdef CONFIG_VNCSERVER
// Setup the VNC server to support keyboard/mouse inputs
ret = vnc_default_fbinitialize(0, m_hNxServer);
if (ret < 0)
{
gdbg("CNxServer::connect: vnc_default_fbinitialize failed: %d\n", ret);
disconnect();
return false;
}
#endif
return true; return true;
} }
#endif // CONFIG_NX_MULTIUSER #endif // CONFIG_NX_MULTIUSER
@ -254,6 +270,19 @@ bool CNxServer::connect(void)
{ {
pthread_attr_t attr; pthread_attr_t attr;
#ifdef CONFIG_VNCSERVER
// Setup the VNC server to support keyboard/mouse inputs
ret = vnc_default_fbinitialize(0, m_hNxServer);
if (ret < 0)
{
gdbg("CNxServer::connect: vnc_default_fbinitialize failed: %d\n", ret);
m_running = false;
disconnect();
return false;
}
#endif
// Start a separate thread to listen for server events. This is probably // Start a separate thread to listen for server events. This is probably
// the least efficient way to do this, but it makes this logic flow more // the least efficient way to do this, but it makes this logic flow more
// smoothly. // smoothly.