We have an object to store stuff in, so don't use a global
variable.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5070 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
index f2c8bee..7a75c70 100644
--- a/unix/xserver/hw/vnc/Input.cc
+++ b/unix/xserver/hw/vnc/Input.cc
@@ -128,7 +128,7 @@
#endif /* XORG < 111 */
InputDevice::InputDevice(rfb::VNCServerST *_server)
- : server(_server), oldButtonMask(0)
+ : server(_server), initialized(false), oldButtonMask(0)
{
#if XORG < 17
pointerDev = AddInputDevice(
@@ -287,12 +287,11 @@
{
#if XORG >= 17
int ret;
- static int initialized = 0;
- if (initialized != 0)
+ if (!initialized)
return;
- initialized = 1;
+ initialized = true;
ret = AllocDevicePair(serverClient, "TigerVNC", &pointerDev,
&keyboardDev, pointerProc, keyboardProc,
diff --git a/unix/xserver/hw/vnc/Input.h b/unix/xserver/hw/vnc/Input.h
index fb01bce..fd458a6 100644
--- a/unix/xserver/hw/vnc/Input.h
+++ b/unix/xserver/hw/vnc/Input.h
@@ -71,6 +71,7 @@
void keyEvent(rdr::U32 keysym, bool down);
rfb::VNCServerST *server;
+ bool initialized;
DeviceIntPtr keyboardDev;
DeviceIntPtr pointerDev;
int oldButtonMask;