Fix xwayland's position request

vioken · Oct 30, 2024 · 6e88ca5 · 6e88ca5
1 parent d7c5a93
commit 6e88ca5
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 183 deletions.
diff --git a/examples/tinywl/helper.cpp b/examples/tinywl/helper.cpp
@@ -299,6 +299,9 @@ void Helper::init()
                         wrapper->setNoTitleBar(false);
                     if (xwayland->decorationsType() != WXWaylandSurface::DecorationsNoBorder)
                         wrapper->setNoDecoration(false);
+                } else {
+                    wrapper->setNoTitleBar(true);
+                    wrapper->setNoDecoration(true);
                 }
             };
             connect(xwayland, &WXWaylandSurface::bypassManagerChanged, this, updateDecorationTitleBar);

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(true);
     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,30 @@ 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);
+
+        connect(xwaylandSurfaceItem, &WXWaylandSurfaceItem::implicitPositionChanged, this, [this, xwaylandSurfaceItem]() {
+            if (m_xwaylandPositionFromSurface)
+                moveNormalGeometryInOutput(xwaylandSurfaceItem->implicitPosition());
+        });
+
+        connect(this, &QQuickItem::xChanged, xwaylandSurface, [this, xwaylandSurfaceItem]() {
+            xwaylandSurfaceItem->moveTo(position(), !m_xwaylandPositionFromSurface);
+        });
+
+        connect(this, &QQuickItem::yChanged, xwaylandSurface, [this, xwaylandSurfaceItem]() {
+            xwaylandSurfaceItem->moveTo(position(), !m_xwaylandPositionFromSurface);
+        });
+
+        auto requestPos = xwaylandSurface->requestConfigureGeometry().topLeft();
+        if (!requestPos.isNull()) {
+            m_positionAutomatic = false;
+            moveNormalGeometryInOutput(xwaylandSurfaceItem->implicitPosition());
+        }
+    }
 }
 
 SurfaceWrapper::~SurfaceWrapper()
@@ -573,6 +598,8 @@ void SurfaceWrapper::onAnimationReady()
 
 void SurfaceWrapper::onAnimationFinished()
 {
+    setXwaylandPositionFromSurface(true);
+
     Q_ASSERT(m_geometryAnimation);
     m_geometryAnimation->deleteLater();
 }
@@ -590,6 +617,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 +993,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;
 };