diff --git a/interfaces/native/innerkits/proxy/include/extra_data.h b/interfaces/native/innerkits/proxy/include/extra_data.h index adb8295ba7d78cd0d0b495f5c0b6b5da3eb72417..42a814ebfc4902088063f0d80151f4b05df85c94 100644 --- a/interfaces/native/innerkits/proxy/include/extra_data.h +++ b/interfaces/native/innerkits/proxy/include/extra_data.h @@ -39,12 +39,6 @@ struct ExtraData { * @since 9 */ std::vector buffer; - /* - * 拖拽工具类型 - * - * @since 9 - */ - int32_t toolType{ 0 }; /* * 事件类型 * diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp index eb0e6cf22577677bcadaea587bcb0155d15a5e20..27a371b84dac941acca4f6f6ba7e77d512377807 100644 --- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp +++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp @@ -1839,7 +1839,6 @@ int32_t MultimodalInputConnectProxy::AppendExtraData(const ExtraData& extraData) for (const auto &item : extraData.buffer) { WRITEUINT8(data, item); } - WRITEINT32(data, extraData.toolType, ERR_INVALID_VALUE); WRITEINT32(data, extraData.sourceType, ERR_INVALID_VALUE); WRITEINT32(data, extraData.pointerId, ERR_INVALID_VALUE); WRITEINT32(data, extraData.pullId, ERR_INVALID_VALUE); diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp index e9aacfae99b13ab1304211e4a057d54dd00c2921..3e0fd3c9819b82c35f1f7cfc7b3a34a03ea82c45 100644 --- a/service/connect_manager/src/multimodal_input_connect_stub.cpp +++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp @@ -2205,7 +2205,6 @@ int32_t MultimodalInputConnectStub::StubAppendExtraData(MessageParcel& data, Mes READUINT8(data, buffer, IPC_PROXY_DEAD_OBJECT_ERR); extraData.buffer.push_back(buffer); } - READINT32(data, extraData.toolType, IPC_PROXY_DEAD_OBJECT_ERR); READINT32(data, extraData.sourceType, IPC_PROXY_DEAD_OBJECT_ERR); READINT32(data, extraData.pointerId, IPC_PROXY_DEAD_OBJECT_ERR); READINT32(data, extraData.pullId, IPC_PROXY_DEAD_OBJECT_ERR); diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h index aeaa208b124adc3772918bc9653377a98d91bc52..bd1c0594f84f795402ee9455b4f9573d1d381e24 100644 --- a/service/window_manager/include/input_windows_manager.h +++ b/service/window_manager/include/input_windows_manager.h @@ -241,7 +241,6 @@ private: void PrintWindowInfo(const std::vector &windowsInfo); void PrintDisplayGroupInfo(const DisplayGroupInfo displayGroupInfo); void PrintDisplayInfo(const DisplayInfo displayInfo); - int32_t ConvertToolType(int32_t toolType); void PrintWindowGroupInfo(const WindowGroupInfo &windowGroupInfo); void PrintWindowNavbar(int32_t groupId = -1); void CheckFocusWindowChange(const DisplayGroupInfo &displayGroupInfo); @@ -522,7 +521,6 @@ private: #ifdef OHOS_BUILD_ENABLE_TOUCH std::shared_ptr lastPointerEventforGesture_ { nullptr }; #endif // OHOS_BUILD_ENABLE_TOUCH - static std::unordered_map convertToolTypeMap_; bool IsFoldable_ { false }; int32_t timerId_ { -1 }; int32_t lastDpi_ { 0 }; diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp index 40c4829712dd058dcf65938d1bebe9e2df400b98..3016d4ad774756a5d4e87aa7aa7dfc8824efaa64 100644 --- a/service/window_manager/src/input_windows_manager.cpp +++ b/service/window_manager/src/input_windows_manager.cpp @@ -102,32 +102,6 @@ enum PointerHotArea : int32_t { BOTTOM_RIGHT = 7, }; -enum SourceTool : int32_t { - UNKNOWN = 0, - FINGER = 1, - PEN = 2, - RUBBER = 3, - BRUSH = 4, - PENCIL = 5, - AIRBRUSH = 6, - MOUSE = 7, - LENS = 8, - TOUCHPAD = 9, - JOYSTICK = 10, -}; - -std::unordered_map InputWindowsManager::convertToolTypeMap_ = { - {PointerEvent::TOOL_TYPE_FINGER, SourceTool::FINGER}, - {PointerEvent::TOOL_TYPE_PEN, SourceTool::PEN}, - {PointerEvent::TOOL_TYPE_RUBBER, SourceTool::RUBBER}, - {PointerEvent::TOOL_TYPE_BRUSH, SourceTool::BRUSH}, - {PointerEvent::TOOL_TYPE_PENCIL, SourceTool::PENCIL}, - {PointerEvent::TOOL_TYPE_AIRBRUSH, SourceTool::AIRBRUSH}, - {PointerEvent::TOOL_TYPE_MOUSE, SourceTool::MOUSE}, - {PointerEvent::TOOL_TYPE_LENS, SourceTool::LENS}, - {PointerEvent::TOOL_TYPE_TOUCHPAD, SourceTool::TOUCHPAD}, -}; - std::shared_ptr IInputWindowsManager::instance_; std::mutex IInputWindowsManager::mutex_; @@ -254,17 +228,6 @@ bool InputWindowsManager::IgnoreTouchEvent(std::shared_ptr pointer return false; } -int32_t InputWindowsManager::ConvertToolType(int32_t toolType) -{ - CALL_DEBUG_ENTER; - int32_t toolTypeData = -1; - auto it = convertToolTypeMap_.find(toolType); - if (it != convertToolTypeMap_.end()) { - toolTypeData = it->second; - } - return toolTypeData; -} - void InputWindowsManager::ReissueCancelTouchEvent(std::shared_ptr pointerEvent) { CALL_INFO_TRACE; @@ -4635,20 +4598,10 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptrHasFlag(InputEvent::EVENT_FLAG_SIMULATE) && item.windowType == SCREEN_CONTROL_WINDOW_TYPE) { continue; } - MMI_HILOG_DISPATCHD("pointerItem.GetToolType():%{public}d, extraData_.toolType:%{public}d", - pointerItem.GetToolType(), extraData_.toolType); - bool checkToolType = false; - if (extraData_.toolType == SourceTool::UNKNOWN) { - checkToolType = extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN && - ((pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_FINGER && extraData_.pointerId == pointerId) || - pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_PEN); - } else if (extraData_.toolType == SourceTool::FINGER) { - checkToolType = extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN && - (ConvertToolType(pointerItem.GetToolType()) == extraData_.toolType && - extraData_.pointerId == pointerId); - } else { - checkToolType = ConvertToolType(pointerItem.GetToolType()) == extraData_.toolType; - } + + bool checkToolType = extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN && + ((pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_FINGER && extraData_.pointerId == pointerId) || + pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_PEN); checkToolType = checkToolType || (pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_PULL_UP); if (checkToolType) { MMI_HILOG_DISPATCHD("Enter checkToolType"); @@ -4866,19 +4819,9 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptrx - touchWindow->area.x); pointerItem.SetToolWindowY(pointerItem.GetToolDisplayY() + physicDisplayInfo->y - touchWindow->area.y); pointerEvent->UpdatePointerItem(pointerId, pointerItem); - MMI_HILOG_DISPATCHD("pointerItem.GetToolType():%{public}d, extraData_.toolType:%{public}d", - pointerItem.GetToolType(), extraData_.toolType); - bool checkExtraData = false; - if (extraData_.toolType == SourceTool::UNKNOWN) { - checkExtraData = extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN && - ((pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_FINGER && extraData_.pointerId == pointerId) || - pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_PEN); - } else if (extraData_.toolType == SourceTool::FINGER) { - checkExtraData = extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN && - (ConvertToolType(pointerItem.GetToolType()) == extraData_.toolType && extraData_.pointerId == pointerId); - } else { - checkExtraData = ConvertToolType(pointerItem.GetToolType()) == extraData_.toolType; - } + bool checkExtraData = extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN && + ((pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_FINGER && extraData_.pointerId == pointerId) || + pointerItem.GetToolType() == PointerEvent::TOOL_TYPE_PEN); checkExtraData = checkExtraData || (pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_PULL_UP); int32_t pointerAction = pointerEvent->GetPointerAction(); if ((pointerAction == PointerEvent::POINTER_ACTION_DOWN) && !checkExtraData) { @@ -5819,7 +5762,6 @@ int32_t InputWindowsManager::AppendExtraData(const ExtraData& extraData) { CALL_DEBUG_ENTER; extraData_.appended = extraData.appended; - extraData_.toolType = extraData.toolType; extraData_.buffer = extraData.buffer; extraData_.sourceType = extraData.sourceType; extraData_.pointerId = extraData.pointerId; @@ -5840,7 +5782,6 @@ void InputWindowsManager::ClearExtraData() { CALL_DEBUG_ENTER; extraData_.appended = false; - extraData_.toolType = 0; extraData_.buffer.clear(); extraData_.sourceType = -1; extraData_.pointerId = -1;