Fix xwayland's position request

vioken · Oct 25, 2024 · 939da19 · 939da19
1 parent d2467a6
commit 939da19
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 182 deletions.
diff --git a/examples/tinywl/rootsurfacecontainer.cpp b/examples/tinywl/rootsurfacecontainer.cpp
@@ -150,6 +150,7 @@ void RootSurfaceContainer::beginMoveResize(SurfaceWrapper *surface, Qt::Edges ed
     moveResizeState.surface = surface;
     moveResizeState.startGeometry = surface->geometry();
     moveResizeState.resizeEdges = edges;
+    surface->setXwaylandPositionFromSurface(false);
     surface->setPositionAutomatic(false);
 }
 
@@ -200,6 +201,7 @@ void RootSurfaceContainer::endMoveResize()
 
     ensureSurfaceNormalPositionValid(moveResizeState.surface);
 
+    moveResizeState.surface->setXwaylandPositionFromSurface(false);
     moveResizeState.surface = nullptr;
     Q_EMIT moveResizeFinised();
 }

diff --git a/examples/tinywl/surfacewrapper.cpp b/examples/tinywl/surfacewrapper.cpp
@@ -26,6 +26,7 @@ SurfaceWrapper::SurfaceWrapper(QmlEngine *qmlEngine, WToplevelSurface *shellSurf
     , m_titleBarState(TitleBarState::Default)
     , m_noCornerRadius(false)
     , m_alwaysOnTop(false)
+    , m_xwaylandPositionFromSurface(true)
 {
     QQmlEngine::setContextForObject(this, qmlEngine->rootContext());
 
@@ -76,6 +77,48 @@ SurfaceWrapper::SurfaceWrapper(QmlEngine *qmlEngine, WToplevelSurface *shellSurf
         m_surfaceItem->setFocusPolicy(Qt::NoFocus);
 #endif
     }
+
+    if (type == Type::XWayland) {
+        auto xwaylandSurface = qobject_cast<WXWaylandSurface *>(shellSurface);
+        auto xwaylandSurfaceItem = qobject_cast<WXWaylandSurfaceItem*>(m_surfaceItem);
+
+
+        xwaylandSurface->safeConnect(&WXWaylandSurface::requestConfigure, this, [this,xwaylandSurfaceItem](QRect geometry, WXWaylandSurface::ConfigureFlags flags) {
+            if (m_xwaylandPositionFromSurface &&
+                flags.testAnyFlag(WXWaylandSurface::ConfigureFlag::XCB_CONFIG_WINDOW_POSITION)) {
+                //setPositionAutomatic(false);
+                moveNormalGeometryInOutput({
+                    geometry.x() - xwaylandSurfaceItem->topPadding(),
+                    geometry.y() - xwaylandSurfaceItem->leftPadding(),
+                });
+            }
+        });
+
+        connect(this, &QQuickItem::xChanged, xwaylandSurface, [this, xwaylandSurfaceItem]() {
+            if (!m_xwaylandPositionFromSurface)
+                xwaylandSurfaceItem->setExpectSurfacePosition(position());
+        });
+
+        connect(this, &QQuickItem::yChanged, xwaylandSurface, [this, xwaylandSurfaceItem]() {
+            if (!m_xwaylandPositionFromSurface)
+                xwaylandSurfaceItem->setExpectSurfacePosition(position());
+        });
+
+        // xwaylandSurface->requestConfigureFlags().testAnyFlags(WXWaylandSurface::ConfigureFlag::XCB_CONFIG_WINDOW_POSITION)
+        auto requestPos = xwaylandSurface->requestConfigureGeometry().topLeft();
+
+        if (!requestPos.isNull()) {
+            m_positionAutomatic = false;
+
+            //auto requestPos = xwaylandSurface->requestConfigureGeometry().topLeft();
+            moveNormalGeometryInOutput({
+                requestPos.x() - xwaylandSurfaceItem->topPadding(),
+                requestPos.y() - xwaylandSurfaceItem->leftPadding(),
+            });
+        }
+        qDebug() << "233333" << xwaylandSurface->requestConfigureFlags() << xwaylandSurface->requestConfigureGeometry();
+
+    }
 }
 
 SurfaceWrapper::~SurfaceWrapper()
@@ -573,6 +616,8 @@ void SurfaceWrapper::onAnimationReady()
 
 void SurfaceWrapper::onAnimationFinished()
 {
+    setXwaylandPositionFromSurface(true);
+
     Q_ASSERT(m_geometryAnimation);
     m_geometryAnimation->deleteLater();
 }
@@ -590,6 +635,7 @@ bool SurfaceWrapper::startStateChangeAnimation(State targetState, const QRectF &
     ok = connect(m_geometryAnimation, SIGNAL(finished()), this, SLOT(onAnimationFinished()));
     Q_ASSERT(ok);
 
+    setXwaylandPositionFromSurface(false);
     ok = QMetaObject::invokeMethod(m_geometryAnimation, "start");
     Q_ASSERT(ok);
     return ok;
@@ -965,3 +1011,8 @@ void SurfaceWrapper::updateExplicitAlwaysOnTop()
     for (const auto& sub : std::as_const(m_subSurfaces))
         sub->updateExplicitAlwaysOnTop();
 }
+
+void SurfaceWrapper::setXwaylandPositionFromSurface(bool value)
+{
+    m_xwaylandPositionFromSurface = value;
+}
diff --git a/examples/tinywl/surfacewrapper.h b/examples/tinywl/surfacewrapper.h
@@ -159,6 +159,8 @@ class SurfaceWrapper : public QQuickItem
     bool showOnAllWorkspace() const;
     void setShowOnAllWorkspace(bool showOnAllWorkspace);
 
+    void setXwaylandPositionFromSurface(bool value);
+
 public Q_SLOTS:
     // for titlebar
     void requestMinimize();
@@ -262,4 +264,5 @@ public Q_SLOTS:
     uint m_titleBarState:2;
     uint m_noCornerRadius:1;
     uint m_alwaysOnTop:1;
+    uint m_xwaylandPositionFromSurface:1;
 };