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

1 files changed, 5 insertions, 3 deletions

diff --git a/unix/xserver/hw/vnc/Input.h b/unix/xserver/hw/vnc/Input.h
index dbc78f88..fb01bced 100644
--- a/unix/xserver/hw/vnc/Input.h
+++ b/unix/xserver/hw/vnc/Input.h
@@ -55,17 +55,19 @@ public:
 
 	void KeyboardPress(rdr::U32 keysym) { keyEvent(keysym, true); }
 	void KeyboardRelease(rdr::U32 keysym) { keyEvent(keysym, false); }
-private:
+
 	/*
 	 * Init input device. This cannot be done in the constructor
 	 * because constructor is called during X server extensions
 	 * initialization. Devices must be initialized after core
 	 * pointer/keyboard initialization which is actually after extesions
 	 * initialization. Check InitExtensions(), InitCoreDevices() and
-	 * InitInput() calls in dix/main.c
+         * InitInput() calls in dix/main.c. Instead it is called from
+         * XserverDesktop at an appropriate time.
 	 */
-	void initInputDevice(void);
+	void InitInputDevice(void);
 
+private:
 	void keyEvent(rdr::U32 keysym, bool down);
 
 	rfb::VNCServerST *server;