1 files changed, 48 insertions, 32 deletions

diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 76d7715a8..7f82136fe 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -52,11 +52,6 @@
 #include "qwaylandshmbackingstore_p.h"
 #include "qwaylandshellintegration_p.h"
 
-#if QT_CONFIG(wayland_datadevice)
-#include "qwaylanddatadevice_p.h"
-#endif
-
-
 #include <QtCore/QFileInfo>
 #include <QtCore/QPointer>
 #include <QtCore/QRegularExpression>
@@ -69,8 +64,6 @@
 #include <QtCore/QDebug>
 #include <QtCore/QThread>
 
-#include <wayland-client.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
@@ -100,10 +93,6 @@ QWaylandWindow::~QWaylandWindow()
     if (isInitialized())
         reset(false);
 
-    QList<QWaylandInputDevice *> inputDevices = mDisplay->inputDevices();
-    for (int i = 0; i < inputDevices.size(); ++i)
-        inputDevices.at(i)->handleWindowDestroyed(this);
-
     const QWindow *parent = window();
     foreach (QWindow *w, QGuiApplication::topLevelWindows()) {
         if (w->transientParent() == parent)
@@ -245,8 +234,10 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
     mShellSurface = nullptr;
     delete mSubSurfaceWindow;
     mSubSurfaceWindow = nullptr;
-    if (isInitialized())
+    if (isInitialized()) {
+        emit wlSurfaceDestroyed();
         destroy();
+    }
     mScreens.clear();
 
     if (mFrameCallback) {
@@ -355,6 +346,9 @@ void QWaylandWindow::setGeometry(const QRect &rect)
     QRect exposeGeometry(QPoint(), geometry().size());
     if (isExposed() && !mInResizeFromApplyConfigure && exposeGeometry != mLastExposeGeometry)
         sendExposeEvent(exposeGeometry);
+
+    if (mShellSurface)
+        mShellSurface->setWindowGeometry(windowContentGeometry());
 }
 
 void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, const QPoint &offset)
@@ -511,9 +505,11 @@ void QWaylandWindow::surface_enter(wl_output *output)
     auto addedScreen = QWaylandScreen::fromWlOutput(output);
 
     if (mScreens.contains(addedScreen)) {
-        qWarning() << "Unexpected wl_surface.enter received for output with id:"
-                   << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
-                   << "screen name:" << addedScreen->name() << "screen model:" << addedScreen->model();
+        qCWarning(lcQpaWayland)
+                << "Ignoring unexpected wl_surface.enter received for output with id:"
+                << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
+                << "screen name:" << addedScreen->name() << "screen model:" << addedScreen->model()
+                << "This is most likely a bug in the compositor.";
         return;
     }
 
@@ -530,9 +526,12 @@ void QWaylandWindow::surface_leave(wl_output *output)
     auto *removedScreen = QWaylandScreen::fromWlOutput(output);
     bool wasRemoved = mScreens.removeOne(removedScreen);
     if (!wasRemoved) {
-        qWarning() << "Unexpected wl_surface.leave received for output with id:"
-                   << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
-                   << "screen name:" << removedScreen->name() << "screen model:" << removedScreen->model();
+        qCWarning(lcQpaWayland)
+                << "Ignoring unexpected wl_surface.leave received for output with id:"
+                << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
+                << "screen name:" << removedScreen->name()
+                << "screen model:" << removedScreen->model()
+                << "This is most likely a bug in the compositor.";
         return;
     }
 
@@ -614,6 +613,11 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
     wl_surface::commit();
 }
 
+void QWaylandWindow::commit()
+{
+    wl_surface::commit();
+}
+
 const wl_callback_listener QWaylandWindow::callbackListener = {
     [](void *data, wl_callback *callback, uint32_t time) {
         Q_UNUSED(callback);
@@ -684,6 +688,23 @@ QMargins QWaylandWindow::frameMargins() const
     return QPlatformWindow::frameMargins();
 }
 
+/*!
+ * Size, with decorations (including including eventual shadows) in wl_surface coordinates
+ */
+QSize QWaylandWindow::surfaceSize() const
+{
+    return geometry().marginsAdded(frameMargins()).size();
+}
+
+/*!
+ * Window geometry as defined by the xdg-shell spec (in wl_surface coordinates)
+ * topLeft is where the shadow stops and the decorations border start.
+ */
+QRect QWaylandWindow::windowContentGeometry() const
+{
+    return QRect(QPoint(), surfaceSize());
+}
+
 QWaylandShellSurface *QWaylandWindow::shellSurface() const
 {
     return mShellSurface;
@@ -878,9 +899,7 @@ void QWaylandWindow::handleMouse(QWaylandInputDevice *inputDevice, const QWaylan
 
 #if QT_CONFIG(cursor)
     if (e.type == QWaylandPointerEvent::Enter) {
-        QRect windowGeometry = window()->frameGeometry();
-        windowGeometry.moveTopLeft({0, 0}); // convert to wayland surface coordinates
-        QRect contentGeometry = windowGeometry.marginsRemoved(frameMargins());
+        QRect contentGeometry = windowContentGeometry().marginsRemoved(frameMargins());
         if (contentGeometry.contains(e.local.toPoint()))
             restoreMouseCursor(inputDevice);
     }
@@ -977,7 +996,8 @@ void QWaylandWindow::handleScreenChanged()
 #if QT_CONFIG(cursor)
 void QWaylandWindow::setMouseCursor(QWaylandInputDevice *device, const QCursor &cursor)
 {
-    device->setCursor(cursor, waylandScreen());
+    int fallbackBufferScale = int(devicePixelRatio());
+    device->setCursor(&cursor, {}, fallbackBufferScale);
 }
 
 void QWaylandWindow::restoreMouseCursor(QWaylandInputDevice *device)
@@ -991,16 +1011,6 @@ void QWaylandWindow::requestActivateWindow()
     qCWarning(lcQpaWayland) << "Wayland does not support QWindow::requestActivate()";
 }
 
-void QWaylandWindow::unfocus()
-{
-#if QT_CONFIG(clipboard)
-    QWaylandInputDevice *inputDevice = mDisplay->currentInputDevice();
-    if (inputDevice && inputDevice->dataDevice()) {
-        inputDevice->dataDevice()->invalidateSelectionOffer();
-    }
-#endif
-}
-
 bool QWaylandWindow::isExposed() const
 {
     if (!window()->isVisible())
@@ -1190,6 +1200,12 @@ void QWaylandWindow::addAttachOffset(const QPoint point)
     mOffset += point;
 }
 
+void QWaylandWindow::propagateSizeHints()
+{
+    if (mShellSurface)
+        mShellSurface->propagateSizeHints();
+}
+
 bool QtWaylandClient::QWaylandWindow::startSystemMove(const QPoint &pos)
 {
     Q_UNUSED(pos);