From 89addfb1c865f7a4ac23655043ed5388ad1ccf4f Mon Sep 17 00:00:00 2001 From: jiangwenyu Date: Wed, 13 Sep 2023 03:41:48 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B7=E5=B1=8F=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiangwenyu --- wayland_adapter/framework/core/wayland_pointer.cpp | 2 -- wayland_adapter/framework/core/wayland_seat.cpp | 2 +- wayland_adapter/utils/src/wayland_resource_object.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wayland_adapter/framework/core/wayland_pointer.cpp b/wayland_adapter/framework/core/wayland_pointer.cpp index 85dcea3..dd7b792 100644 --- a/wayland_adapter/framework/core/wayland_pointer.cpp +++ b/wayland_adapter/framework/core/wayland_pointer.cpp @@ -83,7 +83,6 @@ void WaylandPointer::OnPointerMotionAbsolute(uint32_t time, int32_t posX, int32_ void WaylandPointer::OnPointerLeave(struct wl_resource *surface_resource) { - LOG_WARN("WaylandPointer::OnPointerLeave in"); wl_display *display = WlDisplay(); if (display == nullptr) { return; @@ -97,7 +96,6 @@ void WaylandPointer::OnPointerLeave(struct wl_resource *surface_resource) } void WaylandPointer::OnPointerEnter(int32_t posX, int32_t posY, struct wl_resource *surface_resource) { - LOG_WARN("WaylandPointer::OnPointerEnter in"); wl_fixed_t posFixedX = wl_fixed_from_int(posX); wl_fixed_t posFixedY = wl_fixed_from_int(posY); wl_resource *pointer = WlResource(); diff --git a/wayland_adapter/framework/core/wayland_seat.cpp b/wayland_adapter/framework/core/wayland_seat.cpp index 67d3cd5..f034b4c 100644 --- a/wayland_adapter/framework/core/wayland_seat.cpp +++ b/wayland_adapter/framework/core/wayland_seat.cpp @@ -121,7 +121,7 @@ OHOS::sptr WaylandSeat::GetPointerResource(struct wl_client *cli seatResourcesMap_.erase(client); return nullptr; } - LOG_INFO("get seatResource name=%{public}s, id=%{public}d", seatResource->Name().c_str(), seatResource->Id()); + return seatResource->GetChildPointer(); } diff --git a/wayland_adapter/utils/src/wayland_resource_object.cpp b/wayland_adapter/utils/src/wayland_resource_object.cpp index bf1e73f..7810de3 100644 --- a/wayland_adapter/utils/src/wayland_resource_object.cpp +++ b/wayland_adapter/utils/src/wayland_resource_object.cpp @@ -41,7 +41,7 @@ WaylandResourceObject::WaylandResourceObject(struct wl_client *client, const str id_ = wl_resource_get_id(resource_); wl_resource_set_implementation(resource_, implementation_, this, &WaylandResourceObject::OnDestroy); name_ = std::string(interface_->name) + "_" + std::to_string(version_) + "_" + std::to_string(id_); - LOG_INFO("create WaylandResourceObject, name=%{public}s, id=%{public}d", name_.c_str(), id_); + LOG_DEBUG("create WaylandResourceObject, name=%{public}s, id=%{public}d", name_.c_str(), id_); } WaylandResourceObject::~WaylandResourceObject() noexcept -- Gitee