Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/client/qwaylanddataoffer.cpp
	src/client/qwaylanddisplay.cpp
	src/client/qwaylandinputdevice.cpp
	src/client/qwaylandwindow.cpp
	src/compositor/compositor_api/qwaylandsurfaceitem.cpp

Change-Id: I2eae0fd43a71fbfd7c907ca715707a26f3c134c5

1 files changed, 8 insertions, 0 deletions

diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index 9d4413f6f..394fd4270 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -163,6 +163,11 @@ public:
 
     bool supportsWindowDecoration() const;
 
+    uint32_t lastInputSerial() const { return mLastInputSerial; }
+    QWaylandInputDevice *lastInputDevice() const { return mLastInputDevice; }
+    QWaylandWindow *lastInputWindow() const { return mLastInputWindow; }
+    void setLastInputDevice(QWaylandInputDevice *device, uint32_t serial, QWaylandWindow *window);
+
 public slots:
     void blockingReadEvents();
     void flushRequests();
@@ -204,6 +209,9 @@ private:
     bool mScreensInitialized;
     QList<RegistryGlobal> mGlobals;
     int mCompositorVersion;
+    uint32_t mLastInputSerial;
+    QWaylandInputDevice *mLastInputDevice;
+    QWaylandWindow *mLastInputWindow;
 
     void registry_global(uint32_t id, const QString &interface, uint32_t version) Q_DECL_OVERRIDE;
     void registry_global_remove(uint32_t id) Q_DECL_OVERRIDE;