From a1dbf346e6f1dc6c539d43bfa40b1aa78772ecdd Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Thu, 17 Dec 2015 00:22:27 +0100
Subject: Support showing the mouse cursor in the VNC plugin

Change-Id: I380e36b3a814db7ba779d998260d1a75d1d20e0c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 src/plugins/platforms/vnc/qvnc.cpp            | 3 ---
 src/plugins/platforms/vnc/qvncintegration.cpp | 9 ++++++++-
 src/plugins/platforms/vnc/qvncscreen.h        | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp
index 6948344701..d01d53b2f8 100644
--- a/src/plugins/platforms/vnc/qvnc.cpp
+++ b/src/plugins/platforms/vnc/qvnc.cpp
@@ -681,7 +681,6 @@ void QVncServer::setDirty()
 
 void QVncServer::newConnection()
 {
-    QT_VNC_DEBUG() << "!!!!!!!!!!!! new connection";
     if (client)
         delete client;
 
@@ -1023,12 +1022,10 @@ void QVncServer::setEncodings()
                 break;
             case Cursor:
                 supportCursor = true;
-#ifndef QT_NO_QWS_CURSOR
                 if (!qvnc_screen->screen()) {
                     delete qvnc_cursor;
                     qvnc_cursor = new QVncClientCursor(this);
                 }
-#endif
                 break;
             case DesktopSize:
                 supportDesktopSize = true;
diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp
index adef5423a5..ee224bd36a 100644
--- a/src/plugins/platforms/vnc/qvncintegration.cpp
+++ b/src/plugins/platforms/vnc/qvncintegration.cpp
@@ -48,7 +48,7 @@
 
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
-
+#include <private/qinputdevicemanager_p_p.h>
 #ifndef QT_NO_LIBINPUT
 #include <QtPlatformSupport/private/qlibinputhandler_p.h>
 #endif
@@ -80,6 +80,13 @@ void QVncIntegration::initialize()
     m_inputContext = QPlatformInputContextFactory::create();
 
     m_nativeInterface.reset(new QPlatformNativeInterface);
+
+    // we always have exactly one mouse and keyboard
+    QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
+        QInputDeviceManager::DeviceTypePointer, 1);
+    QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
+        QInputDeviceManager::DeviceTypeKeyboard, 1);
+
 }
 
 bool QVncIntegration::hasCapability(QPlatformIntegration::Capability cap) const
diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
index bad6910a75..5911121169 100644
--- a/src/plugins/platforms/vnc/qvncscreen.h
+++ b/src/plugins/platforms/vnc/qvncscreen.h
@@ -64,6 +64,8 @@ public:
     QRegion doRedraw() Q_DECL_OVERRIDE;
     QImage *image() const { return mScreenImage; }
 
+//    QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return mCursor; }
+
     void clearDirty() { dirtyRegion = QRegion(); }
 
     QStringList mArgs;
-- 
cgit v1.2.3