fix(remote-subsurface): reattach child subsurface when ancestor is re…

[wineee]

…created

Reattach nested remote subsurfaces when recreating an ancestor WSurface wrapper, restoring their position and z-order so they become visible again.

重建祖先 WSurface 包装器时重新挂载嵌套的远程子曲面，恢复其位置和 z 序，使其重新可见。

PMS: TASK-393795

Summary by Sourcery

Ensure nested remote subsurfaces are recreated and reattached when their ancestor surface wrapper is recreated.

Bug Fixes:

• Restore nested remote subsurfaces after an ancestor WSurface wrapper is recreated, preserving their positions, z-order, and visibility.

Enhancements:

• Track parent surface mapping at the wlroots surface level so remote subsurface mapping remains valid across WSurface wrapper recreation.

[deepin-ci-robot]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[sourcery-ai]

Reviewer's Guide

The fix makes remote subsurface contexts resilient to ancestor WSurface wrapper destruction by retaining positions, recreating missing child WSubsurface objects during mapping checks, and restoring their position and z-order so nested subsurfaces become visible again.

Sequence diagram for restoring nested remote subsurfaces

sequenceDiagram
    participant Parent as Ancestor WSurface
    participant Context as RemoteSubsurfaceContext
    participant Manager as WRemoteSubsurfaceManagerV1Private
    participant Child as WSubsurface

    Parent->>Context: recheckMapping()
    Context->>Context: ensureSubsurface()
    alt WSubsurface missing
        Context->>Manager: createRemoteSubsurface(parent, child)
        Manager-->>Context: WSubsurface
        Context->>Child: setPosition(position())
        Context->>Manager: syncRemoteSubsurfaceOrder(parent)
    end
    Context->>Child: recheckMapping()

Loading

File-Level Changes

Change	Details	Files
Preserve remote subsurface geometry and recreate child wrappers when an ancestor WSurface is rebuilt.	Store the latest child position independently of the WSubsurface object. Add lazy recreation of missing WSubsurface instances from the parent and child exported surfaces. Restore the saved position and resynchronize stacking order after recreation. Invoke the recreation check during mapping reevaluation, while retaining existing objects as a fast no-op path.	waylib/src/server/protocols/wremotesubsurfacemanagerv1.cpp

Possibly linked issues

• #TODO: surface position: PR stores remote subsurface positions and restores them when recreating wrappers, directly implementing position persistence during lifecycle updates.

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[sourcery-ai]

Hey - I've found 1 issue

Prompt for AI Agents

Please address the comments from this code review:

## Individual Comments

### Comment 1
<location path="waylib/src/server/protocols/wremotesubsurfacemanagerv1.cpp" line_range="651-653" />
<code_context>
     auto *parentWs = wsurfaceFrom(m_parent);
     parentMapped = parentWs  && parentWs->mapped();

+    // ensureSubsurface re-creates this subsurface when the parent WSurface
+    // wrapper was destroyed and recreated.  Fast no-op when it still exists.
+    ensureSubsurface();
+
     bool childHasBuffer = childQw && wlr_surface_has_buffer(childQw);
</code_context>
<issue_to_address>
**issue (bug_risk):** Recreating a non-remote ancestor WSurface does not trigger `recheckMapping()` for its remote children because `trackCommits()` remains connected to the destroyed WSurface wrapper and is never reconnected to the replacement wrapper. Consequently, `ensureSubsurface()` is never called and the child remains detached until some unrelated child or parent event happens.

**Triggers:** When the ancestor is an xdg-toplevel or other non-remote surface whose WSurface wrapper is recreated while the child already has a buffer and no subsequent commit occurs.

**Suggested fix:** Reconnect each affected RemoteSubsurfaceContext to the replacement WSurface's `commit` and `mappedChanged` signals, or explicitly recheck all remote children when a WSurface wrapper is recreated.
</issue_to_address>

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[sourcery-ai]

Sorry @wineee, you've used your own review budget of 250,000 diff characters for the last 7 days.

You can request another review in 18 hours and 17 minutes by commenting @sourcery-ai review. Upgrade to get a review now.

[Copilot]

🔵 Needs a closer look

The change affects low-level Wayland surface lifecycle/mapping behavior and should be validated with runtime scenarios (涉及底层 Wayland 生命周期与映射逻辑，建议人工结合实际场景验证后再合入).

Pull request overview

EN: This PR fixes visibility regressions for nested remote subsurfaces by reattaching (recreating) missing WSubsurface objects when an ancestor WSurface wrapper gets torn down and rebuilt (e.g., role lifecycle changes), while restoring position and z-order so children become visible again.
中文：本 PR 修复了嵌套远程子曲面在祖先 WSurface 包装器被销毁并重建（例如 role 生命周期变化）后不可见的问题：在检测到子曲面对象缺失时重新创建 WSubsurface，并恢复位置与 z 序以确保重新可见。

Changes:

• EN: Listen to parent wlr_surface commit via WScopedListener so remapping logic survives WSurface wrapper recreation.
  中文：通过 WScopedListener 监听父 wlr_surface 的 commit，使重建 WSurface 包装器后仍能触发重映射检查。
• EN: Add ensureSubsurface() to recreate missing WSubsurface, restore saved position, and resync remote subsurface ordering.
  中文：新增 ensureSubsurface()：在 WSubsurface 缺失时重建、恢复缓存的位置，并重新同步远程子曲面排序。

File summaries

File	Description
waylib/src/server/protocols/wremotesubsurfacemanagerv1.cpp	EN: Reattach/remap nested remote subsurfaces across WSurface wrapper recreation using wlr_surface commit listeners and on-demand subsurface recreation. 中文：通过监听 wlr_surface commit + 按需重建子曲面，保证 WSurface 包装器重建后嵌套远程子曲面可重新挂载并恢复可见性。

Review details

• Files reviewed: 1/1 changed files
• Comments generated: 0
• Review effort level: Lite

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[deepin-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: wineee, zccrs

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• debian/deepin/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment