1 files changed, 43 insertions, 20 deletions

diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index ab10011e6..90c7a7b36 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -38,8 +38,10 @@
 
 #include <QtWaylandCompositor/QWaylandQuickShellSurfaceItem>
 #include <QtWaylandCompositor/QWaylandCompositor>
-#include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandSeat>
+#include <QtWaylandCompositor/private/qwaylandxdgshell_p.h>
 #include <QMouseEvent>
+#include <QGuiApplication>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,18 +66,17 @@ XdgShellIntegration::XdgShellIntegration(QWaylandQuickShellSurfaceItem *item)
 bool XdgShellIntegration::mouseMoveEvent(QMouseEvent *event)
 {
     if (grabberState == GrabberState::Resize) {
-        Q_ASSERT(resizeState.inputDevice == m_item->compositor()->inputDeviceFor(event));
+        Q_ASSERT(resizeState.seat == m_item->compositor()->seatFor(event));
         if (!resizeState.initialized) {
             resizeState.initialMousePos = event->windowPos();
             resizeState.initialized = true;
             return true;
         }
-        float scaleFactor = m_item->view()->output()->scaleFactor();
-        QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor;
+        QPointF delta = m_item->mapToSurface(event->windowPos() - resizeState.initialMousePos);
         QSize newSize = m_xdgSurface->sizeForResize(resizeState.initialWindowSize, delta, resizeState.resizeEdges);
-        m_xdgSurface->requestResizing(newSize);
+        m_xdgSurface->sendResizing(newSize);
     } else if (grabberState == GrabberState::Move) {
-        Q_ASSERT(moveState.inputDevice == m_item->compositor()->inputDeviceFor(event));
+        Q_ASSERT(moveState.seat == m_item->compositor()->seatFor(event));
         QQuickItem *moveItem = m_item->moveItem();
         if (!moveState.initialized) {
             moveState.initialOffset = moveItem->mapFromItem(nullptr, event->windowPos());
@@ -95,7 +96,7 @@ bool XdgShellIntegration::mouseReleaseEvent(QMouseEvent *event)
     Q_UNUSED(event);
 
     if (grabberState == GrabberState::Resize) {
-        m_xdgSurface->requestUnMaximized();
+        m_xdgSurface->sendUnmaximized();
         grabberState = GrabberState::Default;
         return true;
     } else if (grabberState == GrabberState::Move) {
@@ -105,20 +106,20 @@ bool XdgShellIntegration::mouseReleaseEvent(QMouseEvent *event)
     return false;
 }
 
-void XdgShellIntegration::handleStartMove(QWaylandInputDevice *inputDevice)
+void XdgShellIntegration::handleStartMove(QWaylandSeat *seat)
 {
     grabberState = GrabberState::Move;
-    moveState.inputDevice = inputDevice;
+    moveState.seat = seat;
     moveState.initialized = false;
 }
 
-void XdgShellIntegration::handleStartResize(QWaylandInputDevice *inputDevice, QWaylandXdgSurface::ResizeEdge edges)
+void XdgShellIntegration::handleStartResize(QWaylandSeat *seat, QWaylandXdgSurface::ResizeEdge edges)
 {
     grabberState = GrabberState::Resize;
-    resizeState.inputDevice = inputDevice;
+    resizeState.seat = seat;
     resizeState.resizeEdges = edges;
     resizeState.initialWindowSize = m_xdgSurface->windowGeometry().size();
-    resizeState.initialPosition = m_item->position();
+    resizeState.initialPosition = m_item->moveItem()->position();
     resizeState.initialSurfaceSize = m_item->surface()->size();
     resizeState.initialized = false;
 }
@@ -126,24 +127,24 @@ void XdgShellIntegration::handleStartResize(QWaylandInputDevice *inputDevice, QW
 void XdgShellIntegration::handleSetMaximized()
 {
     maximizeState.initialWindowSize = m_xdgSurface->windowGeometry().size();
-    maximizeState.initialPosition = m_item->position();
+    maximizeState.initialPosition = m_item->moveItem()->position();
 
-    QWaylandOutput *output = m_item->compositor()->outputs().first();
-    m_xdgSurface->requestMaximized(output->geometry().size() / output->scaleFactor());
+    QWaylandOutput *output = m_item->view()->output();
+    m_xdgSurface->sendMaximized(output->availableGeometry().size() / output->scaleFactor());
 }
 
 void XdgShellIntegration::handleUnsetMaximized()
 {
-    m_xdgSurface->requestUnMaximized(maximizeState.initialWindowSize);
+    m_xdgSurface->sendUnmaximized(maximizeState.initialWindowSize);
 }
 
 void XdgShellIntegration::handleMaximizedChanged()
 {
     if (m_xdgSurface->maximized()) {
-        QWaylandOutput *output = m_item->compositor()->outputs().first();
-        m_item->setPosition(output->geometry().topLeft());
+        QWaylandOutput *output = m_item->view()->output();
+        m_item->moveItem()->setPosition(output->position() + output->availableGeometry().topLeft());
     } else {
-        m_item->setPosition(maximizeState.initialPosition);
+        m_item->moveItem()->setPosition(maximizeState.initialPosition);
     }
 }
 
@@ -163,10 +164,32 @@ void XdgShellIntegration::handleSurfaceSizeChanged()
 
         if (resizeState.resizeEdges & QWaylandXdgSurface::ResizeEdge::LeftEdge)
             x += resizeState.initialSurfaceSize.width() - m_item->surface()->size().width();
-        m_item->setPosition(QPointF(x, y));
+        m_item->moveItem()->setPosition(QPointF(x, y));
     }
 }
 
+XdgPopupIntegration::XdgPopupIntegration(QWaylandQuickShellSurfaceItem *item)
+    : QWaylandQuickShellIntegration (item)
+    , m_xdgPopup(qobject_cast<QWaylandXdgPopup *>(item->shellSurface()))
+    , m_xdgShell(QWaylandXdgPopupPrivate::get(m_xdgPopup)->m_xdgShell)
+{
+    item->setSurface(m_xdgPopup->surface());
+    item->moveItem()->setPosition(QPointF(m_xdgPopup->position() * item->view()->output()->scaleFactor()));
+
+    QWaylandClient *client = m_xdgPopup->surface()->client();
+    QWaylandQuickShellEventFilter::startFilter(client, [&]() { m_xdgShell->closeAllPopups(); });
+
+    connect(m_xdgPopup, &QWaylandXdgPopup::destroyed, this, &XdgPopupIntegration::handlePopupDestroyed);
+}
+
+void XdgPopupIntegration::handlePopupDestroyed()
+{
+    QWaylandXdgShellPrivate *shellPrivate = QWaylandXdgShellPrivate::get(m_xdgShell);
+    auto popups = shellPrivate->m_xdgPopups;
+    if (popups.isEmpty())
+        QWaylandQuickShellEventFilter::cancelFilter();
+}
+
 }
 
 QT_END_NAMESPACE