From 4296e5e49ebdf441e5f507bb8d1241701e7e04c5 Mon Sep 17 00:00:00 2001
From: abc12133 <jinguoen@huawei.com>
Date: Thu, 7 Sep 2023 17:10:17 +0800
Subject: [PATCH 1/3] utils

Signed-off-by: abc12133 <jinguoen@huawei.com>
---
 .../framework/core/wayland_surface.cpp        | 11 --------
 .../framework/core/wayland_surface.h          | 16 +-----------
 .../framework/stable/wayland_xdg_surface.cpp  |  6 ++---
 .../framework/stable/wayland_xdg_surface.h    |  4 +--
 .../{xdg_surface_utils.h => wayalnd_utils.h}  | 26 ++++++++++++++++---
 5 files changed, 29 insertions(+), 34 deletions(-)
 rename wayland_adapter/utils/include/{xdg_surface_utils.h => wayalnd_utils.h} (61%)

diff --git a/wayland_adapter/framework/core/wayland_surface.cpp b/wayland_adapter/framework/core/wayland_surface.cpp
index e9a4ad5..6dd95f2 100644
--- a/wayland_adapter/framework/core/wayland_surface.cpp
+++ b/wayland_adapter/framework/core/wayland_surface.cpp
@@ -193,16 +193,5 @@ void WaylandSurface::DamageBuffer(int32_t x, int32_t y, int32_t width, int32_t h
 void WaylandSurface::Offset(int32_t x, int32_t y)
 {
 }
-
-OHOS::sptr<WaylandSurface::FrameCallback> WaylandSurface::FrameCallback::Create(struct wl_client *client,
-    uint32_t version, uint32_t callback)
-{
-    return OHOS::sptr<WaylandSurface::FrameCallback>(new WaylandSurface::FrameCallback(client, version, callback));
-}
-
-WaylandSurface::FrameCallback::FrameCallback(struct wl_client *client, uint32_t version, uint32_t callback)
-    : WaylandResourceObject(client, &wl_callback_interface, version, callback, nullptr), serial_(callback) {}
-
-WaylandSurface::FrameCallback::~FrameCallback() noexcept {}
 } // namespace Wayland
 } // namespace FT
diff --git a/wayland_adapter/framework/core/wayland_surface.h b/wayland_adapter/framework/core/wayland_surface.h
index ed9b4d9..41ce16f 100644
--- a/wayland_adapter/framework/core/wayland_surface.h
+++ b/wayland_adapter/framework/core/wayland_surface.h
@@ -19,6 +19,7 @@
 
 #include <wayland-server-protocol.h>
 #include "wayland_resource_object.h"
+#include "wayalnd_utils.h"
 
 namespace FT {
 namespace Wayland {
@@ -49,9 +50,7 @@ public:
         uint32_t version, uint32_t id);
     ~WaylandSurface() noexcept override;
 
-    using SurfaceCommitCallback = std::function<void()>;
     void AddCommitCallback(SurfaceCommitCallback callback);
-    using SurfaceAttachCallback = std::function<void(struct wl_shm_buffer *shm)>;
     void AddAttachCallback(SurfaceAttachCallback callback);
 
 private:
@@ -68,19 +67,6 @@ private:
     void DamageBuffer(int32_t x, int32_t y, int32_t width, int32_t height);
     void Offset(int32_t x, int32_t y);
 
-    class FrameCallback final : public WaylandResourceObject {
-    public:
-        static OHOS::sptr<FrameCallback> Create(struct wl_client *client, uint32_t version, uint32_t callback);
-        uint32_t Serial() const
-        {
-            return serial_;
-        }
-    private:
-        FrameCallback(struct wl_client *client, uint32_t version, uint32_t callback);
-        ~FrameCallback() noexcept override;
-        uint32_t serial_;
-    };
-
     struct wl_resource *parent_ = nullptr;
     std::list<SurfaceCommitCallback> commitCallbacks_;
     std::list<SurfaceAttachCallback> attachCallbacks_;
diff --git a/wayland_adapter/framework/stable/wayland_xdg_surface.cpp b/wayland_adapter/framework/stable/wayland_xdg_surface.cpp
index 793a318..fd3a5a4 100644
--- a/wayland_adapter/framework/stable/wayland_xdg_surface.cpp
+++ b/wayland_adapter/framework/stable/wayland_xdg_surface.cpp
@@ -94,7 +94,7 @@ void WaylandXdgSurface::GetToplevel(uint32_t id)
         return;
     }
 
