diff options
| author | Pierre Ossman <ossman@cendio.se> | 2013-04-09 14:59:31 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2013-04-09 14:59:31 +0000 |
| commit | cde21d8590e0f21b61de744c2f746bfbe80530c7 (patch) | |
| tree | 10862c7a35fe3f54c8b90836ad690edebe66fcd7 /unix/xserver/hw/vnc/XserverDesktop.cc | |
| parent | 3e4e1865de17bca4eb64b6dd72e8b08819b6c611 (diff) | |
| download | tigervnc-cde21d8590e0f21b61de744c2f746bfbe80530c7.tar.gz tigervnc-cde21d8590e0f21b61de744c2f746bfbe80530c7.zip | |
Make sure InputDevice::InitInputDevice() gets called early in
the startup process so our devices are visible and available
right away.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5069 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver/hw/vnc/XserverDesktop.cc')
| -rw-r--r-- | unix/xserver/hw/vnc/XserverDesktop.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc index e777bd30..3ef6f251 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.cc +++ b/unix/xserver/hw/vnc/XserverDesktop.cc @@ -576,6 +576,12 @@ static struct timeval XserverDesktopTimeout; void XserverDesktop::blockHandler(fd_set* fds, OSTimePtr timeout) { + // We don't have a good callback for when we can init input devices[1], + // so we abuse the fact that this routine will be called first thing + // once the dix is done initialising. + // [1] Technically Xvnc has InitInput(), but libvnc.so has nothing. + inputDevice->InitInputDevice(); + try { int nextTimeout; |