From 10472dce9202e4460b2d908bdbe0cd65291f77e5 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Date: Fri, 9 Jan 2015 14:48:01 +0100
Subject: Unify input device hotplugging support for embedded

On embedded the mouse cursor will now appear and reappear regardless of
how the input handling code is loaded (via a generic plugin or compiled-in
to the platform plugin).

Instead of passing around QDeviceDiscovery instances that only works
when compiling-in the code into the platform plugin, introduce a new
internal central QInputDeviceManager. The single instance of this
provides a place to store any future input device related signals and
properties.

Also introduce mouse hotplugging support to linuxfb.

[ChangeLog][QtGui] The mouse cursor on Embedded Linux is now handling
hotplugging correctly with eglfs and linuxfb regardless of how the input
handling code is loaded (via a generic plugin or built in to the platform
plugin).

Change-Id: I147c1b04a193baf216598015264f2c06e1b20f84
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
---
 src/platformsupport/fbconvenience/qfbcursor_p.h | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'src/platformsupport/fbconvenience/qfbcursor_p.h')

diff --git a/src/platformsupport/fbconvenience/qfbcursor_p.h b/src/platformsupport/fbconvenience/qfbcursor_p.h
index 75501a0ff0..bec781fb21 100644
--- a/src/platformsupport/fbconvenience/qfbcursor_p.h
+++ b/src/platformsupport/fbconvenience/qfbcursor_p.h
@@ -46,11 +46,27 @@
 //
 
 #include <qpa/qplatformcursor.h>
+#include <QtGui/private/qinputdevicemanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QFbScreen;
-class QDeviceDiscovery;
+class QFbCursor;
+
+class QFbCursorDeviceListener : public QObject
+{
+    Q_OBJECT
+
+public:
+    QFbCursorDeviceListener(QFbCursor *cursor) : m_cursor(cursor) { }
+    bool hasMouse() const;
+
+public slots:
+    void onDeviceListChanged(QInputDeviceManager::DeviceType type);
+
+private:
+    QFbCursor *m_cursor;
+};
 
 class QFbCursor : public QPlatformCursor
 {
@@ -58,6 +74,7 @@ class QFbCursor : public QPlatformCursor
 
 public:
     QFbCursor(QFbScreen *screen);
+    ~QFbCursor();
 
     // output methods
     QRect dirtyRect();
@@ -74,7 +91,7 @@ public:
     virtual bool isOnScreen() const { return mOnScreen; }
     virtual QRect lastPainted() const { return mPrevRect; }
 
-    void setMouseDeviceDiscovery(QDeviceDiscovery *dd);
+    void updateMouseStatus();
 
 private:
     void setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY);
@@ -82,12 +99,14 @@ private:
     void setCursor(const QImage &image, int hotx, int hoty);
     QRect getCurrentRect();
 
+    bool mVisible;
     QFbScreen *mScreen;
     QRect mCurrentRect;      // next place to draw the cursor
     QRect mPrevRect;         // last place the cursor was drawn
     bool mDirty;
     bool mOnScreen;
     QPlatformCursorImage *mGraphic;
+    QFbCursorDeviceListener *mDeviceListener;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3