1 files changed, 7 insertions, 12 deletions

diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index b03d92e56..52e57c72a 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -81,8 +81,9 @@ class QWaylandInputDevice;
 class QWaylandScreen;
 class QWaylandShmBackingStore;
 class QWaylandPointerEvent;
+class QWaylandSurface;
 
-class Q_WAYLAND_CLIENT_EXPORT QWaylandWindow : public QObject, public QPlatformWindow, public QtWayland::wl_surface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandWindow : public QObject, public QPlatformWindow
 {
     Q_OBJECT
 public:
@@ -110,12 +111,10 @@ public:
 
     void applyConfigureWhenPossible(); //rename to possible?
 
-    using QtWayland::wl_surface::attach;
     void attach(QWaylandBuffer *buffer, int x, int y);
     void attachOffset(QWaylandBuffer *buffer);
     QPoint attachOffset() const;
 
-    using QtWayland::wl_surface::damage;
     void damage(const QRect &rect);
 
     void safeCommit(QWaylandBuffer *buffer, const QRegion &damage);
@@ -130,6 +129,8 @@ public:
     QSize surfaceSize() const;
     QRect windowContentGeometry() const;
 
+    QWaylandSurface *waylandSurface() const { return mSurface.data(); }
+    ::wl_surface *wlSurface();
     static QWaylandWindow *fromWlSurface(::wl_surface *surface);
 
     QWaylandDisplay *display() const { return mDisplay; }
@@ -159,7 +160,6 @@ public:
     QWaylandAbstractDecoration *decoration() const;
 
     void handleMouse(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e);
-    void handleMouseLeave(QWaylandInputDevice *inputDevice);
 
     bool touchDragDecoration(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global,
                              Qt::TouchPointState state, Qt::KeyboardModifiers mods);
@@ -209,11 +209,8 @@ signals:
     void wlSurfaceDestroyed();
 
 protected:
-    void surface_enter(struct ::wl_output *output) override;
-    void surface_leave(struct ::wl_output *output) override;
-
-    QVector<QWaylandScreen *> mScreens; //As seen by wl_surface.enter/leave events. Chronological order.
     QWaylandDisplay *mDisplay = nullptr;
+    QScopedPointer<QWaylandSurface> mSurface;
     QWaylandShellSurface *mShellSurface = nullptr;
     QWaylandSubSurface *mSubSurfaceWindow = nullptr;
     QVector<QWaylandSubSurface *> mChildren;
@@ -244,6 +241,7 @@ protected:
     bool mSentInitialResize = false;
     QPoint mOffset;
     int mScale = 1;
+    QWaylandScreen *mLastReportedScreen = nullptr;
 
     QIcon mWindowIcon;
 
@@ -255,9 +253,6 @@ protected:
     QWaylandBuffer *mQueuedBuffer = nullptr;
     QRegion mQueuedBufferDamage;
 
-private slots:
-    void handleScreenRemoved(QScreen *qScreen);
-
 private:
     void setGeometry_helper(const QRect &rect);
     void initWindow();
@@ -270,7 +265,7 @@ private:
     QWaylandScreen *calculateScreenFromSurfaceEvents() const;
 
     void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e);
-    void handleScreenChanged();
+    void handleScreensChanged();
 
     bool mInResizeFromApplyConfigure = false;
     QRect mLastExposeGeometry;