From cd6466f01279e8c850ea31ec8abfd190304ca793 Mon Sep 17 00:00:00 2001 From: duanwenhao Date: Mon, 18 Jul 2022 06:45:48 +0000 Subject: [PATCH] =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8DGetPointersIdList?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAGetPointerIds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duanwenhao --- frameworks/napi/input_monitor/src/js_input_monitor.cpp | 8 ++++---- frameworks/proxy/events/src/pointer_event.cpp | 4 ++-- .../proxy/events/test/input_manager_manual_test.cpp | 2 +- interfaces/native/innerkits/event/include/pointer_event.h | 2 +- service/event_dispatch/src/event_dispatch.cpp | 4 ++-- .../event_handler/src/input_event_normalize_handler.cpp | 4 ++-- service/monitor/src/input_handler_manager_global.cpp | 2 +- .../src/touch_transform_point_processor.cpp | 6 +++--- .../src/touchpad_transform_point_processor.cpp | 4 ++-- test/unittest/common/src/event_util_test.cpp | 2 +- util/common/src/input_event_data_transformation.cpp | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp index f455a33cb8..1561f49587 100755 --- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp +++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp @@ -78,7 +78,7 @@ void InputMonitor::OnInputEvent(std::shared_ptr pointerEvent) cons if (JsInputMonMgr.GetMonitor(id_)->GetTypeName() != "touch") { return; } - if (pointerEvent->GetPointersIdList().size() == 1) { + if (pointerEvent->GetPointerIds().size() == 1) { if (pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_DOWN) { consumed_ = false; } @@ -88,7 +88,7 @@ void InputMonitor::OnInputEvent(std::shared_ptr pointerEvent) cons if (JsInputMonMgr.GetMonitor(id_)->GetTypeName() != "mouse") { return; } - if (pointerEvent->GetPointersIdList().size() == 1) { + if (pointerEvent->GetPointerIds().size() == 1) { if (pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_DOWN) { consumed_ = false; } @@ -262,7 +262,7 @@ int32_t JsInputMonitor::TransformPointerEvent(const std::shared_ptr pointerItems; - for (const auto &item : pointerEvent->GetPointersIdList()) { + for (const auto &item : pointerEvent->GetPointerIds()) { PointerEvent::PointerItem pointerItem; if (!pointerEvent->GetPointerItem(item, pointerItem)) { MMI_HILOGE("Get pointer item failed"); @@ -390,7 +390,7 @@ int32_t JsInputMonitor::GetMousePointerItem(const std::shared_ptr } uint32_t index = 0; int32_t currentPointerId = pointerEvent->GetPointerId(); - std::vector pointerIds { pointerEvent->GetPointersIdList() }; + std::vector pointerIds { pointerEvent->GetPointerIds() }; for (const auto& pointerId : pointerIds) { if (pointerId == currentPointerId) { PointerEvent::PointerItem item; diff --git a/frameworks/proxy/events/src/pointer_event.cpp b/frameworks/proxy/events/src/pointer_event.cpp index c5d159f78f..50109d68cc 100755 --- a/frameworks/proxy/events/src/pointer_event.cpp +++ b/frameworks/proxy/events/src/pointer_event.cpp @@ -478,7 +478,7 @@ void PointerEvent::ClearButtonPressed() pressedButtons_.clear(); } -std::vector PointerEvent::GetPointersIdList() const +std::vector PointerEvent::GetPointerIds() const { std::vector pointerIdList; for (auto &item : pointers_) { @@ -877,7 +877,7 @@ bool PointerEvent::IsValid() const std::ostream& operator<<(std::ostream& ostream, PointerEvent& pointerEvent) { const int precision = 2; - std::vector pointerIds { pointerEvent.GetPointersIdList() }; + std::vector pointerIds { pointerEvent.GetPointerIds() }; ostream << "EventType:" << InputEvent::EventTypeToString(pointerEvent.GetEventType()) << ",ActionTime:" << pointerEvent.GetActionTime() << ",Action:" << pointerEvent.GetAction() diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp index 05ebf7972b..e9e3a523be 100755 --- a/frameworks/proxy/events/test/input_manager_manual_test.cpp +++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp @@ -58,7 +58,7 @@ void InputManagerManualTest::AddInputEventFilter() auto callback = [this](std::shared_ptr pointer) -> bool { MMI_HILOGD("Callback enter"); CHKPF(pointer); - const std::vector ids = pointer->GetPointersIdList(); + const std::vector ids = pointer->GetPointerIds(); if (ids.empty()) { MMI_HILOGE("The ids is empty"); return false; diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h index 5bbf1b7115..524f9c6f70 100755 --- a/interfaces/native/innerkits/event/include/pointer_event.h +++ b/interfaces/native/innerkits/event/include/pointer_event.h @@ -841,7 +841,7 @@ public: * @return Returns all the pointer IDs. * @since 9 */ - std::vector GetPointersIdList() const; + std::vector GetPointerIds() const; /** * @brief Obtains the source type of this event. diff --git a/service/event_dispatch/src/event_dispatch.cpp b/service/event_dispatch/src/event_dispatch.cpp index 1c7f6fe4a9..6780a2207f 100755 --- a/service/event_dispatch/src/event_dispatch.cpp +++ b/service/event_dispatch/src/event_dispatch.cpp @@ -82,7 +82,7 @@ void EventDispatch::HandlePointerEvent(std::shared_ptr point) } auto pid = udsServer->GetClientPid(fd); auto pointerEvent = std::make_shared(*point); - auto pointerIdList = pointerEvent->GetPointersIdList(); + auto pointerIdList = pointerEvent->GetPointerIds(); if (pointerIdList.size() > 1) { for (const auto& id : pointerIdList) { PointerEvent::PointerItem pointeritem; @@ -93,7 +93,7 @@ void EventDispatch::HandlePointerEvent(std::shared_ptr point) auto itemPid = WinMgr->GetWindowPid(pointeritem.GetTargetWindowId()); if (itemPid >= 0 && itemPid != pid) { pointerEvent->RemovePointerItem(id); - MMI_HILOGD("pointerIdList size: %{public}zu", pointerEvent->GetPointersIdList().size()); + MMI_HILOGD("pointerIdList size: %{public}zu", pointerEvent->GetPointerIds().size()); } } } diff --git a/service/event_handler/src/input_event_normalize_handler.cpp b/service/event_handler/src/input_event_normalize_handler.cpp index 7239c37c89..daa65c75ac 100755 --- a/service/event_handler/src/input_event_normalize_handler.cpp +++ b/service/event_handler/src/input_event_normalize_handler.cpp @@ -222,7 +222,7 @@ int32_t InputEventNormalizeHandler::HandleTouchPadEvent(libinput_event* event) if (type == LIBINPUT_EVENT_TOUCHPAD_UP) { pointerEvent->RemovePointerItem(pointerEvent->GetPointerId()); MMI_HILOGD("This touch pad event is up remove this finger"); - if (pointerEvent->GetPointersIdList().empty()) { + if (pointerEvent->GetPointerIds().empty()) { MMI_HILOGD("This touch pad event is final finger up remove this finger"); pointerEvent->Reset(); } @@ -285,7 +285,7 @@ int32_t InputEventNormalizeHandler::HandleTouchEvent(libinput_event* event) if (type == LIBINPUT_EVENT_TOUCH_UP) { pointerEvent->RemovePointerItem(pointerEvent->GetPointerId()); MMI_HILOGD("This touch event is up remove this finger"); - if (pointerEvent->GetPointersIdList().empty()) { + if (pointerEvent->GetPointerIds().empty()) { MMI_HILOGD("This touch event is final finger up remove this finger"); pointerEvent->Reset(); } diff --git a/service/monitor/src/input_handler_manager_global.cpp b/service/monitor/src/input_handler_manager_global.cpp index 48d5490cb2..1c7ec2ec65 100755 --- a/service/monitor/src/input_handler_manager_global.cpp +++ b/service/monitor/src/input_handler_manager_global.cpp @@ -295,7 +295,7 @@ void InputHandlerManagerGlobal::MonitorCollection::UpdateConsumptionState(std::s } lastPointerEvent_ = pointerEvent; - if (pointerEvent->GetPointersIdList().size() != 1) { + if (pointerEvent->GetPointerIds().size() != 1) { MMI_HILOGD("First press down and last press up intermediate process"); return; } diff --git a/service/touch_transform_point/src/touch_transform_point_processor.cpp b/service/touch_transform_point/src/touch_transform_point_processor.cpp index e3cb73e891..e72d1fb8e0 100755 --- a/service/touch_transform_point/src/touch_transform_point_processor.cpp +++ b/service/touch_transform_point/src/touch_transform_point_processor.cpp @@ -58,7 +58,7 @@ bool TouchTransformPointProcessor::OnEventTouchDown(struct libinput_event *event MMI_HILOGE("TouchDownPointToDisplayPoint failed"); return false; } - auto pointIds = pointerEvent_->GetPointersIdList(); + auto pointIds = pointerEvent_->GetPointerIds(); int64_t time = GetSysClockTime(); if (pointIds.empty()) { pointerEvent_->SetActionStartTime(time); @@ -90,7 +90,7 @@ bool TouchTransformPointProcessor::OnEventTouchDown(struct libinput_event *event pointerEvent_->SetDeviceId(deviceId_); pointerEvent_->AddPointerItem(item); pointerEvent_->SetPointerId(seatSlot); - PrintEventData(pointerEvent_, pointerEvent_->GetPointerAction(), pointerEvent_->GetPointersIdList().size()); + PrintEventData(pointerEvent_, pointerEvent_->GetPointerAction(), pointerEvent_->GetPointerIds().size()); return true; } @@ -129,7 +129,7 @@ bool TouchTransformPointProcessor::OnEventTouchMotion(struct libinput_event *eve item.SetToolHeight(touchInfo.toolRect.height); pointerEvent_->UpdatePointerItem(seatSlot, item); pointerEvent_->SetPointerId(seatSlot); - PrintEventData(pointerEvent_, pointerEvent_->GetPointerAction(), pointerEvent_->GetPointersIdList().size()); + PrintEventData(pointerEvent_, pointerEvent_->GetPointerAction(), pointerEvent_->GetPointerIds().size()); return true; } diff --git a/service/touch_transform_point/src/touchpad_transform_point_processor.cpp b/service/touch_transform_point/src/touchpad_transform_point_processor.cpp index 116bbd4cd8..219dde0c73 100755 --- a/service/touch_transform_point/src/touchpad_transform_point_processor.cpp +++ b/service/touch_transform_point/src/touchpad_transform_point_processor.cpp @@ -57,7 +57,7 @@ void TouchPadTransformPointProcessor::OnEventTouchPadDown(struct libinput_event CHKPV(device); int64_t time = GetSysClockTime(); - auto pointIds = pointerEvent_->GetPointersIdList(); + auto pointIds = pointerEvent_->GetPointerIds(); if (pointIds.empty()) { pointerEvent_->SetActionStartTime(time); } @@ -185,7 +185,7 @@ std::shared_ptr TouchPadTransformPointProcessor::OnLibinputTouchPa pointerEvent_->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHPAD); pointerEvent_->UpdateId(); MMI_HILOGD("Pointer event dispatcher of server:"); - PrintEventData(pointerEvent_, pointerEvent_->GetPointerAction(), pointerEvent_->GetPointersIdList().size()); + PrintEventData(pointerEvent_, pointerEvent_->GetPointerAction(), pointerEvent_->GetPointerIds().size()); return pointerEvent_; } diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp index af4b53f560..2372296343 100755 --- a/test/unittest/common/src/event_util_test.cpp +++ b/test/unittest/common/src/event_util_test.cpp @@ -119,7 +119,7 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr& p { const int precision = 2; std::ostringstream ostream; - std::vector pointerIds { pointerEvent->GetPointersIdList() }; + std::vector pointerIds { pointerEvent->GetPointerIds() }; ostream << "ClientMsgHandler: in OnPointerEvent" << ",EventType:" << pointerEvent->GetEventType() << ",ActionTime:" << pointerEvent->GetActionTime() diff --git a/util/common/src/input_event_data_transformation.cpp b/util/common/src/input_event_data_transformation.cpp index 2ac286e92d..349c1fba7d 100755 --- a/util/common/src/input_event_data_transformation.cpp +++ b/util/common/src/input_event_data_transformation.cpp @@ -164,7 +164,7 @@ int32_t InputEventDataTransformation::Marshalling(std::shared_ptr pkt << btnId; } - std::vector pointerIds { event->GetPointersIdList() }; + std::vector pointerIds { event->GetPointerIds() }; pkt << pointerIds.size(); for (const auto &pointerId : pointerIds) { PointerEvent::PointerItem item; -- Gitee