diff --git a/services/screenclient/include/screen_client_window_adapter.h b/services/screenclient/include/screen_client_window_adapter.h index 9b68277ed8a6c96b688e9e2ac65366fc71f7fe45..5b90b54d3a9c01018e5fe76e1b5a8cbf45761584 100644 --- a/services/screenclient/include/screen_client_window_adapter.h +++ b/services/screenclient/include/screen_client_window_adapter.h @@ -22,7 +22,9 @@ #include #include -#include "i_input_event_consumer.h" +#include "axis_event.h" +#include "key_event.h" +#include "pointer_event.h" #include "single_instance.h" #include "surface.h" #include "window.h" @@ -47,12 +49,13 @@ private: std::mutex windowIdMapMutex_; }; -class ScreenClientInputEventListener : public MMI::IInputEventConsumer { +class ScreenClientInputEventListener : public Rosen::IInputEventConsumer { public: ScreenClientInputEventListener() = default; - void OnInputEvent(std::shared_ptr pointerEvent) const override; - void OnInputEvent(std::shared_ptr keyEvent) const override; - void OnInputEvent(std::shared_ptr axisEvent) const override; + ~ScreenClientInputEventListener() override = default; + bool OnInputEvent(const std::shared_ptr& pointerEvent) const override; + bool OnInputEvent(const std::shared_ptr& keyEvent) const override; + bool OnInputEvent(const std::shared_ptr& axisEvent) const override; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/screenclient/src/screen_client_window_adapter.cpp b/services/screenclient/src/screen_client_window_adapter.cpp index d306a95c9086af0d27a617d68803889a9c254ab4..4dec7ed121991660975799885fa18e0cd91aafb0 100644 --- a/services/screenclient/src/screen_client_window_adapter.cpp +++ b/services/screenclient/src/screen_client_window_adapter.cpp @@ -74,9 +74,9 @@ sptr ScreenClientWindowAdapter::CreateWindow(std::shared_ptrFlushImplicitTransaction(); - std::shared_ptr listener = + std::shared_ptr listener = std::make_shared(ScreenClientInputEventListener()); - window->AddInputEventListener(listener); + window->SetInputEventConsumer(listener); DHLOGD("Create window name is %s.", windowName.c_str()); if (OHOS::Rosen::WMError::WM_OK != window->Resize(windowProperty->width, windowProperty->height)) { window->Destroy(); @@ -197,22 +197,25 @@ int32_t ScreenClientWindowAdapter::RemoveWindow(int32_t windowId) return DH_SUCCESS; } -void ScreenClientInputEventListener::OnInputEvent(std::shared_ptr pointerEvent) const +bool ScreenClientInputEventListener::OnInputEvent(const std::shared_ptr& pointerEvent) const { DHLOGI("onInputEvent, pointerEvent"); pointerEvent->MarkProcessed(); + return true; } -void ScreenClientInputEventListener::OnInputEvent(std::shared_ptr keyEvent) const +bool ScreenClientInputEventListener::OnInputEvent(const std::shared_ptr& keyEvent) const { DHLOGI("onInputEvent, keyEvent"); keyEvent->MarkProcessed(); + return true; } -void ScreenClientInputEventListener::OnInputEvent(std::shared_ptr axisEvent) const +bool ScreenClientInputEventListener::OnInputEvent(const std::shared_ptr& axisEvent) const { DHLOGI("onInputEvent, axisEvent"); axisEvent->MarkProcessed(); + return true; } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file