-    role_ = XdgSurfaceRole::TOPLEVEL;
+    role_ = WaylandSurfaceRole::XDG_TOPLEVEL;
 }
 
 void WaylandXdgSurface::GetPopup(uint32_t id, struct wl_resource *parent, struct wl_resource *positioner)
@@ -112,7 +112,7 @@ void WaylandXdgSurface::AckConfigure(uint32_t serial)
 void WaylandXdgSurface::OnSurfaceCommit()
 {
     switch (role_) {
-        case XdgSurfaceRole::TOPLEVEL: {
+        case WaylandSurfaceRole::XDG_TOPLEVEL: {
             auto topLevel = toplevel_.promote();
             if (topLevel != nullptr) {
                 topLevel->HandleCommit();
@@ -129,7 +129,7 @@ void WaylandXdgSurface::OnSurfaceCommit()
 void WaylandXdgSurface::OnSurfaceAttach(struct wl_shm_buffer *shm)
 {
     switch (role_) {
-        case XdgSurfaceRole::TOPLEVEL: {
+        case WaylandSurfaceRole::XDG_TOPLEVEL: {
             auto topLevel = toplevel_.promote();
             if (topLevel != nullptr) {
                 topLevel->HandleAttach(shm);
diff --git a/wayland_adapter/framework/stable/wayland_xdg_surface.h b/wayland_adapter/framework/stable/wayland_xdg_surface.h
index f048731..b13d211 100644
--- a/wayland_adapter/framework/stable/wayland_xdg_surface.h
+++ b/wayland_adapter/framework/stable/wayland_xdg_surface.h
@@ -18,7 +18,7 @@
 #include <xdg-shell-server-protocol.h>
 #include "wayland_resource_object.h"
 #include "wayland_surface.h"
-#include "xdg_surface_utils.h"
+#include "wayalnd_utils.h"
 
 namespace FT {
 namespace Wayland {
@@ -51,7 +51,7 @@ private:
     void OnSurfaceCommit();
     void OnSurfaceAttach(struct wl_shm_buffer *shm);
 
-    XdgSurfaceRole role_ = XdgSurfaceRole::NONE;
+    WaylandSurfaceRole role_ = WaylandSurfaceRole::NONE;
     OHOS::wptr<WaylandXdgWmObject> xdgWm_;
     OHOS::wptr<WaylandSurface> surface_;
     OHOS::wptr<WaylandXdgToplevel> toplevel_;
diff --git a/wayland_adapter/utils/include/xdg_surface_utils.h b/wayland_adapter/utils/include/wayalnd_utils.h
similarity index 61%
rename from wayland_adapter/utils/include/xdg_surface_utils.h
rename to wayland_adapter/utils/include/wayalnd_utils.h
index 85f23bf..4b1cf95 100644
--- a/wayland_adapter/utils/include/xdg_surface_utils.h
+++ b/wayland_adapter/utils/include/wayalnd_utils.h
@@ -22,6 +22,9 @@
 
 namespace FT {
 namespace Wayland {
+using SurfaceCommitCallback = std::function<void()>;
+using SurfaceAttachCallback = std::function<void(struct wl_shm_buffer *shm)>;
+
 static constexpr uint32_t DEFAULT_WIDTH = 500;
 static constexpr uint32_t DEFAULT_HEIGHT = 500;
 struct XdgSurfaceState {
@@ -31,10 +34,27 @@ struct XdgSurfaceState {
     std::string appId;
 };
 
-enum class XdgSurfaceRole : uint32_t {
+enum class WaylandSurfaceRole : uint32_t {
     NONE = 0,
-    TOPLEVEL,
-    POPUP
+    XDG_TOPLEVEL,
+    XDG_POPUP
+};
+
+class FrameCallback final : public WaylandResourceObject {
+public:
+    static OHOS::sptr<FrameCallback> Create(struct wl_client *client, uint32_t version, uint32_t callback)
+    {
+        return OHOS::sptr<FrameCallback>(new FrameCallback(client, version, callback));
+    }
+    uint32_t Serial() const
+    {
+        return serial_;
+    }
+private:
+    FrameCallback(struct wl_client *client, uint32_t version, uint32_t callback)
+        : WaylandResourceObject(client, &wl_callback_interface, version, callback, nullptr), serial_(callback) {}
+    ~FrameCallback() noexcept override {}
+    uint32_t serial_;
 };
 
 static SkColorType ShmFormatToSkia(const uint32_t& shmFormat)
-- 
Gitee


From 91006896dced9024e31c85e321f0b3913922c330 Mon Sep 17 00:00:00 2001
From: abc12133 <jinguoen@huawei.com>
Date: Thu, 7 Sep 2023 19:48:49 +0800
Subject: [PATCH 2/3] double buffered

Signed-off-by: abc12133 <jinguoen@huawei.com>
---
 wayland_adapter/framework/BUILD.gn            |   1 +
 .../framework/core/wayland_surface.cpp        | 146 ++++++++++++++++--
 .../framework/core/wayland_surface.h          |  23 ++-
 .../framework/stable/wayland_xdg_surface.cpp  |  32 ++--
 .../framework/stable/wayland_xdg_surface.h    |   4 +-
 .../framework/stable/wayland_xdg_toplevel.cpp |  93 +----------
 .../framework/stable/wayland_xdg_toplevel.h   |  17 +-
 wayland_adapter/utils/include/wayalnd_utils.h |  26 ++--
 8 files changed, 189 insertions(+), 153 deletions(-)

diff --git a/wayland_adapter/framework/BUILD.gn b/wayland_adapter/framework/BUILD.gn
index b8feb35..b411736 100644
--- a/wayland_adapter/framework/BUILD.gn
+++ b/wayland_adapter/framework/BUILD.gn
@@ -44,6 +44,7 @@ ft_source_set("wayland_framewok_sources") {
   }
 
   deps = [
+    "$window_manager_path/dm/ft_build:libdm",
     "$window_manager_path/wm/ft_build:libwm",
     "$display_server_root/rosen/modules/render_service_base/ft_build:librender_service_base",
     "$display_server_root/rosen/modules/render_service_client/ft_build:librender_service_client",
diff --git a/wayland_adapter/framework/core/wayland_surface.cpp b/wayland_adapter/framework/core/wayland_surface.cpp
index 6dd95f2..12d56bf 100644
--- a/wayland_adapter/framework/core/wayland_surface.cpp
+++ b/wayland_adapter/framework/core/wayland_surface.cpp
@@ -16,6 +16,8 @@
 #include "wayland_surface.h"
 
 #include "wayland_objects_pool.h"
+#include "ui/rs_surface_extractor.h"
+#include "display_manager.h"
 
 namespace FT {
 namespace Wayland {
@@ -123,27 +125,20 @@ void WaylandSurface::AddCommitCallback(SurfaceCommitCallback callback)
     commitCallbacks_.push_back(std::move(callback));
 }
 
-void WaylandSurface::AddAttachCallback(SurfaceAttachCallback callback)
+void WaylandSurface::AddRectCallback(SurfaceRectCallback callback)
 {
-    attachCallbacks_.push_back(std::move(callback));
+    rectCallbacks_.push_back(std::move(callback));
 }
 
 void WaylandSurface::Attach(struct wl_resource *bufferResource, int32_t x, int32_t y)
 {
-    wl_shm_buffer *shm = wl_shm_buffer_get(bufferResource);
-    if (shm == nullptr) {
-        LOG_ERROR("wl_shm_buffer_get fail");
-        return;
-    }
-
-    wl_shm_buffer_begin_access(shm);
-
-    for (auto &cb : attachCallbacks_) {
-        cb(shm);
+    if (new_.buffer != nullptr) {
+        wl_callback_send_done(new_.buffer, 0);
     }
 
-    wl_shm_buffer_end_access(shm);
-    wl_callback_send_done(bufferResource, 0);
+    new_.buffer = bufferResource;
+    new_.offsetX = x;
+    new_.offsetY = y;
 }
 
 void WaylandSurface::Damage(int32_t x, int32_t y, int32_t width, int32_t height)
@@ -173,6 +168,12 @@ void WaylandSurface::SetInputRegion(struct wl_resource *regionResource)
 
 void WaylandSurface::Commit()
 {
+    if (window_ == nullptr) {
+        CreateWindow();
+    } else {
+        HandleCommit();
+    }
+
     for (auto &cb : commitCallbacks_) {
         cb();
     }
@@ -193,5 +194,122 @@ void WaylandSurface::DamageBuffer(int32_t x, int32_t y, int32_t width, int32_t h
 void WaylandSurface::Offset(int32_t x, int32_t y)
 {
 }
+
+void WaylandSurface::HandleCommit() {
+    if (new_.buffer != nullptr) {
+        wl_shm_buffer *shm = wl_shm_buffer_get(new_.buffer);
+        if (shm == nullptr) {
+            LOG_ERROR("wl_shm_buffer_get fail");
+            wl_callback_send_done(new_.buffer, 0);
+            return;
+        }
+
+        wl_shm_buffer_begin_access(shm);
+        CopyBuffer(shm);
+        wl_shm_buffer_end_access(shm);
+
+        wl_callback_send_done(new_.buffer, 0);
+        new_.buffer = nullptr;
+    }
+
+    old_ = new_;
+}
+
+void WaylandSurface::CreateWindow()
+{
+    OHOS::sptr<OHOS::Rosen::WindowOption> option(new OHOS::Rosen::WindowOption());
+    if (rect_.width == 0 || rect_.height == 0) {
+        InitWindowRect();
+    }
+    option->SetWindowRect({rect_.x, rect_.y, rect_.width, rect_.height});
+    option->SetWindowType(OHOS::Rosen::WindowType::APP_MAIN_WINDOW_BASE);
+    option->SetWindowMode(OHOS::Rosen::WindowMode::WINDOW_MODE_FLOATING);
+
+    static int count = 0;
+    std::string windowName = "WaylandWindow" + std::to_string(count++);
+    window_ = OHOS::Rosen::Window::Create(windowName, option);
+    if (window_ == nullptr) {
+        LOG_ERROR("Window::Create failed");
+        return;
+    }
+    window_->Show();
+
+    surfaceNode_ = window_->GetSurfaceNode();
+    if (surfaceNode_ == nullptr) {
+        LOG_ERROR("GetSurfaceNode failed");
+        return;
+    }
+
+    rsSurface_ = OHOS::Rosen::RSSurfaceExtractor::ExtractRSSurface(surfaceNode_);
+    if (rsSurface_ == nullptr) {
+        LOG_ERROR("ExtractRSSurface failed");
+        return;
+    }
+
+#ifdef ENABLE_GPU
+    renderContext_ = std::make_unique<OHOS::Rosen::RenderContext>();
+    renderContext_->InitializeEglContext();
+    rsSurface_->SetRenderContext(renderContext_.get());
+#endif
+}
+
+void WaylandSurface::CopyBuffer(struct wl_shm_buffer *shm)
+{
+    if (rsSurface_ == nullptr) {
+        LOG_ERROR("rsSurface_ is nullptr");
+        return;
+    }
+
+    SkColorType format = ShmFormatToSkia(wl_shm_buffer_get_format(shm));
+    if (format == SkColorType::kUnknown_SkColorType) {
+        LOG_ERROR("unsupported format %{public}d", wl_shm_buffer_get_format(shm));
+        return;
+    }
+
+    int32_t stride = wl_shm_buffer_get_stride(shm);
+    int32_t width = wl_shm_buffer_get_width(shm);
+    int32_t height = wl_shm_buffer_get_height(shm);
+    if (stride <= 0 || width <= 0 || height <= 0) {
+        LOG_ERROR("invalid, stride:%{public}d width:%{public}d height:%{public}d", stride, width, height);
+        return;
+    }
+
+    void *data = wl_shm_buffer_get_data(shm);
+    if (data == nullptr) {
+        LOG_ERROR("wl_shm_buffer_get_data fail");
+        return;
+    }
+
+    auto framePtr = rsSurface_->RequestFrame(width, height);
+    if (framePtr == nullptr) {
+        LOG_ERROR("RequestFrame failed");
+        return;
+    }
+
+    auto canvas = framePtr->GetCanvas();
+    if (canvas == nullptr) {
+        LOG_ERROR("GetCanvas failed");
+        return;
+    }
+    canvas->clear(SK_ColorTRANSPARENT);
+
+    SkImageInfo imageInfo = SkImageInfo::Make(width, height, format, kUnpremul_SkAlphaType);
+    SkPixmap srcPixmap(imageInfo, data, stride);
+    SkBitmap srcBitmap;
+    srcBitmap.installPixels(srcPixmap);
+    canvas->drawBitmap(srcBitmap, 0, 0);
+    rsSurface_->FlushFrame(framePtr);
+}
+
+void WaylandSurface::InitWindowRect()
+{
+    auto display = OHOS::Rosen::DisplayManager::GetInstance().GetDefaultDisplay();
+    rect_.width = display->GetWidth();
+    rect_.height = display->GetHeight();
+
+    for (auto &cb : rectCallbacks_) {
+        cb(rect_);
+    }
+}
 } // namespace Wayland
 } // namespace FT
diff --git a/wayland_adapter/framework/core/wayland_surface.h b/wayland_adapter/framework/core/wayland_surface.h
index 41ce16f..e56b03f 100644
--- a/wayland_adapter/framework/core/wayland_surface.h
+++ b/wayland_adapter/framework/core/wayland_surface.h
@@ -16,11 +16,14 @@
 #pragma once
 
 #include <list>
-
 #include <wayland-server-protocol.h>
 #include "wayland_resource_object.h"
 #include "wayalnd_utils.h"
 
+#include "window.h"
+#include "ui/rs_surface_node.h"
+#include "render_context/render_context.h"
+
 namespace FT {
 namespace Wayland {
 struct IWaylandSurface {
@@ -51,7 +54,7 @@ public:
     ~WaylandSurface() noexcept override;
 
     void AddCommitCallback(SurfaceCommitCallback callback);
-    void AddAttachCallback(SurfaceAttachCallback callback);
+    void AddRectCallback(SurfaceRectCallback callback);
 
 private:
     WaylandSurface(struct wl_client *client, struct wl_resource *parent, uint32_t version, uint32_t id);
@@ -66,10 +69,24 @@ private:
     void SetBufferScale(int32_t scale);
     void DamageBuffer(int32_t x, int32_t y, int32_t width, int32_t height);
     void Offset(int32_t x, int32_t y);
+    void HandleCommit();
+    void CreateWindow();
+    void CopyBuffer(struct wl_shm_buffer *shm);
+    void InitWindowRect();
 
     struct wl_resource *parent_ = nullptr;
     std::list<SurfaceCommitCallback> commitCallbacks_;
-    std::list<SurfaceAttachCallback> attachCallbacks_;
+    std::list<SurfaceRectCallback> rectCallbacks_;
+    Rect rect_;
+    SurfaceState old_;
+    SurfaceState new_;
+
+#ifdef ENABLE_GPU
+    std::unique_ptr<OHOS::Rosen::RenderContext> renderContext_;
+#endif
+    OHOS::sptr<OHOS::Rosen::Window> window_;
+    std::shared_ptr<OHOS::Rosen::RSSurfaceNode> surfaceNode_;
+    std::shared_ptr<OHOS::Rosen::RSSurface> rsSurface_;
 };
 } // namespace Wayland
 } // namespace FT
diff --git a/wayland_adapter/framework/stable/wayland_xdg_surface.cpp b/wayland_adapter/framework/stable/wayland_xdg_surface.cpp
index fd3a5a4..873d11e 100644
--- a/wayland_adapter/framework/stable/wayland_xdg_surface.cpp
+++ b/wayland_adapter/framework/stable/wayland_xdg_surface.cpp
@@ -81,7 +81,7 @@ WaylandXdgSurface::WaylandXdgSurface(const OHOS::sptr<WaylandXdgWmObject> &xdgWm
       surface_(surface)
 {
     surface->AddCommitCallback([this]() { OnSurfaceCommit(); });
-    surface->AddAttachCallback([this](struct wl_shm_buffer *shm) { OnSurfaceAttach(shm); });
+    surface->AddRectCallback([this](Rect rect) { OnSurfaceRect(rect); });
 }
 
 WaylandXdgSurface::~WaylandXdgSurface() noexcept {}
@@ -94,7 +94,7 @@ void WaylandXdgSurface::GetToplevel(uint32_t id)
         return;
     }
 
-    role_ = WaylandSurfaceRole::XDG_TOPLEVEL;
+    role_ = SurfaceRole::XDG_TOPLEVEL;
 }
 
 void WaylandXdgSurface::GetPopup(uint32_t id, struct wl_resource *parent, struct wl_resource *positioner)
@@ -111,33 +111,23 @@ void WaylandXdgSurface::AckConfigure(uint32_t serial)
 
 void WaylandXdgSurface::OnSurfaceCommit()
 {
-    switch (role_) {
-        case WaylandSurfaceRole::XDG_TOPLEVEL: {
-            auto topLevel = toplevel_.promote();
-            if (topLevel != nullptr) {
-                topLevel->HandleCommit();
-            }
-            break;
+    if (role_ == SurfaceRole::XDG_TOPLEVEL) {
+        auto topLevel = toplevel_.promote();
+        if (topLevel != nullptr) {
+            topLevel->HandleCommit();
         }
-        default:
-            break;
     }
 
     xdg_surface_send_configure(WlResource(), wl_display_next_serial(WlDisplay()));
 }
 
-void WaylandXdgSurface::OnSurfaceAttach(struct wl_shm_buffer *shm)
+void WaylandXdgSurface::OnSurfaceRect(Rect rect)
 {
-    switch (role_) {
-        case WaylandSurfaceRole::XDG_TOPLEVEL: {
-            auto topLevel = toplevel_.promote();
-            if (topLevel != nullptr) {
-                topLevel->HandleAttach(shm);
-            }
-            break;
+    if (role_ == SurfaceRole::XDG_TOPLEVEL) {
+        auto topLevel = toplevel_.promote();
+        if (topLevel != nullptr) {
+            topLevel->SetRect(rect);
         }
-        default:
-            break;
     }
 }
 } // namespace Wayland
diff --git a/wayland_adapter/framework/stable/wayland_xdg_surface.h b/wayland_adapter/framework/stable/wayland_xdg_surface.h
index b13d211..56d9ad4 100644
--- a/wayland_adapter/framework/stable/wayland_xdg_surface.h
+++ b/wayland_adapter/framework/stable/wayland_xdg_surface.h
@@ -49,9 +49,9 @@ private:
     void SetWindowGeometry(int32_t x, int32_t y, int32_t width, int32_t height);
     void AckConfigure(uint32_t serial);
     void OnSurfaceCommit();
-    void OnSurfaceAttach(struct wl_shm_buffer *shm);
+    void OnSurfaceRect(Rect rect);
 
-    WaylandSurfaceRole role_ = WaylandSurfaceRole::NONE;
+    SurfaceRole role_ = SurfaceRole::NONE;
     OHOS::wptr<WaylandXdgWmObject> xdgWm_;
     OHOS::wptr<WaylandSurface> surface_;
     OHOS::wptr<WaylandXdgToplevel> toplevel_;
diff --git a/wayland_adapter/framework/stable/wayland_xdg_toplevel.cpp b/wayland_adapter/framework/stable/wayland_xdg_toplevel.cpp
index 3c2d5bf..993aa52 100644
--- a/wayland_adapter/framework/stable/wayland_xdg_toplevel.cpp
+++ b/wayland_adapter/framework/stable/wayland_xdg_toplevel.cpp
@@ -16,7 +16,6 @@
 #include "wayland_xdg_toplevel.h"
 
 #include "wayland_objects_pool.h"
-#include "ui/rs_surface_extractor.h"
 
 namespace FT {
 namespace Wayland {
@@ -136,15 +135,10 @@ WaylandXdgToplevel::WaylandXdgToplevel(const OHOS::sptr<WaylandXdgSurface> &xdgS
 
 WaylandXdgToplevel::~WaylandXdgToplevel() noexcept
 {
-    if (window_ != nullptr) {
-        window_->Hide();
-        window_->Destroy();
-    }
 }
 
 void WaylandXdgToplevel::SetTitle(const char *title)
 {
-    pendingState_.title = title;
 }
 
 void WaylandXdgToplevel::Move(uint32_t serial)
@@ -157,7 +151,6 @@ void WaylandXdgToplevel::Resize(uint32_t serial, uint32_t edges)
 
 void WaylandXdgToplevel::SetAppId(const char *appId)
 {
-    pendingState_.appId = appId;
 }
 
 void WaylandXdgToplevel::SetMaxSize(int32_t width, int32_t height)
@@ -192,97 +185,13 @@ void WaylandXdgToplevel::SendConfigure()
 {
     struct wl_array states;
     wl_array_init(&states);
-    xdg_toplevel_send_configure(WlResource(), pendingState_.width, pendingState_.height, &states);
+    xdg_toplevel_send_configure(WlResource(), rect_.width, rect_.height, &states);
     wl_array_release(&states);
 }
 
 void WaylandXdgToplevel::HandleCommit()
 {
-    if (window_ == nullptr) {
-        CreateWindow();
-    }
     SendConfigure();
 }
-
-void WaylandXdgToplevel::HandleAttach(struct wl_shm_buffer *shm)
-{
-    if (rsSurface_ == nullptr) {
-        LOG_ERROR("rsSurface_ is nullptr");
-        return;
-    }
-
-    SkColorType format = ShmFormatToSkia(wl_shm_buffer_get_format(shm));
-    if (format == SkColorType::kUnknown_SkColorType) {
-        LOG_ERROR("unsupported format %{public}d", wl_shm_buffer_get_format(shm));
-        return;
-    }
-
-    int32_t stride = wl_shm_buffer_get_stride(shm);
-    int32_t width = wl_shm_buffer_get_width(shm);
-    int32_t height = wl_shm_buffer_get_height(shm);
-    if (stride <= 0 || width <= 0 || height <= 0) {
-        LOG_ERROR("invalid, stride:%{public}d width:%{public}d height:%{public}d", stride, width, height);
-        return;
-    }
-
-    void *data = wl_shm_buffer_get_data(shm);
-    if (data == nullptr) {
-        LOG_ERROR("wl_shm_buffer_get_data fail");
-        return;
-    }
-
-    auto framePtr = rsSurface_->RequestFrame(width, height);
-    if (framePtr == nullptr) {
-        LOG_ERROR("RequestFrame failed");
-        return;
-    }
-
-    auto canvas = framePtr->GetCanvas();
-    if (canvas == nullptr) {
-        LOG_ERROR("GetCanvas failed");
-        return;
-    }
-    canvas->clear(SK_ColorTRANSPARENT);
-
-    SkImageInfo imageInfo = SkImageInfo::Make(width, height, format, kUnpremul_SkAlphaType);
-    SkPixmap srcPixmap(imageInfo, data, stride);
-    SkBitmap srcBitmap;
-    srcBitmap.installPixels(srcPixmap);
-    canvas->drawBitmap(srcBitmap, 0, 0);
-    rsSurface_->FlushFrame(framePtr);
-}
-
-void WaylandXdgToplevel::CreateWindow()
-{
-    OHOS::sptr<OHOS::Rosen::WindowOption> option(new OHOS::Rosen::WindowOption());
-    option->SetWindowRect({0, 0, pendingState_.width, pendingState_.height});
-    option->SetWindowType(OHOS::Rosen::WindowType::APP_MAIN_WINDOW_BASE);
-    option->SetWindowMode(OHOS::Rosen::WindowMode::WINDOW_MODE_FLOATING);
-
-    window_ = OHOS::Rosen::Window::Create(pendingState_.appId, option);
-    if (window_ == nullptr) {
-        LOG_ERROR("Window::Create failed");
-        return;
-    }
-    window_->Show();
-
-    surfaceNode_ = window_->GetSurfaceNode();
-    if (surfaceNode_ == nullptr) {
-        LOG_ERROR("GetSurfaceNode failed");
-        return;
-    }
-
-    rsSurface_ = OHOS::Rosen::RSSurfaceExtractor::ExtractRSSurface(surfaceNode_);
-    if (rsSurface_ == nullptr) {
-        LOG_ERROR("ExtractRSSurface failed");
-        return;
-    }
-
-#ifdef ENABLE_GPU
-    renderContext_ = std::make_unique<OHOS::Rosen::RenderContext>();
-    renderContext_->InitializeEglContext();
-    rsSurface_->SetRenderContext(renderContext_.get());
-#endif
-}
 } // namespace Wayland
 } // namespace FT
diff --git a/wayland_adapter/framework/stable/wayland_xdg_toplevel.h b/wayland_adapter/framework/stable/wayland_xdg_toplevel.h
index 02e7b40..fa0f417 100644
--- a/wayland_adapter/framework/stable/wayland_xdg_toplevel.h
+++ b/wayland_adapter/framework/stable/wayland_xdg_toplevel.h
@@ -17,9 +17,6 @@
 
 #include <xdg-shell-server-protocol.h>
 #include "wayland_xdg_surface.h"
-#include "window.h"
-#include "ui/rs_surface_node.h"
-#include "render_context/render_context.h"
 
 namespace FT {
 namespace Wayland {
@@ -61,21 +58,17 @@ public:
     void Resize(uint32_t serial, uint32_t edges);
     void SendConfigure();
     void HandleCommit();
-    void HandleAttach(struct wl_shm_buffer *shm);
+    void SetRect(Rect rect)
+    {
+        rect_ = rect;
+    }
 
 private:
     WaylandXdgToplevel(const OHOS::sptr<WaylandXdgSurface> &xdgSurface, uint32_t id);
-    void CreateWindow();
     friend struct IWaylandXdgToplevel;
 
     OHOS::wptr<WaylandXdgSurface> xdgSurface_;
-    XdgSurfaceState pendingState_;
-#ifdef ENABLE_GPU
-    std::unique_ptr<OHOS::Rosen::RenderContext> renderContext_;
-#endif
-    OHOS::sptr<OHOS::Rosen::Window> window_;
-    std::shared_ptr<OHOS::Rosen::RSSurfaceNode> surfaceNode_;
-    std::shared_ptr<OHOS::Rosen::RSSurface> rsSurface_;
+    Rect rect_;
 };
 } // namespace Wayland
 } // namespace FT
diff --git a/wayland_adapter/utils/include/wayalnd_utils.h b/wayland_adapter/utils/include/wayalnd_utils.h
index 4b1cf95..3f1eb1f 100644
--- a/wayland_adapter/utils/include/wayalnd_utils.h
+++ b/wayland_adapter/utils/include/wayalnd_utils.h
@@ -22,19 +22,27 @@
 
 namespace FT {
 namespace Wayland {
+struct Rect {
+    int32_t x = 0;
+    int32_t y = 0;
+    uint32_t width = 0;
+    uint32_t height = 0;
+};
+
 using SurfaceCommitCallback = std::function<void()>;
-using SurfaceAttachCallback = std::function<void(struct wl_shm_buffer *shm)>;
+using SurfaceRectCallback = std::function<void(Rect)>;
 
-static constexpr uint32_t DEFAULT_WIDTH = 500;
-static constexpr uint32_t DEFAULT_HEIGHT = 500;
-struct XdgSurfaceState {
-    uint32_t width = DEFAULT_WIDTH;
-    uint32_t height = DEFAULT_HEIGHT;
-    std::string title;
-    std::string appId;
+struct SurfaceState {
+    struct wl_resource *buffer = nullptr;
+    Rect damage;
+    wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL;
+    int32_t scale = 0;
+    Rect damageBuffer;
+    int32_t offsetX = 0;
+    int32_t offsetY = 0;
 };
 
-enum class WaylandSurfaceRole : uint32_t {
+enum class SurfaceRole : uint32_t {
     NONE = 0,
     XDG_TOPLEVEL,
     XDG_POPUP
-- 
Gitee


From f6d091148b53c0459f037862b3e34ae596a6dcb8 Mon Sep 17 00:00:00 2001
From: abc12133 <jinguoen@huawei.com>
Date: Thu, 7 Sep 2023 20:08:56 +0800
Subject: [PATCH 3/3] add impl

Signed-off-by: abc12133 <jinguoen@huawei.com>
---
 .../framework/core/wayland_surface.cpp          | 14 +++++++++++++-
 wayland_adapter/utils/include/wayalnd_utils.h   | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/wayland_adapter/framework/core/wayland_surface.cpp b/wayland_adapter/framework/core/wayland_surface.cpp
index 12d56bf..c4a8101 100644
--- a/wayland_adapter/framework/core/wayland_surface.cpp
+++ b/wayland_adapter/framework/core/wayland_surface.cpp
@@ -143,6 +143,10 @@ void WaylandSurface::Attach(struct wl_resource *bufferResource, int32_t x, int32
 
 void WaylandSurface::Damage(int32_t x, int32_t y, int32_t width, int32_t height)
 {
+    new_.damage.x = x;
+    new_.damage.y = y;
+    new_.damage.width = static_cast<uint32_t>(width);
+    new_.damage.height = static_cast<uint32_t>(height);
 }
 
 void WaylandSurface::Frame(uint32_t callback)
@@ -181,18 +185,26 @@ void WaylandSurface::Commit()
 
 void WaylandSurface::SetBufferTransform(int32_t transform)
 {
+    new_.transform = static_cast<wl_output_transform>(transform);
 }
 
 void WaylandSurface::SetBufferScale(int32_t scale)
 {
+    new_.scale = scale;
 }
 
 void WaylandSurface::DamageBuffer(int32_t x, int32_t y, int32_t width, int32_t height)
 {
+    new_.damageBuffer.x = x;
+    new_.damageBuffer.y = y;
+    new_.damageBuffer.width = static_cast<uint32_t>(width);
+    new_.damageBuffer.height = static_cast<uint32_t>(height);
 }
 
 void WaylandSurface::Offset(int32_t x, int32_t y)
 {
+    new_.offsetX = x;
+    new_.offsetY = y;
 }
 
 void WaylandSurface::HandleCommit() {
@@ -209,10 +221,10 @@ void WaylandSurface::HandleCommit() {
         wl_shm_buffer_end_access(shm);
 
         wl_callback_send_done(new_.buffer, 0);
-        new_.buffer = nullptr;
     }
 
     old_ = new_;
+    new_.Reset();
 }
 
 void WaylandSurface::CreateWindow()
diff --git a/wayland_adapter/utils/include/wayalnd_utils.h b/wayland_adapter/utils/include/wayalnd_utils.h
index 3f1eb1f..b84fda5 100644
--- a/wayland_adapter/utils/include/wayalnd_utils.h
+++ b/wayland_adapter/utils/include/wayalnd_utils.h
@@ -27,6 +27,13 @@ struct Rect {
     int32_t y = 0;
     uint32_t width = 0;
     uint32_t height = 0;
+    void Reset()
+    {
+        x = 0;
+        y = 0;
+        width = 0;
+        height = 0;
+    }
 };
 
 using SurfaceCommitCallback = std::function<void()>;
@@ -40,6 +47,16 @@ struct SurfaceState {
     Rect damageBuffer;
     int32_t offsetX = 0;
     int32_t offsetY = 0;
+    void Reset()
+    {
+        buffer = nullptr;
+        damage.Reset();
+        transform = WL_OUTPUT_TRANSFORM_NORMAL;
+        scale = 0;
+        damageBuffer.Reset();
+        offsetX = 0;
+        offsetY = 0;
+    }
 };
 
 enum class SurfaceRole : uint32_t {
-- 
Gitee