summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fbconvenience
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2014-12-09 16:27:55 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-01-05 15:55:02 +0100
commit13ec068ce278bdf003b26abe05658668e91afe09 (patch)
treeff56afc918cbb754a27b5579c8b82098ea3e956f /src/platformsupport/fbconvenience
parent8a4099a0aa86969744d1258244abf2b8d3e8ed26 (diff)
Compile in evdev code to linuxfb
Make it compatible with eglfs. The behavior is the same: By default mouse, keyboard and touch will all be initialized and, when having libudev support, discovered automatically. The environment variables QT_QPA_FB_DISABLE_INPUT and QT_QPA_FB_TSLIB can be used to used to disable the built-in input handlers and to force tslib instead of evdev, respectively. This allows embedded systems and applications to easily fall back from eglfs to linuxfb on devices that are not rendering via OpenGL. Dynamic hiding/showing of the mouse cursor is to be done separately, here we provide the necessary device discovery hooks only. [ChangeLog][QtGui] The linuxfb platform plugin's input device handling is now compatible with eglfs. The evdev keyboard, mouse and touch code is compiled in by default. Change-Id: I44bc661c53ae78c39b0f30486a475b4e639ab2d6 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'src/platformsupport/fbconvenience')
-rw-r--r--src/platformsupport/fbconvenience/qfbcursor.cpp5
-rw-r--r--src/platformsupport/fbconvenience/qfbcursor_p.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/platformsupport/fbconvenience/qfbcursor.cpp b/src/platformsupport/fbconvenience/qfbcursor.cpp
index 49bc88d854..806556b1e4 100644
--- a/src/platformsupport/fbconvenience/qfbcursor.cpp
+++ b/src/platformsupport/fbconvenience/qfbcursor.cpp
@@ -137,4 +137,9 @@ void QFbCursor::setDirty()
}
}
+void QFbCursor::setMouseDeviceDiscovery(QDeviceDiscovery *dd)
+{
+ Q_UNUSED(dd);
+}
+
QT_END_NAMESPACE
diff --git a/src/platformsupport/fbconvenience/qfbcursor_p.h b/src/platformsupport/fbconvenience/qfbcursor_p.h
index 95632f177b..75501a0ff0 100644
--- a/src/platformsupport/fbconvenience/qfbcursor_p.h
+++ b/src/platformsupport/fbconvenience/qfbcursor_p.h
@@ -50,9 +50,12 @@
QT_BEGIN_NAMESPACE
class QFbScreen;
+class QDeviceDiscovery;
class QFbCursor : public QPlatformCursor
{
+ Q_OBJECT
+
public:
QFbCursor(QFbScreen *screen);
@@ -71,6 +74,8 @@ public:
virtual bool isOnScreen() const { return mOnScreen; }
virtual QRect lastPainted() const { return mPrevRect; }
+ void setMouseDeviceDiscovery(QDeviceDiscovery *dd);
+
private:
void setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY);
void setCursor(Qt::CursorShape shape);