WIP: 录屏重构

src/seat/helper.cpp

@@ -3452,30 +3452,13 @@ void Helper::handleNewForeignToplevelCaptureRequest(wlr_ext_foreign_toplevel_ima
         return;
     }
 
-    WSurfaceItem *surfaceItem = surfaceWrapper->surfaceItem();
-    if (!surfaceItem) {
-        qCWarning(lcTlCapture) << "Could not get WSurfaceItem from SurfaceWrapper";
-        return;
-    }
-
-    WSurfaceItemContent *surfaceContent = surfaceItem->findItemContent();
-    if (!surfaceContent) {
-        qCWarning(lcTlCapture) << "Could not find WSurfaceItemContent";
-        return;
-    }
-
-    qCDebug(lcTlCapture) << "Found WSurfaceItemContent for capture:"
-             << "size=" << surfaceContent->size()
-             << "implicitSize=" << QSizeF(surfaceContent->implicitWidth(), surfaceContent->implicitHeight())
-             << "isTextureProvider=" << surfaceContent->isTextureProvider();
-
     auto *output = surfaceWrapper->ownsOutput()->output();
     if (!output) {
         qCWarning(lcTlCapture) << "Could not get WOutput from SurfaceWrapper";
         return;
     }
 
-    auto *imageCaptureSource = new WExtImageCaptureSourceV1Impl(surfaceContent, output);
+    auto *imageCaptureSource = new WExtImageCaptureSourceV1Impl(surfaceWrapper->surfaceItem(), output);
 
     bool success = qw_ext_foreign_toplevel_image_capture_source_manager_v1::request_accept(
         request, *imageCaptureSource);

waylib/src/server/qtquick/woutputrenderwindow.cpp

@@ -1903,6 +1903,43 @@ bool WOutputRenderWindow::inRendering() const
     return d->inRendering;
 }
 
+qw_buffer *WOutputRenderWindow::renderItemToBuffer(WBufferRenderer *renderer,
+                                                   const QList<QMatrix4x4> &renderMatrices,
+                                                   const QSize &pixelSize,
+                                                   qreal dpr,
+                                                   uint32_t format)
+{
+    Q_D(WOutputRenderWindow);
+    Q_ASSERT(renderer);
+    Q_ASSERT(!renderMatrices.isEmpty());
+
+    auto buffer = renderer->beginRender(
+        pixelSize,
+        dpr,
+        format,
+        WBufferRenderer::RenderFlags(
+            WBufferRenderer::DontConfigureSwapchain
+            | WBufferRenderer::RedirectOpenGLContextDefaultFrameBufferObject));
+    if (!buffer)
+        return nullptr;
+
+    const int pushedCount = renderMatrices.size();
+    for (int i = 0; i < pushedCount; i++) {
+        d->pushRenderer(renderer);
+        renderer->render(i, renderMatrices[i], { }, { }, i > 0);
+    }
+
+    renderer->endRender();
+
+    // Pop all entries we pushed (one per render call) to keep rendererList clean.
+    for (int i = 0; i < pushedCount; i++) {
+        if (!d->rendererList.isEmpty())
+            d->rendererList.pop();
+    }
+
+    return renderer->lastBuffer();
+}
+
 void WOutputRenderWindow::setRenderEnabled(bool enabled) {
     Q_D(WOutputRenderWindow);
     d->renderEnabled = enabled;

waylib/src/server/qtquick/woutputrenderwindow.h

@@ -3,12 +3,15 @@
 
 #pragma once
 
 #include <wglobal.h>
 #include <woutput.h>
 #include <qwglobal.h>
+QW_BEGIN_NAMESPACE
+class qw_buffer;
+QW_END_NAMESPACE
 
 #include <QQuickWindow>
 #include <QQmlParserStatus>
 
 Q_MOC_INCLUDE(<wquickoutputlayout.h>)
 
@@ -59,6 +62,17 @@
     WBufferRenderer *currentRenderer() const;
     bool inRendering() const;
 
+    // Render source items to an offscreen buffer via the given WBufferRenderer.
+    // Must be called during the render pass (e.g. in afterRendering signal).
+    // renderMatrices: one per source in renderer->sourceList(), maps source
+    // local coords to render buffer pixel coords. Returns the rendered buffer
+    // (same as renderer->lastBuffer()), or nullptr on failure.
+    QW_NAMESPACE::qw_buffer *renderItemToBuffer(WBufferRenderer *renderer,
+                                                const QList<QMatrix4x4> &renderMatrices,
+                                                const QSize &pixelSize,
+                                                qreal dpr,
+                                                uint32_t format);
+
     void setRenderEnabled(bool enabled);
 
     static QList<QPointer<QQuickItem>> paintOrderItemList(QQuickItem *root, std::function<bool(QQuickItem*)> filter);