From f283341aac1eb968c4a67a292cfa2fbe54a07cc8 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 18 Apr 2023 06:45:08 +0000 Subject: [PATCH 1/7] mod intercept Signed-off-by: mayunteng_1 Change-Id: Id675a79669bc10baa06927bacda25701f098a2a9 --- .../include/input_handler_manager.h | 2 +- .../src/input_handler_manager.cpp | 177 +++++++++++------- .../src/event_interceptor_handler.cpp | 8 + 3 files changed, 119 insertions(+), 68 deletions(-) diff --git a/frameworks/proxy/event_handler/include/input_handler_manager.h b/frameworks/proxy/event_handler/include/input_handler_manager.h index e97ac584f7..7dda770792 100644 --- a/frameworks/proxy/event_handler/include/input_handler_manager.h +++ b/frameworks/proxy/event_handler/include/input_handler_manager.h @@ -84,7 +84,7 @@ private: private: std::list interHandlers_; - std::map inputHandlers_; + std::map monitorHandlers_; std::map processedEvents_; std::set mouseEventIds_; std::function monitorCallback_ { nullptr }; diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp index 467aabea1d..853d45dbfe 100644 --- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp +++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp @@ -44,8 +44,16 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::share { CALL_INFO_TRACE; CHKPR(consumer, INVALID_HANDLER_ID); + eventType = HANDLE_EVENT_TYPE_NONE; + if ((deviceTags & CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD)) != 0) { + eventType |= HANDLE_EVENT_TYPE_KEY; + } + if ((deviceTags & (CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX) - + CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD))) != 0 ){ + eventType |= HANDLE_EVENT_TYPE_POINTER; + } std::lock_guard guard(mtxHandlers_); - if (inputHandlers_.size() >= MAX_N_INPUT_HANDLERS) { + if ((monitorHandlers_.size() + interHandlers_.size()) >= MAX_N_INPUT_HANDLERS){ MMI_HILOGE("The number of handlers exceeds the maximum"); return ERROR_EXCEED_MAX_COUNT; } @@ -54,17 +62,20 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::share MMI_HILOGE("Exceeded limit of 32-bit maximum number of integers"); return INVALID_HANDLER_ID; } - if (eventType == HANDLE_EVENT_TYPE_NONE) { MMI_HILOGE("Invalid event type"); return INVALID_HANDLER_ID; } const HandleEventType currentType = GetEventType(); - MMI_HILOGD("Register new handler:%{public}d", handlerId); + MMI_HILOGD("Register new handler:%{public}d, currentType:%{public}d, deviceTags:%{public}d", + handlerId, currentType, deviceTags); if (RET_OK == AddLocal(handlerId, handlerType, eventType, priority, deviceTags, consumer)) { MMI_HILOGD("New handler successfully registered, report to server"); const HandleEventType newType = GetEventType(); if (currentType != newType) { + deviceTags = GetDeviceTags(); + MMI_HILOGD("handlerType:%{public}d, newType:%{public}d, deviceTags:%{public}d, priority %{public}d", + handlerType, newType, deviceTags, priority); int32_t ret = AddToServer(handlerType, newType, priority, deviceTags); if (ret != RET_OK) { MMI_HILOGD("Handler:%{public}d permissions failed, remove the monitor", handlerId); @@ -106,10 +117,12 @@ int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handle .deviceTags_ = deviceTags, .consumer_ = monitor, }; - auto ret = inputHandlers_.emplace(handler.handlerId_, handler); - if (!ret.second) { - MMI_HILOGE("Duplicate handler:%{public}d", handler.handlerId_); - return RET_ERR; + if (handlerType == InputHandlerType::MONITOR) { + auto ret = monitorHandlers_.emplace(handler.handlerId_, handler); + if (!ret.second) { + MMI_HILOGE("Duplicate handler:%{public}d", handler.handlerId_); + return RET_ERR; + } } if (handlerType == InputHandlerType::INTERCEPTOR) { auto iterIndex = interHandlers_.begin(); @@ -139,17 +152,19 @@ int32_t InputHandlerManager::AddToServer(InputHandlerType handlerType, HandleEve int32_t InputHandlerManager::RemoveLocal(int32_t handlerId, InputHandlerType handlerType) { - auto tItr = inputHandlers_.find(handlerId); - if (tItr == inputHandlers_.end()) { - MMI_HILOGE("No handler with specified"); - return RET_ERR; - } - if (handlerType != tItr->second.handlerType_) { - MMI_HILOGE("Unmatched handler type, InputHandlerType:%{public}d,FindHandlerType:%{public}d", - handlerType, tItr->second.handlerType_); - return RET_ERR; + if (handlerType == InputHandlerType::MONITOR) { + auto tItr = monitorHandlers_.find(handlerId); + if (tItr == monitorHandlers_.end()) { + MMI_HILOGE("No handler with specified"); + return RET_ERR; + } + if (handlerType != tItr->second.handlerType_) { + MMI_HILOGE("Unmatched handler type, InputHandlerType:%{public}d,FindHandlerType:%{public}d", + handlerType, tItr->second.handlerType_); + return RET_ERR; + } + monitorHandlers_.erase(tItr); } - inputHandlers_.erase(tItr); if (handlerType == InputHandlerType::INTERCEPTOR) { for (auto it = interHandlers_.begin(); it != interHandlers_.end(); ++it) { @@ -182,9 +197,18 @@ int32_t InputHandlerManager::GetNextId() std::shared_ptr InputHandlerManager::FindHandler(int32_t handlerId) { - auto tItr = inputHandlers_.find(handlerId); - if (tItr != inputHandlers_.end()) { - return tItr->second.consumer_; + if (GetHandlerType() == InputHandlerType::MONITOR) { + auto tItr = monitorHandlers_.find(handlerId); + if (tItr != monitorHandlers_.end()) { + return tItr->second.consumer_; + } + } + if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { + for (const auto& item : interHandlers_) { + if (item.handlerId_ == handlerId) { + return item.consumer_; + } + } } return nullptr; } @@ -196,29 +220,29 @@ void InputHandlerManager::OnInputEvent(std::shared_ptr keyEvent, uint3 CHKPV(keyEvent); std::lock_guard guard(mtxHandlers_); BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::TRACE_STOP, BytraceAdapter::KEY_INTERCEPT_EVENT); - if (!interHandlers_.empty()) { - for (const auto &item : interHandlers_) { - if ((item.deviceTags_ != deviceTags) && - ((item.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY)) { + if (GetHandlerType() == InputHandlerType::MONITOR) { + for (const auto &item : monitorHandlers_) { + if ((item.second.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY) { continue; } - int32_t handlerId = item.handlerId_; - auto consumer = item.consumer_; + int32_t handlerId = item.first; + auto consumer = item.second.consumer_; CHKPV(consumer); consumer->OnInputEvent(keyEvent); MMI_HILOGD("Key event id:%{public}d keyCode:%{public}d", handlerId, keyEvent->GetKeyCode()); - break; } - } else { - for (const auto &item : inputHandlers_) { - if ((item.second.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY) { + } + if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { + for (const auto &item : interHandlers_) { + if ((item.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY) { continue; } - int32_t handlerId = item.first; - auto consumer = item.second.consumer_; + int32_t handlerId = item.handlerId_; + auto consumer = item.consumer_; CHKPV(consumer); consumer->OnInputEvent(keyEvent); MMI_HILOGD("Key event id:%{public}d keyCode:%{public}d", handlerId, keyEvent->GetKeyCode()); + break; } } } @@ -230,14 +254,13 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr pointer { std::lock_guard guard(mtxHandlers_); int32_t consumerCount = 0; - if (!interHandlers_.empty()) { - for (const auto &item : interHandlers_) { - if ((item.deviceTags_ != deviceTags) && - ((item.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER)) { + if (GetHandlerType() == InputHandlerType::MONITOR) { + for (const auto &item : monitorHandlers_) { + if ((item.second.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER) { continue; } - int32_t handlerId = item.handlerId_; - auto consumer = item.consumer_; + int32_t handlerId = item.first; + auto consumer = item.second.consumer_; CHKPV(consumer); auto ret = consumerInfos.emplace(handlerId, consumer); if (!ret.second) { @@ -245,15 +268,15 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr pointer continue; } consumerCount++; - break; } - } else { - for (const auto &item : inputHandlers_) { - if ((item.second.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER) { + } + if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { + for (const auto &item : interHandlers_) { + if ((item.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER) { continue; } - int32_t handlerId = item.first; - auto consumer = item.second.consumer_; + int32_t handlerId = item.handlerId_; + auto consumer = item.consumer_; CHKPV(consumer); auto ret = consumerInfos.emplace(handlerId, consumer); if (!ret.second) { @@ -261,6 +284,7 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr pointer continue; } consumerCount++; + break; } } @@ -314,49 +338,68 @@ void InputHandlerManager::OnConnected() bool InputHandlerManager::HasHandler(int32_t handlerId) { std::lock_guard guard(mtxHandlers_); - auto iter = inputHandlers_.find(handlerId); - return (iter != inputHandlers_.end()); + if (GetHandlerType() == InputHandlerType::MONITOR) { + auto iter = monitorHandlers_.find(handlerId); + return (iter != monitorHandlers_.end()); + } + if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { + for (const auto& item : interHandlers_) { + if (item.handlerId_ == handlerId) { + return true; + } + } + } + return false; } HandleEventType InputHandlerManager::GetEventType() const { - if (inputHandlers_.empty()) { - MMI_HILOGD("InputHandlers is empty"); - return HANDLE_EVENT_TYPE_NONE; - } - HandleEventType eventType { HANDLE_EVENT_TYPE_NONE }; - if (!interHandlers_.empty()) { - eventType |= interHandlers_.front().eventType_; - } else { - for (const auto &inputHandler : inputHandlers_) { + uint32_t eventType { HANDLE_EVENT_TYPE_NONE }; + if (GetHandlerType() == InputHandlerType::MONITOR) { + if (monitorHandlers_.empty()) { + MMI_HILOGD("InputHandlers is empty"); + return HANDLE_EVENT_TYPE_NONE; + } + for (const auto &inputHandler : monitorHandlers_) { eventType |= inputHandler.second.eventType_; } } + + if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { + if (interHandlers_.empty()) { + MMI_HILOGD("interHandlers_ is empty"); + return HANDLE_EVENT_TYPE_NONE; + } + for (const auto &interHandler : interHandlers_) { + eventType |= interHandler.eventType_; + } + } return eventType; } int32_t InputHandlerManager::GetPriority() const { - if (inputHandlers_.empty()) { - MMI_HILOGD("InputHandlers is empty"); - return DEFUALT_INTERCEPTOR_PRIORITY; - } int32_t priority { DEFUALT_INTERCEPTOR_PRIORITY }; - if (!interHandlers_.empty()) { - priority = interHandlers_.front().priority_; + if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { + if (!interHandlers_.empty()) { + priority = interHandlers_.front().priority_; + } } return priority; } uint32_t InputHandlerManager::GetDeviceTags() const { - if (inputHandlers_.empty()) { - MMI_HILOGD("InputHandlers is empty"); - return DEFUALT_INTERCEPTOR_PRIORITY; + uint32_t deviceTags = 0; + if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { + for (const auto& item : interHandlers_) { + deviceTags |= item.deviceTags_; + } } - uint32_t deviceTags { CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX) }; - if (!interHandlers_.empty()) { - deviceTags = interHandlers_.front().deviceTags_; + if (GetHandlerType() == InputHandlerType::MONITOR) { + for (const auto& item : monitorHandlers_) { + deviceTags |= item.second.deviceTags_; + } } return deviceTags; } diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp index a4946d2219..8023fe88ac 100644 --- a/service/interceptor/src/event_interceptor_handler.cpp +++ b/service/interceptor/src/event_interceptor_handler.cpp @@ -86,6 +86,8 @@ int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType, } InitSessionLostCallback(); SessionHandler interceptor { handlerType, eventType, priority, deviceTags, session }; + MMI_HILOGD("handlerType:%{public}d, eventType:%{public}d, deviceTags:%{public}d, priority: %{public}d", + handlerType, eventType, deviceTags, priority); return interceptors_.AddInterceptor(interceptor); } @@ -96,6 +98,8 @@ void EventInterceptorHandler::RemoveInputHandler(InputHandlerType handlerType, CHKPV(session); if (handlerType == InputHandlerType::INTERCEPTOR) { SessionHandler interceptor { handlerType, eventType, priority, deviceTags, session }; + MMI_HILOGD("handlerType:%{public}d, eventType:%{public}d, deviceTags:%{public}d, priority: %{public}d", + handlerType, eventType, deviceTags, priority); interceptors_.RemoveInterceptor(interceptor); } } @@ -201,6 +205,8 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr CHKPF(inputDevice); uint32_t capKeyboard = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD); for (const auto &interceptor : interceptors_) { + MMI_HILOGD("eventType_:%{public}d, deviceTags:%{public}d", + interceptor.eventType_, interceptor.deviceTags_); if ((capKeyboard & interceptor.deviceTags_) == 0) { MMI_HILOGD("Interceptor cap does not have keyboard"); continue; @@ -240,6 +246,8 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr uint32_t capPointer = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_POINTER); uint32_t capTouch = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_TOUCH); for (const auto &interceptor : interceptors_) { + MMI_HILOGD("eventType_:%{public}d, deviceTags:%{public}d", + interceptor.eventType_, interceptor.deviceTags_); if (((capPointer | capTouch) & interceptor.deviceTags_) == 0) { MMI_HILOGD("Interceptor cap does not have pointer or touch"); continue; -- Gitee From f67564c60f824314ceb41a31fbe6c1c9498aed89 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 18 Apr 2023 07:12:44 +0000 Subject: [PATCH 2/7] mod intercept Signed-off-by: mayunteng_1 Change-Id: I90d8677d7158ac0bd40eeb90c1356dc64fb3b114 --- service/interceptor/src/event_interceptor_handler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp index 8023fe88ac..c3e4c55452 100644 --- a/service/interceptor/src/event_interceptor_handler.cpp +++ b/service/interceptor/src/event_interceptor_handler.cpp @@ -86,8 +86,8 @@ int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType, } InitSessionLostCallback(); SessionHandler interceptor { handlerType, eventType, priority, deviceTags, session }; - MMI_HILOGD("handlerType:%{public}d, eventType:%{public}d, deviceTags:%{public}d, priority: %{public}d", - handlerType, eventType, deviceTags, priority); + MMI_HILOGD("handlerType:%{public}d, eventType:%{public}d, deviceTags:%{public}d, priority:%{public}d", + handlerType, eventType, deviceTags, priority); return interceptors_.AddInterceptor(interceptor); } @@ -98,8 +98,8 @@ void EventInterceptorHandler::RemoveInputHandler(InputHandlerType handlerType, CHKPV(session); if (handlerType == InputHandlerType::INTERCEPTOR) { SessionHandler interceptor { handlerType, eventType, priority, deviceTags, session }; - MMI_HILOGD("handlerType:%{public}d, eventType:%{public}d, deviceTags:%{public}d, priority: %{public}d", - handlerType, eventType, deviceTags, priority); + MMI_HILOGD("handlerType:%{public}d, eventType:%{public}d, deviceTags:%{public}d, priority:%{public}d", + handlerType, eventType, deviceTags, priority); interceptors_.RemoveInterceptor(interceptor); } } @@ -206,7 +206,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr uint32_t capKeyboard = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD); for (const auto &interceptor : interceptors_) { MMI_HILOGD("eventType_:%{public}d, deviceTags:%{public}d", - interceptor.eventType_, interceptor.deviceTags_); + interceptor.eventType_, interceptor.deviceTags_); if ((capKeyboard & interceptor.deviceTags_) == 0) { MMI_HILOGD("Interceptor cap does not have keyboard"); continue; -- Gitee From c2232704e410ab0f6bb8dd51670fd009c7648b70 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 18 Apr 2023 07:16:57 +0000 Subject: [PATCH 3/7] mod intercept Signed-off-by: mayunteng_1 Change-Id: I8b6aa9c73549ceff57d523f9e703924af9c32404 --- frameworks/proxy/event_handler/src/input_handler_manager.cpp | 2 +- service/interceptor/src/event_interceptor_handler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp index 853d45dbfe..a9db0ef8ad 100644 --- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp +++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp @@ -74,7 +74,7 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::share const HandleEventType newType = GetEventType(); if (currentType != newType) { deviceTags = GetDeviceTags(); - MMI_HILOGD("handlerType:%{public}d, newType:%{public}d, deviceTags:%{public}d, priority %{public}d", + MMI_HILOGD("handlerType:%{public}d, newType:%{public}d, deviceTags:%{public}d, priority:%{public}d", handlerType, newType, deviceTags, priority); int32_t ret = AddToServer(handlerType, newType, priority, deviceTags); if (ret != RET_OK) { diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp index c3e4c55452..82464a8ac8 100644 --- a/service/interceptor/src/event_interceptor_handler.cpp +++ b/service/interceptor/src/event_interceptor_handler.cpp @@ -205,7 +205,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr CHKPF(inputDevice); uint32_t capKeyboard = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD); for (const auto &interceptor : interceptors_) { - MMI_HILOGD("eventType_:%{public}d, deviceTags:%{public}d", + MMI_HILOGD("eventType:%{public}d, deviceTags:%{public}d", interceptor.eventType_, interceptor.deviceTags_); if ((capKeyboard & interceptor.deviceTags_) == 0) { MMI_HILOGD("Interceptor cap does not have keyboard"); @@ -246,7 +246,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr uint32_t capPointer = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_POINTER); uint32_t capTouch = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_TOUCH); for (const auto &interceptor : interceptors_) { - MMI_HILOGD("eventType_:%{public}d, deviceTags:%{public}d", + MMI_HILOGD("eventType:%{public}d, deviceTags:%{public}d", interceptor.eventType_, interceptor.deviceTags_); if (((capPointer | capTouch) & interceptor.deviceTags_) == 0) { MMI_HILOGD("Interceptor cap does not have pointer or touch"); -- Gitee From 3e8e71c1ea7a5f419716b9dc19b0f0a42c40dd71 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Tue, 18 Apr 2023 07:25:44 +0000 Subject: [PATCH 4/7] mod intercept Signed-off-by: mayunteng_1 Change-Id: Ie05237031ff1eafc761b63c272c0f9fc4f9a0141 --- frameworks/proxy/event_handler/src/input_handler_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp index a9db0ef8ad..3866fc7c43 100644 --- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp +++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp @@ -357,7 +357,7 @@ HandleEventType InputHandlerManager::GetEventType() const uint32_t eventType { HANDLE_EVENT_TYPE_NONE }; if (GetHandlerType() == InputHandlerType::MONITOR) { if (monitorHandlers_.empty()) { - MMI_HILOGD("InputHandlers is empty"); + MMI_HILOGD("monitorHandlers_ is empty"); return HANDLE_EVENT_TYPE_NONE; } for (const auto &inputHandler : monitorHandlers_) { -- Gitee From 7ecc9164607d9964b87fddd39e49683da00bc742 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 19 Apr 2023 01:08:37 +0000 Subject: [PATCH 5/7] mod intercept Signed-off-by: mayunteng_1 Change-Id: Ie9aaac98af054c0bd817c54d9353bbb35569c3fb --- .../proxy/event_handler/src/input_handler_manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp index 3866fc7c43..07d4fe2986 100644 --- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp +++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp @@ -49,11 +49,11 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::share eventType |= HANDLE_EVENT_TYPE_KEY; } if ((deviceTags & (CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX) - - CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD))) != 0 ){ + CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD))) != 0 ) { eventType |= HANDLE_EVENT_TYPE_POINTER; } std::lock_guard guard(mtxHandlers_); - if ((monitorHandlers_.size() + interHandlers_.size()) >= MAX_N_INPUT_HANDLERS){ + if ((monitorHandlers_.size() + interHandlers_.size()) >= MAX_N_INPUT_HANDLERS) { MMI_HILOGE("The number of handlers exceeds the maximum"); return ERROR_EXCEED_MAX_COUNT; } @@ -73,7 +73,7 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::share MMI_HILOGD("New handler successfully registered, report to server"); const HandleEventType newType = GetEventType(); if (currentType != newType) { - deviceTags = GetDeviceTags(); + deviceTags = GetDeviceTags(); MMI_HILOGD("handlerType:%{public}d, newType:%{public}d, deviceTags:%{public}d, priority:%{public}d", handlerType, newType, deviceTags, priority); int32_t ret = AddToServer(handlerType, newType, priority, deviceTags); -- Gitee From 4891c34fc3e4a56a0740d7018360f1f18852775b Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 19 Apr 2023 08:56:45 +0000 Subject: [PATCH 6/7] mod intercept Signed-off-by: mayunteng_1 Change-Id: I503bbf48c07bc1d49b10f3eb554ff97e0f877124 --- .../event_handler/src/input_handler_manager.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp index 07d4fe2986..d005c651e1 100644 --- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp +++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp @@ -153,17 +153,17 @@ int32_t InputHandlerManager::AddToServer(InputHandlerType handlerType, HandleEve int32_t InputHandlerManager::RemoveLocal(int32_t handlerId, InputHandlerType handlerType) { if (handlerType == InputHandlerType::MONITOR) { - auto tItr = monitorHandlers_.find(handlerId); - if (tItr == monitorHandlers_.end()) { + auto iter = monitorHandlers_.find(handlerId); + if (iter == monitorHandlers_.end()) { MMI_HILOGE("No handler with specified"); return RET_ERR; } - if (handlerType != tItr->second.handlerType_) { + if (handlerType != iter->second.handlerType_) { MMI_HILOGE("Unmatched handler type, InputHandlerType:%{public}d,FindHandlerType:%{public}d", - handlerType, tItr->second.handlerType_); + handlerType, iter->second.handlerType_); return RET_ERR; } - monitorHandlers_.erase(tItr); + monitorHandlers_.erase(iter); } if (handlerType == InputHandlerType::INTERCEPTOR) { @@ -198,9 +198,9 @@ int32_t InputHandlerManager::GetNextId() std::shared_ptr InputHandlerManager::FindHandler(int32_t handlerId) { if (GetHandlerType() == InputHandlerType::MONITOR) { - auto tItr = monitorHandlers_.find(handlerId); - if (tItr != monitorHandlers_.end()) { - return tItr->second.consumer_; + auto iter = monitorHandlers_.find(handlerId); + if (iter != monitorHandlers_.end()) { + return iter->second.consumer_; } } if (GetHandlerType() == InputHandlerType::INTERCEPTOR) { -- Gitee From b1decbb43b3a9b3669ee476ba1516c15dbc5bfa8 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Thu, 20 Apr 2023 00:59:21 +0000 Subject: [PATCH 7/7] mod intercept Signed-off-by: mayunteng_1 Change-Id: I45d28ef921fade448271b9e02849e3a17f4b2a97 --- .../proxy/event_handler/src/input_handler_manager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp index d005c651e1..7e8953b69e 100644 --- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp +++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp @@ -226,7 +226,7 @@ void InputHandlerManager::OnInputEvent(std::shared_ptr keyEvent, uint3 continue; } int32_t handlerId = item.first; - auto consumer = item.second.consumer_; + std::shared_ptr consumer = item.second.consumer_; CHKPV(consumer); consumer->OnInputEvent(keyEvent); MMI_HILOGD("Key event id:%{public}d keyCode:%{public}d", handlerId, keyEvent->GetKeyCode()); @@ -238,7 +238,7 @@ void InputHandlerManager::OnInputEvent(std::shared_ptr keyEvent, uint3 continue; } int32_t handlerId = item.handlerId_; - auto consumer = item.consumer_; + std::shared_ptr consumer = item.consumer_; CHKPV(consumer); consumer->OnInputEvent(keyEvent); MMI_HILOGD("Key event id:%{public}d keyCode:%{public}d", handlerId, keyEvent->GetKeyCode()); @@ -260,7 +260,7 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr pointer continue; } int32_t handlerId = item.first; - auto consumer = item.second.consumer_; + std::shared_ptr consumer = item.second.consumer_; CHKPV(consumer); auto ret = consumerInfos.emplace(handlerId, consumer); if (!ret.second) { @@ -276,7 +276,7 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr pointer continue; } int32_t handlerId = item.handlerId_; - auto consumer = item.consumer_; + std::shared_ptr consumer = item.consumer_; CHKPV(consumer); auto ret = consumerInfos.emplace(handlerId, consumer); if (!ret.second) { -- Gitee