From 3dd1895d0a4cc72bbe5c35670fe2fd9c03b6b743 Mon Sep 17 00:00:00 2001 From: bobz202 Date: Mon, 17 Jan 2022 10:56:25 +0800 Subject: [PATCH 1/5] The libinput_event reference is changed to a pointer Signed-off-by: bobz202 --- .../event_dispatch/include/event_dispatch.h | 20 ++-- service/event_dispatch/src/event_dispatch.cpp | 50 +++++---- .../include/input_event_handler.h | 12 +- .../event_handle/src/input_event_handler.cpp | 80 +++++++------ service/event_package/include/event_package.h | 34 +++--- service/event_package/src/event_package.cpp | 106 ++++++++++-------- .../include/standard_event_handler.h | 12 +- .../src/standard_event_handler.cpp | 30 +++-- .../test/standard_event_handler_test.cpp | 8 +- service/libinput_adapter/include/s_input.h | 2 +- service/libinput_adapter/src/s_input.cpp | 6 +- .../include/mouse_event_handler.h | 2 +- .../src/mouse_event_handler.cpp | 9 +- .../include/server_input_filter_manager.h | 2 +- .../src/server_input_filter_manager.cpp | 5 +- .../include/touch_transform_point_manager.h | 4 +- .../include/touch_transform_point_processor.h | 8 +- .../touchpad_transform_point_processor.h | 8 +- .../src/touch_transform_point_manager.cpp | 8 +- .../src/touch_transform_point_processor.cpp | 24 ++-- .../touchpad_transform_point_processor.cpp | 20 ++-- 21 files changed, 252 insertions(+), 198 deletions(-) diff --git a/service/event_dispatch/include/event_dispatch.h b/service/event_dispatch/include/event_dispatch.h index 22f4da981..1e53c5d57 100644 --- a/service/event_dispatch/include/event_dispatch.h +++ b/service/event_dispatch/include/event_dispatch.h @@ -30,25 +30,25 @@ public: EventDispatch(); virtual ~EventDispatch(); virtual int32_t SetInputEventFilter(sptr filter); - int32_t DispatchGestureNewEvent(UDSServer& udsServer, libinput_event& event, + int32_t DispatchGestureNewEvent(UDSServer& udsServer, libinput_event *event, std::shared_ptr pointer, const uint64_t preHandlerTime); - int32_t DispatchGestureEvent(UDSServer& udsServer, libinput_event& event, EventGesture& gesture, + int32_t DispatchGestureEvent(UDSServer& udsServer, libinput_event *event, EventGesture& gesture, const uint64_t preHandlerTime); - int32_t DispatchKeyEvent(UDSServer& udsServer, libinput_event& event, const KeyEventValueTransformations& trs, + int32_t DispatchKeyEvent(UDSServer& udsServer, libinput_event *event, const KeyEventValueTransformations& trs, EventKeyboard& key, const uint64_t preHandlerTime); int32_t DispatchKeyEventByPid(UDSServer& udsServer, std::shared_ptr key, const uint64_t preHandlerTime); - int32_t DispatchTouchEvent(UDSServer& udsServer, libinput_event& event, + int32_t DispatchTouchEvent(UDSServer& udsServer, libinput_event *event, EventTouch& touch, const uint64_t preHandlerTime, WindowSwitch& windowSwitch); - int32_t DispatchTabletPadEvent(UDSServer& udsServer, libinput_event& event, + int32_t DispatchTabletPadEvent(UDSServer& udsServer, libinput_event *event, EventTabletPad& tabletPad, const uint64_t preHandlerTime); - int32_t DispatchJoyStickEvent(UDSServer& udsServer, libinput_event& event, + int32_t DispatchJoyStickEvent(UDSServer& udsServer, libinput_event *event, EventJoyStickAxis& eventJoyStickAxis, const uint64_t preHandlerTime); - int32_t DispatchCommonPointEvent(UDSServer& udsServer, libinput_event& event, + int32_t DispatchCommonPointEvent(UDSServer& udsServer, libinput_event *event, EventPointer& point, const uint64_t preHandlerTime); - int32_t DispatchPointerEvent(UDSServer& udsServer, libinput_event& event, + int32_t DispatchPointerEvent(UDSServer& udsServer, libinput_event *event, EventPointer& point, const uint64_t preHandlerTime, WindowSwitch& windowSwitch); - int32_t DispatchTabletToolEvent(UDSServer& udsServer, libinput_event& event, + int32_t DispatchTabletToolEvent(UDSServer& udsServer, libinput_event *event, EventTabletTool& tableTool, const uint64_t preHandlerTime, WindowSwitch& windowSwitch); int32_t DispatchTouchTransformPointEvent(UDSServer& udsServer, std::shared_ptr point); int32_t handlePointerEvent(std::shared_ptr point); @@ -65,7 +65,7 @@ protected: int32_t RegisteredEventDispatch(const MmiMessageId& idMsg, UDSServer& udsServer, RegisteredEvent& eventData, int32_t inputDeviceType, uint64_t preHandlerTime); int32_t KeyBoardRegisteredEventHandler(EventKeyboard& key, UDSServer& udsServer, - libinput_event& event, int32_t inputDeviceType, uint64_t preHandlerTime); + libinput_event *event, int32_t inputDeviceType, uint64_t preHandlerTime); protected: int32_t touchDownFocusSurfaceId_ = 0; diff --git a/service/event_dispatch/src/event_dispatch.cpp b/service/event_dispatch/src/event_dispatch.cpp index 482ac276d..849ffcebe 100644 --- a/service/event_dispatch/src/event_dispatch.cpp +++ b/service/event_dispatch/src/event_dispatch.cpp @@ -155,8 +155,9 @@ int32_t OHOS::MMI::EventDispatch::RegisteredEventDispatch(const MmiMessageId& id } int32_t OHOS::MMI::EventDispatch::KeyBoardRegisteredEventHandler(EventKeyboard& key, UDSServer& udsServer, - libinput_event& event, int32_t inputDeviceType, uint64_t preHandlerTime) + libinput_event *event, int32_t inputDeviceType, uint64_t preHandlerTime) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); auto ret = RET_OK; RegisteredEvent registeredEvent = {}; auto packageResult = eventPackage_.PackageRegisteredEvent(registeredEvent, key); @@ -207,10 +208,11 @@ int32_t OHOS::MMI::EventDispatch::KeyBoardRegisteredEventHandler(EventKeyboard& return ret; } -int32_t OHOS::MMI::EventDispatch::DispatchTabletPadEvent(UDSServer& udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchTabletPadEvent(UDSServer& udsServer, libinput_event *event, EventTabletPad& tabletPad, const uint64_t preHandlerTime) { - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); #ifdef DEBUG_CODE_TEST std::string str = WinMgr->GetSurfaceIdListString(); @@ -259,10 +261,11 @@ int32_t OHOS::MMI::EventDispatch::DispatchTabletPadEvent(UDSServer& udsServer, l return RET_OK; } -int32_t OHOS::MMI::EventDispatch::DispatchJoyStickEvent(UDSServer &udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchJoyStickEvent(UDSServer &udsServer, libinput_event *event, EventJoyStickAxis& eventJoyStickAxis, const uint64_t preHandlerTime) { - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); auto focusId = WinMgr->GetFocusSurfaceId(); if (focusId < 0) { @@ -291,9 +294,10 @@ int32_t OHOS::MMI::EventDispatch::DispatchJoyStickEvent(UDSServer &udsServer, li return RET_OK; } -int32_t OHOS::MMI::EventDispatch::DispatchTabletToolEvent(UDSServer& udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchTabletToolEvent(UDSServer& udsServer, libinput_event *event, EventTabletTool& tableTool, const uint64_t preHandlerTime, WindowSwitch& windowSwitch) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); int32_t focusId = WinMgr->GetFocusSurfaceId(); // obtaining focusId if (focusId < 0) { return RET_OK; @@ -447,10 +451,11 @@ int32_t OHOS::MMI::EventDispatch::DispatchTouchTransformPointEvent(UDSServer& ud return RET_OK; } -int32_t OHOS::MMI::EventDispatch::DispatchPointerEvent(UDSServer &udsServer, libinput_event &event, +int32_t OHOS::MMI::EventDispatch::DispatchPointerEvent(UDSServer &udsServer, libinput_event *event, EventPointer &point, const uint64_t preHandlerTime, WindowSwitch& windowSwitch) { - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); #ifdef DEBUG_CODE_TEST @@ -491,7 +496,7 @@ int32_t OHOS::MMI::EventDispatch::DispatchPointerEvent(UDSServer &udsServer, lib newPacket << inputEvent; } #ifdef DEBUG_CODE_TEST - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); if (type != LIBINPUT_EVENT_POINTER_BUTTON) { MMI_LOGT("\nMMIWMS:windowId=[%{public}s]\n", strIds.c_str()); if (desWindowId == -1) { @@ -536,10 +541,11 @@ int32_t OHOS::MMI::EventDispatch::DispatchPointerEvent(UDSServer &udsServer, lib return RET_OK; } -int32_t OHOS::MMI::EventDispatch::DispatchGestureEvent(UDSServer& udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchGestureEvent(UDSServer& udsServer, libinput_event *event, EventGesture& gesture, const uint64_t preHandlerTime) { - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); MmiMessageId idMsg = MmiMessageId::INVALID; @@ -590,10 +596,11 @@ int32_t OHOS::MMI::EventDispatch::DispatchGestureEvent(UDSServer& udsServer, lib return RET_OK; } -int32_t OHOS::MMI::EventDispatch::DispatchTouchEvent(UDSServer& udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchTouchEvent(UDSServer& udsServer, libinput_event *event, EventTouch& touch, const uint64_t preHandlerTime, WindowSwitch& windowSwitch) { - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); #ifdef DEBUG_CODE_TEST @@ -684,11 +691,12 @@ int32_t OHOS::MMI::EventDispatch::DispatchTouchEvent(UDSServer& udsServer, libin } return ret; } -int32_t OHOS::MMI::EventDispatch::DispatchCommonPointEvent(UDSServer& udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchCommonPointEvent(UDSServer& udsServer, libinput_event *event, EventPointer& point, const uint64_t preHandlerTime) { - auto device = libinput_event_get_device(&event); - auto type = libinput_event_get_type(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); + auto type = libinput_event_get_type(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); #ifdef DEBUG_CODE_TEST @@ -779,10 +787,11 @@ int32_t OHOS::MMI::EventDispatch::DispatchKeyEventByPid(UDSServer& udsServer, return ret; } -int32_t OHOS::MMI::EventDispatch::DispatchKeyEvent(UDSServer& udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchKeyEvent(UDSServer& udsServer, libinput_event *event, const KeyEventValueTransformations& trs, EventKeyboard& key, const uint64_t preHandlerTime) { - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); int32_t ret = RET_OK; @@ -865,10 +874,11 @@ int32_t OHOS::MMI::EventDispatch::SetInputEventFilter(sptr filter) return RET_OK; } -int32_t OHOS::MMI::EventDispatch::DispatchGestureNewEvent(UDSServer& udsServer, libinput_event& event, +int32_t OHOS::MMI::EventDispatch::DispatchGestureNewEvent(UDSServer& udsServer, libinput_event *event, std::shared_ptr pointerEvent, const uint64_t preHandlerTime) { - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); auto focusId = WinMgr->GetFocusSurfaceId(); diff --git a/service/event_handle/include/input_event_handler.h b/service/event_handle/include/input_event_handler.h index 571afb28a..8e5f40946 100644 --- a/service/event_handle/include/input_event_handler.h +++ b/service/event_handle/include/input_event_handler.h @@ -44,22 +44,22 @@ protected: int32_t OnEventKeyboard(multimodal_libinput_event& event); int32_t OnEventPointer(multimodal_libinput_event& event); int32_t OnEventTouch(multimodal_libinput_event& event); - int32_t OnEventTouchSecond(libinput_event& event); - int32_t OnEventTouchPadSecond(libinput_event& event); + int32_t OnEventTouchSecond(libinput_event *event); + int32_t OnEventTouchPadSecond(libinput_event *event); int32_t OnEventGesture(multimodal_libinput_event& event); int32_t OnEventTouchpad(multimodal_libinput_event& event); - int32_t OnGestureEvent(libinput_event& event); + int32_t OnGestureEvent(libinput_event *event); int32_t OnEventTabletTool(multimodal_libinput_event& event); int32_t OnEventTabletPad(multimodal_libinput_event& event); int32_t OnEventSwitchToggle(multimodal_libinput_event& event); int32_t OnEventJoyStickKey(multimodal_libinput_event& event, const uint64_t time); int32_t OnEventTabletPadKey(multimodal_libinput_event& event); int32_t OnEventJoyStickAxis(multimodal_libinput_event& event, const uint64_t time); - int32_t OnKeyboardEvent(libinput_event& event); - int32_t OnEventKey(libinput_event& event); + int32_t OnKeyboardEvent(libinput_event *event); + int32_t OnEventKey(libinput_event *event); int32_t OnKeyEventDispatch(multimodal_libinput_event& event); - int32_t OnMouseEventHandler(libinput_event& event, const int32_t deviceId); + int32_t OnMouseEventHandler(libinput_event *event, const int32_t deviceId); bool SendMsg(const int32_t fd, NetPacket& pkt) const; bool OnSystemEvent(const KeyEventValueTransformations& temp, const enum KEY_STATE state) const; diff --git a/service/event_handle/src/input_event_handler.cpp b/service/event_handle/src/input_event_handler.cpp index c2c0468bb..0e4566ac2 100644 --- a/service/event_handle/src/input_event_handler.cpp +++ b/service/event_handle/src/input_event_handler.cpp @@ -279,7 +279,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventDeviceAdded(multimodal_libinput_eve DeviceManage deviceManage = {}; CHKR(udsServer_, NULL_POINTER, RET_ERR); - auto packageResult = eventPackage_.PackageDeviceManageEvent(*ev.event, deviceManage, *udsServer_); + auto packageResult = eventPackage_.PackageDeviceManageEvent(ev.event, deviceManage, *udsServer_); if (packageResult != RET_OK) { MMI_LOGE("Deviceadded event package failed... ret:%{public}d errCode:%{public}d", packageResult, DEV_ADD_EVENT_PKG_FAIL); @@ -315,7 +315,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventDeviceRemoved(multimodal_libinput_e uint64_t preHandlerTime = GetSysClockTime(); CHKR(udsServer_, NULL_POINTER, RET_ERR); DeviceManage deviceManage = {}; - auto packageResult = eventPackage_.PackageDeviceManageEvent(*ev.event, deviceManage, *udsServer_); + auto packageResult = eventPackage_.PackageDeviceManageEvent(ev.event, deviceManage, *udsServer_); if (packageResult != RET_OK) { MMI_LOGE("Deviceremoved event package failed... ret:%{public}d errCode:%{public}d", packageResult, DEV_REMOVE_EVENT_PKG_FAIL); @@ -342,8 +342,9 @@ int32_t OHOS::MMI::InputEventHandler::OnEventDeviceRemoved(multimodal_libinput_e return RET_OK; } -int32_t OHOS::MMI::InputEventHandler::OnEventKey(libinput_event& event) +int32_t OHOS::MMI::InputEventHandler::OnEventKey(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); uint64_t preHandlerTime = GetSysClockTime(); if (keyEvent == nullptr) { keyEvent = OHOS::MMI::KeyEvent::Create(); @@ -366,7 +367,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventKey(libinput_event& event) OnSystemEvent(hosKey, kacState); } - auto device = libinput_event_get_device(&event); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); auto eventDispatchResult = eventDispatch_.DispatchKeyEventByPid(*udsServer_, keyEvent, preHandlerTime); @@ -388,7 +389,7 @@ int32_t OHOS::MMI::InputEventHandler::OnKeyEventDispatch(multimodal_libinput_eve keyEvent = OHOS::MMI::KeyEvent::Create(); } CHKR(udsServer_, NULL_POINTER, RET_ERR); - auto packageResult = eventPackage_.PackageKeyEvent(*ev.event, keyEvent, *udsServer_); + auto packageResult = eventPackage_.PackageKeyEvent(ev.event, keyEvent, *udsServer_); if (packageResult == MULTIDEVICE_SAME_EVENT_FAIL) { // The multi_device_same_event should be discarded return RET_OK; } @@ -402,7 +403,7 @@ int32_t OHOS::MMI::InputEventHandler::OnKeyEventDispatch(multimodal_libinput_eve keyEvent->GetKeyCode()); return RET_OK; } - (void)OnEventKey(*ev.event); + (void)OnEventKey(ev.event); #else int32_t kac = keyEvent->GetKeyAction(); @@ -426,8 +427,9 @@ int32_t OHOS::MMI::InputEventHandler::OnKeyEventDispatch(multimodal_libinput_eve return RET_OK; } -int32_t OHOS::MMI::InputEventHandler::OnKeyboardEvent(libinput_event& event) +int32_t OHOS::MMI::InputEventHandler::OnKeyboardEvent(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); uint64_t preHandlerTime = GetSysClockTime(); EventKeyboard keyBoard = {}; CHKR(udsServer_, NULL_POINTER, RET_ERR); @@ -463,7 +465,7 @@ int32_t OHOS::MMI::InputEventHandler::OnKeyboardEvent(libinput_event& event) MMI_LOGD("subscribe key event filter success. keyCode=%{puiblic}d", keyBoard.key); return RET_OK; } - auto device = libinput_event_get_device(&event); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); auto eventDispatchResult = eventDispatch_.DispatchKeyEventByPid(*udsServer_, keyEvent, preHandlerTime); @@ -484,7 +486,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventKeyboard(multimodal_libinput_event #endif EventKeyboard keyBoard = {}; CHKR(udsServer_, NULL_POINTER, RET_ERR); - auto packageResult = eventPackage_.PackageKeyEvent(*ev.event, keyBoard, *udsServer_); + auto packageResult = eventPackage_.PackageKeyEvent(ev.event, keyBoard, *udsServer_); if (packageResult == MULTIDEVICE_SAME_EVENT_FAIL) { // The multi_device_same_event should be discarded return RET_OK; } @@ -497,7 +499,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventKeyboard(multimodal_libinput_event MMI_LOGD("key event filter find a key event from Original event keyCode : %{puiblic}d", keyBoard.key); return RET_OK; } - (void)OnKeyboardEvent(*ev.event); + (void)OnKeyboardEvent(ev.event); #else auto hosKey = KeyValueTransformationByInput(keyBoard.key); // libinput key transformed into HOS key keyBoard.unicode = 0; @@ -505,7 +507,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventKeyboard(multimodal_libinput_event return RET_OK; } - auto eventDispatchResult = eventDispatch_.DispatchKeyEvent(*udsServer_, *ev.event, hosKey, keyBoard, + auto eventDispatchResult = eventDispatch_.DispatchKeyEvent(*udsServer_, ev.event, hosKey, keyBoard, preHandlerTime); if (eventDispatchResult != RET_OK) { MMI_LOGE("Key event dispatch failed... ret:%{public}d errCode:%{public}d", @@ -564,9 +566,9 @@ int32_t OHOS::MMI::InputEventHandler::OnEventPointer(multimodal_libinput_event & #endif #ifndef OHOS_WESTEN_MODEL /* New */ - (void)OnMouseEventHandler(*ev.event, point.deviceId); + (void)OnMouseEventHandler(ev.event, point.deviceId); #else - auto retEvent = eventDispatch_.DispatchPointerEvent(*udsServer_, *ev.event, point, preHandlerTime, winSwitch_); + auto retEvent = eventDispatch_.DispatchPointerEvent(*udsServer_, ev.event, point, preHandlerTime, winSwitch_); if (retEvent != RET_OK) { MMI_LOGE("Pointer event dispatch failed... ret:%{public}d errCode:%{public}d", retEvent, POINT_EVENT_DISP_FAIL); @@ -576,15 +578,16 @@ int32_t OHOS::MMI::InputEventHandler::OnEventPointer(multimodal_libinput_event & return RET_OK; } -int32_t OHOS::MMI::InputEventHandler::OnEventTouchSecond(libinput_event& event) +int32_t OHOS::MMI::InputEventHandler::OnEventTouchSecond(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); MMI_LOGD("call OnEventTouchSecond begin"); auto point = touchTransformPointManger->onLibinputTouchEvent(event); if (point == nullptr) { return RET_OK; } eventDispatch_.handlePointerEvent(point); - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); if (type == LIBINPUT_EVENT_TOUCH_UP) { point->RemovePointerItem(point->GetPointerId()); MMI_LOGD("this touch event is up remove this finger"); @@ -598,8 +601,9 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTouchSecond(libinput_event& event) return RET_OK; } -int32_t OHOS::MMI::InputEventHandler::OnEventTouchPadSecond(libinput_event& event) +int32_t OHOS::MMI::InputEventHandler::OnEventTouchPadSecond(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); MMI_LOGD("call OnEventTouchPadSecond begin"); auto point = touchTransformPointManger->onLibinputTouchPadEvent(event); @@ -607,7 +611,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTouchPadSecond(libinput_event& even return RET_OK; } eventDispatch_.handlePointerEvent(point); - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); if (type == LIBINPUT_EVENT_TOUCHPAD_UP) { point->RemovePointerItem(point->GetPointerId()); MMI_LOGD("this touch pad event is up remove this finger"); @@ -623,9 +627,9 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTouchPadSecond(libinput_event& even int32_t OHOS::MMI::InputEventHandler::OnEventTouch(multimodal_libinput_event &ev) { CHKR(ev.event, NULL_POINTER, NULL_POINTER); - SInput::Loginfo_packaging_tool(*ev.event); + SInput::Loginfo_packaging_tool(ev.event); #ifndef OHOS_WESTEN_MODEL - OnEventTouchSecond(*ev.event); + OnEventTouchSecond(ev.event); #endif uint64_t preHandlerTime = GetSysClockTime(); struct EventTouch touch = {}; @@ -640,13 +644,13 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTouch(multimodal_libinput_event &ev return TOUCH_EVENT_PKG_FAIL; } #ifndef OHOS_WESTEN_MODEL - if (ServerKeyFilter->OnTouchEvent(*udsServer_, *ev.event, touch, preHandlerTime, winSwitch_)) { + if (ServerKeyFilter->OnTouchEvent(*udsServer_, ev.event, touch, preHandlerTime, winSwitch_)) { return RET_OK; } #endif #ifdef OHOS_WESTEN_MODEL - auto ret = eventDispatch_.DispatchTouchEvent(*udsServer_, *ev.event, touch, preHandlerTime, winSwitch_); + auto ret = eventDispatch_.DispatchTouchEvent(*udsServer_, ev.event, touch, preHandlerTime, winSwitch_); if (ret != RET_OK) { MMI_LOGE("Touch event dispatch failed... ret:%{public}d errCode:%{public}d", ret, TOUCH_EVENT_DISP_FAIL); return TOUCH_EVENT_DISP_FAIL; @@ -658,14 +662,15 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTouch(multimodal_libinput_event &ev int32_t OHOS::MMI::InputEventHandler::OnEventTouchpad(multimodal_libinput_event& ev) { #ifndef OHOS_WESTEN_MODEL - OnEventTouchPadSecond(*ev.event); + OnEventTouchPadSecond(ev.event); #endif return RET_OK; } -int32_t OHOS::MMI::InputEventHandler::OnGestureEvent(libinput_event& event) +int32_t OHOS::MMI::InputEventHandler::OnGestureEvent(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); MMI_LOGT("InputEventHandler::OnGestureEvent\n"); uint64_t preHandlerTime = GetSysClockTime(); EventGesture gesture = {}; @@ -693,18 +698,18 @@ int32_t OHOS::MMI::InputEventHandler::OnGestureEvent(libinput_event& event) int32_t OHOS::MMI::InputEventHandler::OnEventGesture(multimodal_libinput_event &ev) { CHKR(ev.event, NULL_POINTER, NULL_POINTER); - OnGestureEvent(*ev.event); + OnGestureEvent(ev.event); uint64_t preHandlerTime = GetSysClockTime(); EventGesture gesture = {}; CHKR(udsServer_, NULL_POINTER, RET_ERR); - auto packageResult = eventPackage_.PackageGestureEvent(*ev.event, gesture, *udsServer_); + auto packageResult = eventPackage_.PackageGestureEvent(ev.event, gesture, *udsServer_); if (packageResult != RET_OK) { MMI_LOGE("Gesture swipe event package failed... ret:%{public}d errCode:%{public}d", packageResult, GESTURE_EVENT_PKG_FAIL); return GESTURE_EVENT_PKG_FAIL; } - auto eventDispatchResult = eventDispatch_.DispatchGestureEvent(*udsServer_, *ev.event, gesture, preHandlerTime); + auto eventDispatchResult = eventDispatch_.DispatchGestureEvent(*udsServer_, ev.event, gesture, preHandlerTime); if (eventDispatchResult != RET_OK) { MMI_LOGE("Gesture event dispatch failed... ret:%{public}d errCode:%{public}d", eventDispatchResult, GESTURE_EVENT_DISP_FAIL); @@ -719,7 +724,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTabletTool(multimodal_libinput_even uint64_t preHandlerTime = GetSysClockTime(); EventTabletTool tableTool = {}; CHKR(udsServer_, NULL_POINTER, RET_ERR); - auto packageResult = eventPackage_.PackageTabletToolEvent(*ev.event, tableTool, *udsServer_); + auto packageResult = eventPackage_.PackageTabletToolEvent(ev.event, tableTool, *udsServer_); if (packageResult == MULTIDEVICE_SAME_EVENT_FAIL) { // The multi_device_same_event should be discarded return RET_OK; } @@ -729,7 +734,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTabletTool(multimodal_libinput_even return TABLETTOOL_EVENT_PKG_FAIL; } MMI_LOGT("\n2.mapping event:\nEvent:eventType=%{public}d;", tableTool.eventType); - auto retEvent = eventDispatch_.DispatchTabletToolEvent(*udsServer_, *ev.event, tableTool, preHandlerTime, winSwitch_); + auto retEvent = eventDispatch_.DispatchTabletToolEvent(*udsServer_, ev.event, tableTool, preHandlerTime, winSwitch_); if (retEvent != RET_OK) { MMI_LOGE("Tabletool event dispatch failed... ret:%{public}d errCode:%{public}d", retEvent, TABLETTOOL_EVENT_DISP_FAIL); @@ -744,13 +749,13 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTabletPad(multimodal_libinput_event uint64_t preHandlerTime = GetSysClockTime(); CHKR(udsServer_, NULL_POINTER, RET_ERR); EventTabletPad tabletPad = {}; - auto packageResult = eventPackage_.PackageTabletPadEvent(*ev.event, tabletPad, *udsServer_); + auto packageResult = eventPackage_.PackageTabletPadEvent(ev.event, tabletPad, *udsServer_); if (packageResult != RET_OK) { MMI_LOGE("Tabletpad event package failed... ret:%{public}d errCode:%{public}d", packageResult, TABLETPAD_EVENT_PKG_FAIL); return TABLETPAD_EVENT_PKG_FAIL; } - auto ret = eventDispatch_.DispatchTabletPadEvent(*udsServer_, *ev.event, tabletPad, preHandlerTime); + auto ret = eventDispatch_.DispatchTabletPadEvent(*udsServer_, ev.event, tabletPad, preHandlerTime); if (ret != RET_OK) { MMI_LOGE("Tabletpad event dispatch failed... ret:%{public}d errCode:%{public}d", ret, TABLETPAD_EVENT_DISP_FAIL); @@ -773,7 +778,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTabletPadKey(multimodal_libinput_ev uint64_t preHandlerTime = GetSysClockTime(); CHKR(udsServer_, NULL_POINTER, RET_ERR); EventKeyboard key = {}; - auto packageResult = eventPackage_.PackageTabletPadKeyEvent(*ev.event, key, *udsServer_); + auto packageResult = eventPackage_.PackageTabletPadKeyEvent(ev.event, key, *udsServer_); if (packageResult == MULTIDEVICE_SAME_EVENT_FAIL) { // The multi_device_same_event should be discarded return RET_OK; } @@ -787,7 +792,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTabletPadKey(multimodal_libinput_ev return RET_OK; } - auto eventDispatchResult = eventDispatch_.DispatchKeyEvent(*udsServer_, *ev.event, hosKey, key, preHandlerTime); + auto eventDispatchResult = eventDispatch_.DispatchKeyEvent(*udsServer_, ev.event, hosKey, key, preHandlerTime); if (eventDispatchResult != RET_OK) { MMI_LOGE("Key event dispatch failed... ret:%{public}d errCode:%{public}d", eventDispatchResult, TABLETPAD_KEY_EVENT_DISP_FAIL); @@ -801,7 +806,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventJoyStickKey(multimodal_libinput_eve CHKR(ev.event, NULL_POINTER, NULL_POINTER); CHKR(udsServer_, NULL_POINTER, RET_ERR); EventKeyboard key = {}; - auto packageResult = eventPackage_.PackageJoyStickKeyEvent(*ev.event, key, *udsServer_); + auto packageResult = eventPackage_.PackageJoyStickKeyEvent(ev.event, key, *udsServer_); if (packageResult != RET_OK) { MMI_LOGE("Joystickkey event package failed... ret:%{public}d errCode:%{public}d", packageResult, JOYSTICK_KEY_EVENT_PKG_FAIL); @@ -814,7 +819,7 @@ int32_t OHOS::MMI::InputEventHandler::OnEventJoyStickKey(multimodal_libinput_eve if (hosKey.isSystemKey && OnSystemEvent(hosKey, key.state)) { return RET_OK; } - auto eventDispatchResult = eventDispatch_.DispatchKeyEvent(*udsServer_, *ev.event, hosKey, key, time); + auto eventDispatchResult = eventDispatch_.DispatchKeyEvent(*udsServer_, ev.event, hosKey, key, time); if (eventDispatchResult != RET_OK) { MMI_LOGE("JoyStick event dispatch failed... ret:%{public}d errCode:%{public}d", eventDispatchResult, JOYSTICK_EVENT_DISP_FAIL); @@ -828,13 +833,13 @@ int32_t OHOS::MMI::InputEventHandler::OnEventJoyStickAxis(multimodal_libinput_ev CHKR(ev.event, NULL_POINTER, NULL_POINTER); CHKR(udsServer_, NULL_POINTER, RET_ERR); EventJoyStickAxis eventJoyStickAxis = {}; - auto packageResult = eventPackage_.PackageJoyStickAxisEvent(*ev.event, eventJoyStickAxis, *udsServer_); + auto packageResult = eventPackage_.PackageJoyStickAxisEvent(ev.event, eventJoyStickAxis, *udsServer_); if (packageResult != RET_OK) { MMI_LOGE("Joystickaxis event package failed... ret:%{public}d errCode:%{public}d", packageResult, JOYSTICK_AXIS_EVENT_PKG_FAIL); return JOYSTICK_AXIS_EVENT_PKG_FAIL; } - auto ret = eventDispatch_.DispatchJoyStickEvent(*udsServer_, *ev.event, eventJoyStickAxis, time); + auto ret = eventDispatch_.DispatchJoyStickEvent(*udsServer_, ev.event, eventJoyStickAxis, time); if (ret != RET_OK) { MMI_LOGE("Joystick event dispatch failed... ret:%{public}d errCode:%{public}d", ret, JOYSTICK_EVENT_DISP_FAIL); return JOYSTICK_EVENT_DISP_FAIL; @@ -842,8 +847,9 @@ int32_t OHOS::MMI::InputEventHandler::OnEventJoyStickAxis(multimodal_libinput_ev return RET_OK; } -int32_t OHOS::MMI::InputEventHandler::OnMouseEventHandler(libinput_event& event, const int32_t deviceId) +int32_t OHOS::MMI::InputEventHandler::OnMouseEventHandler(libinput_event *event, const int32_t deviceId) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); auto mouseEvent = MouseEventHandler::Create(); if (mouseEvent == nullptr) { return RET_ERR; diff --git a/service/event_package/include/event_package.h b/service/event_package/include/event_package.h index d8b20b8e0..bbefff677 100644 --- a/service/event_package/include/event_package.h +++ b/service/event_package/include/event_package.h @@ -30,24 +30,24 @@ namespace OHOS::MMI { EventPackage(); virtual ~EventPackage(); template - int32_t PackageEventDeviceInfo(libinput_event& event, UDSServer& udsServer, EventType& eventData); + int32_t PackageEventDeviceInfo(libinput_event *event, UDSServer& udsServer, EventType& eventData); template int32_t PackageRegisteredEvent(RegisteredEvent& registeredEvent, T& eventData); - int32_t PackageTabletToolEvent(libinput_event& event, EventTabletTool& tableTool, UDSServer& udsServer); - int32_t PackageTabletPadEvent(libinput_event& event, EventTabletPad& tabletPad, UDSServer& udsServer); - int32_t PackageDeviceManageEvent(libinput_event& event, DeviceManage& deviceManage, UDSServer& udsServer); - int32_t PackageKeyEvent(libinput_event& event, EventKeyboard& key, UDSServer& udsServer); - int32_t PackageKeyEvent(libinput_event& event, std::shared_ptr kevnPtr, + int32_t PackageTabletToolEvent(libinput_event *event, EventTabletTool& tableTool, UDSServer& udsServer); + int32_t PackageTabletPadEvent(libinput_event *event, EventTabletPad& tabletPad, UDSServer& udsServer); + int32_t PackageDeviceManageEvent(libinput_event *event, DeviceManage& deviceManage, UDSServer& udsServer); + int32_t PackageKeyEvent(libinput_event *event, EventKeyboard& key, UDSServer& udsServer); + int32_t PackageKeyEvent(libinput_event *event, std::shared_ptr kevnPtr, UDSServer& udsServer); - int32_t PackageGestureEvent(libinput_event& event, EventGesture& gesture, UDSServer& udsServer); + int32_t PackageGestureEvent(libinput_event *event, EventGesture& gesture, UDSServer& udsServer); int32_t PackagePointerEvent(multimodal_libinput_event &ev, EventPointer& point, WindowSwitch& windowSwitch, UDSServer& udsServer); int32_t PackageTouchEvent(multimodal_libinput_event &ev, EventTouch& touch, WindowSwitch& windowSwitch, UDSServer& udsServer); - int32_t PackageJoyStickAxisEvent(libinput_event& event, EventJoyStickAxis& eventJoyStickAxis, + int32_t PackageJoyStickAxisEvent(libinput_event *event, EventJoyStickAxis& eventJoyStickAxis, UDSServer& udsServer); - int32_t PackageJoyStickKeyEvent(libinput_event& event, EventKeyboard& key, UDSServer& udsServer); - int32_t PackageTabletPadKeyEvent(libinput_event& event, EventKeyboard& key, UDSServer& udsServer); + int32_t PackageJoyStickKeyEvent(libinput_event *event, EventKeyboard& key, UDSServer& udsServer); + int32_t PackageTabletPadKeyEvent(libinput_event *event, EventKeyboard& key, UDSServer& udsServer); static int32_t PackageVirtualKeyEvent(VirtualKey& event, EventKeyboard& key, UDSServer& udsServer); static int32_t KeyboardToKeyEvent(EventKeyboard& key, std::shared_ptr keyEventPtr, UDSServer& udsServer); @@ -56,13 +56,13 @@ namespace OHOS::MMI { private: uint32_t SEAT_BUTTON_OR_KEY_COUNT_ONE = 1; uint32_t SEAT_BUTTON_OR_KEY_COUNT_ZERO = 0; - void PackageTabletPadOtherParams(libinput_event& event, EventTabletPad& tabletPad); - int32_t PackageTabletToolOtherParams(libinput_event& event, EventTabletTool& tableTool); - void PackageTabletToolTypeParam(libinput_event& event, EventTabletTool& tableTool); - void PackagePointerEventByMotion(libinput_event& event, EventPointer& point, WindowSwitch& windowSwitch); - void PackagePointerEventByMotionAbs(libinput_event& event, EventPointer& point, WindowSwitch& windowSwitch); - int32_t PackagePointerEventByButton(libinput_event& event, EventPointer& point, WindowSwitch& windowSwitch); - void PackagePointerEventByAxis(libinput_event& event, EventPointer& point, WindowSwitch& windowSwitch); + void PackageTabletPadOtherParams(libinput_event *event, EventTabletPad& tabletPad); + int32_t PackageTabletToolOtherParams(libinput_event *event, EventTabletTool& tableTool); + void PackageTabletToolTypeParam(libinput_event *event, EventTabletTool& tableTool); + void PackagePointerEventByMotion(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch); + void PackagePointerEventByMotionAbs(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch); + int32_t PackagePointerEventByButton(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch); + void PackagePointerEventByAxis(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch); }; template int32_t EventPackage::PackageRegisteredEvent(RegisteredEvent& registeredEvent, T& eventData) diff --git a/service/event_package/src/event_package.cpp b/service/event_package/src/event_package.cpp index ce15692f8..342538eba 100644 --- a/service/event_package/src/event_package.cpp +++ b/service/event_package/src/event_package.cpp @@ -79,10 +79,11 @@ EventPackage::~EventPackage() } template -int32_t EventPackage::PackageEventDeviceInfo(libinput_event& event, UDSServer& udsServer, EventType& eventData) +int32_t EventPackage::PackageEventDeviceInfo(libinput_event *event, UDSServer& udsServer, EventType& eventData) { - auto type = libinput_event_get_type(&event); - auto device = libinput_event_get_device(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto type = libinput_event_get_type(event); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); eventData.eventType = type; eventData.deviceType = GetDeviceType(device); @@ -124,10 +125,11 @@ int32_t EventPackage::PackageEventDeviceInfo(libinput_event& event, UDSServer& u return RET_OK; } -int32_t EventPackage::PackageTabletToolOtherParams(libinput_event& event, EventTabletTool& tableTool) +int32_t EventPackage::PackageTabletToolOtherParams(libinput_event *event, EventTabletTool& tableTool) { - auto type = libinput_event_get_type(&event); - auto data = libinput_event_get_tablet_tool_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto type = libinput_event_get_type(event); + auto data = libinput_event_get_tablet_tool_event(event); CHKR(data, NULL_POINTER, RET_ERR); auto tool = libinput_event_tablet_tool_get_tool(data); CHKR(tool, NULL_POINTER, RET_ERR); @@ -173,9 +175,10 @@ int32_t EventPackage::PackageTabletToolOtherParams(libinput_event& event, EventT } return RET_OK; } -void EventPackage::PackageTabletToolTypeParam(libinput_event& event, EventTabletTool& tableTool) +void EventPackage::PackageTabletToolTypeParam(libinput_event *event, EventTabletTool& tableTool) { - auto data = libinput_event_get_tablet_tool_event(&event); + CHK(event, PARAM_INPUT_INVALID); + auto data = libinput_event_get_tablet_tool_event(event); CHK(data != nullptr, NULL_POINTER); auto tool = libinput_event_tablet_tool_get_tool(data); CHK(tool != nullptr, NULL_POINTER); @@ -218,13 +221,14 @@ void EventPackage::PackageTabletToolTypeParam(libinput_event& event, EventTablet } } -int32_t EventPackage::PackageTabletToolEvent(libinput_event& event, EventTabletTool& tableTool, UDSServer& udsServer) +int32_t EventPackage::PackageTabletToolEvent(libinput_event *event, EventTabletTool& tableTool, UDSServer& udsServer) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); const uint32_t stylusButton1KeyCode = 331; const uint32_t stylusButton2KeyCode = 332; const uint32_t stylusButton1Value = 1; const uint32_t stylusButton2Value = 2; - auto data = libinput_event_get_tablet_tool_event(&event); + auto data = libinput_event_get_tablet_tool_event(event); CHKR(data, NULL_POINTER, RET_ERR); auto tool = libinput_event_tablet_tool_get_tool(data); CHKR(tool, NULL_POINTER, RET_ERR); @@ -243,11 +247,12 @@ int32_t EventPackage::PackageTabletToolEvent(libinput_event& event, EventTabletT } return ret; } -void EventPackage::PackageTabletPadOtherParams(libinput_event& event, EventTabletPad& tabletPad) +void EventPackage::PackageTabletPadOtherParams(libinput_event *event, EventTabletPad& tabletPad) { - auto data = libinput_event_get_tablet_pad_event(&event); + CHK(event, PARAM_INPUT_INVALID); + auto data = libinput_event_get_tablet_pad_event(event); CHK(data != nullptr, NULL_POINTER); - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); switch (type) { case LIBINPUT_EVENT_TABLET_PAD_RING: { tabletPad.ring.number = libinput_event_tablet_pad_get_ring_number(data); @@ -275,9 +280,10 @@ void EventPackage::PackageTabletPadOtherParams(libinput_event& event, EventTable } } -int32_t EventPackage::PackageTabletPadEvent(libinput_event& event, EventTabletPad& tabletPad, UDSServer& udsServer) +int32_t EventPackage::PackageTabletPadEvent(libinput_event *event, EventTabletPad& tabletPad, UDSServer& udsServer) { - auto data = libinput_event_get_tablet_pad_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto data = libinput_event_get_tablet_pad_event(event); CHKR(data, NULL_POINTER, RET_ERR); tabletPad.mode = libinput_event_tablet_pad_get_mode(data); tabletPad.time = libinput_event_tablet_pad_get_time_usec(data); @@ -290,11 +296,12 @@ int32_t EventPackage::PackageTabletPadEvent(libinput_event& event, EventTabletPa return RET_OK; } -int32_t EventPackage::PackageTabletPadKeyEvent(libinput_event& event, EventKeyboard& key, UDSServer& udsServer) +int32_t EventPackage::PackageTabletPadKeyEvent(libinput_event *event, EventKeyboard& key, UDSServer& udsServer) { - auto data = libinput_event_get_tablet_pad_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto data = libinput_event_get_tablet_pad_event(event); CHKR(data, NULL_POINTER, RET_ERR); - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); key.time = libinput_event_tablet_pad_get_time_usec(data); auto ret = PackageEventDeviceInfo(event, udsServer, key); if (ret != RET_OK) { @@ -336,9 +343,10 @@ int32_t EventPackage::PackageTabletPadKeyEvent(libinput_event& event, EventKeybo return RET_OK; } -int32_t EventPackage::PackageJoyStickKeyEvent(libinput_event& event, EventKeyboard& key, UDSServer& udsServer) +int32_t EventPackage::PackageJoyStickKeyEvent(libinput_event *event, EventKeyboard& key, UDSServer& udsServer) { - auto data = libinput_event_get_joystick_pointer_button_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto data = libinput_event_get_joystick_pointer_button_event(event); CHKR(data, NULL_POINTER, RET_ERR); key.time = libinput_event_joystick_button_time(data); key.key = libinput_event_joystick_button_get_key(data); @@ -356,10 +364,11 @@ int32_t EventPackage::PackageJoyStickKeyEvent(libinput_event& event, EventKeyboa return RET_OK; } -void EventPackage::PackagePointerEventByMotion(libinput_event& event, +void EventPackage::PackagePointerEventByMotion(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch) { - auto data = libinput_event_get_pointer_event(&event); + CHK(event, PARAM_INPUT_INVALID); + auto data = libinput_event_get_pointer_event(event); CHK(data != nullptr, PARAM_INPUT_INVALID); point.time = libinput_event_pointer_get_time_usec(data); @@ -375,10 +384,11 @@ void EventPackage::PackagePointerEventByMotion(libinput_event& event, windowSwitch.SetPointerByMotion(absPointer); } -void EventPackage::PackagePointerEventByMotionAbs(libinput_event& event, +void EventPackage::PackagePointerEventByMotionAbs(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch) { - auto data = libinput_event_get_pointer_event(&event); + CHK(event, PARAM_INPUT_INVALID); + auto data = libinput_event_get_pointer_event(event); CHK(data != nullptr, PARAM_INPUT_INVALID); point.time = libinput_event_pointer_get_time_usec(data); @@ -392,10 +402,11 @@ void EventPackage::PackagePointerEventByMotionAbs(libinput_event& event, windowSwitch.SetPointerByAbsMotion(absPointer); } -int32_t EventPackage::PackagePointerEventByButton(libinput_event& event, +int32_t EventPackage::PackagePointerEventByButton(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch) { - auto data = libinput_event_get_pointer_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto data = libinput_event_get_pointer_event(event); CHKR(data, NULL_POINTER, RET_ERR); point.time = libinput_event_pointer_get_time_usec(data); point.button = libinput_event_pointer_get_button(data); @@ -428,10 +439,11 @@ int32_t EventPackage::PackagePointerEventByButton(libinput_event& event, return RET_OK; } -void EventPackage::PackagePointerEventByAxis(libinput_event& event, +void EventPackage::PackagePointerEventByAxis(libinput_event *event, EventPointer& point, WindowSwitch& windowSwitch) { - auto data = libinput_event_get_pointer_event(&event); + CHK(event, PARAM_INPUT_INVALID); + auto data = libinput_event_get_pointer_event(event); CHK(data != nullptr, PARAM_INPUT_INVALID); point.time = libinput_event_pointer_get_time_usec(data); @@ -472,10 +484,11 @@ void EventPackage::PackagePointerEventByAxis(libinput_event& event, } } -int32_t EventPackage::PackageJoyStickAxisEvent(libinput_event& event, +int32_t EventPackage::PackageJoyStickAxisEvent(libinput_event *event, EventJoyStickAxis& eventJoyStickAxis, UDSServer& udsServer) { - auto joyEvent = libinput_event_get_joystick_axis_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto joyEvent = libinput_event_get_joystick_axis_event(event); CHKR(joyEvent, NULL_POINTER, RET_ERR); auto ret = PackageEventDeviceInfo(event, udsServer, eventJoyStickAxis); if (ret != RET_OK) { @@ -518,7 +531,7 @@ int32_t EventPackage::PackageTouchEvent(multimodal_libinput_event &ev, if (type == LIBINPUT_EVENT_TOUCH_CANCEL || type == LIBINPUT_EVENT_TOUCH_FRAME) { return UNKNOWN_EVENT_PKG_FAIL; } - auto ret = PackageEventDeviceInfo(*ev.event, udsServer, touch); + auto ret = PackageEventDeviceInfo(ev.event, udsServer, touch); if (ret != RET_OK) { MMI_LOGE("Device param package failed... ret:%{public}d errCode:%{public}d", ret, DEV_PARAM_PKG_FAIL); return DEV_PARAM_PKG_FAIL; @@ -568,8 +581,9 @@ int32_t EventPackage::PackageTouchEvent(multimodal_libinput_event &ev, int32_t EventPackage::PackagePointerEvent(multimodal_libinput_event &ev, EventPointer& point, WindowSwitch& windowSwitch, UDSServer& udsServer) { + CHKR(ev.event, PARAM_INPUT_INVALID, RET_ERR); auto type = libinput_event_get_type(ev.event); - auto rDevRet = PackageEventDeviceInfo(*ev.event, udsServer, point); + auto rDevRet = PackageEventDeviceInfo(ev.event, udsServer, point); int32_t ret = 0; if (rDevRet != RET_OK) { MMI_LOGE("Device param package failed... ret:%{public}d errCode:%{public}d", rDevRet, DEV_PARAM_PKG_FAIL); @@ -577,19 +591,19 @@ int32_t EventPackage::PackagePointerEvent(multimodal_libinput_event &ev, } switch (type) { case LIBINPUT_EVENT_POINTER_MOTION: { - PackagePointerEventByMotion(*ev.event, point, windowSwitch); + PackagePointerEventByMotion(ev.event, point, windowSwitch); break; } case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: { - PackagePointerEventByMotionAbs(*ev.event, point, windowSwitch); + PackagePointerEventByMotionAbs(ev.event, point, windowSwitch); break; } case LIBINPUT_EVENT_POINTER_BUTTON: { - PackagePointerEventByButton(*ev.event, point, windowSwitch); + PackagePointerEventByButton(ev.event, point, windowSwitch); break; } case LIBINPUT_EVENT_POINTER_AXIS: { - PackagePointerEventByAxis(*ev.event, point, windowSwitch); + PackagePointerEventByAxis(ev.event, point, windowSwitch); break; } default: { @@ -599,11 +613,12 @@ int32_t EventPackage::PackagePointerEvent(multimodal_libinput_event &ev, return ret; } -int32_t OHOS::MMI::EventPackage::PackageGestureEvent(libinput_event& event, EventGesture& gesture, UDSServer& udsServer) +int32_t OHOS::MMI::EventPackage::PackageGestureEvent(libinput_event *event, EventGesture& gesture, UDSServer& udsServer) { - auto data = libinput_event_get_gesture_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto data = libinput_event_get_gesture_event(event); CHKR(data, NULL_POINTER, RET_ERR); - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); auto ret = PackageEventDeviceInfo(event, udsServer, gesture); if (ret != RET_OK) { MMI_LOGE("Device param package failed... ret:%{public}d errCode:%{public}d", ret, DEV_PARAM_PKG_FAIL); @@ -650,8 +665,9 @@ int32_t OHOS::MMI::EventPackage::PackageGestureEvent(libinput_event& event, Even return RET_OK; } -int32_t EventPackage::PackageDeviceManageEvent(libinput_event& event, DeviceManage& deviceManage, UDSServer& udsServer) +int32_t EventPackage::PackageDeviceManageEvent(libinput_event *event, DeviceManage& deviceManage, UDSServer& udsServer) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); auto ret = PackageEventDeviceInfo(event, udsServer, deviceManage); if (ret != RET_OK) { MMI_LOGE("Device param package failed... ret:%{public}d errCode:%{public}d", ret, DEV_PARAM_PKG_FAIL); @@ -660,9 +676,10 @@ int32_t EventPackage::PackageDeviceManageEvent(libinput_event& event, DeviceMana return RET_OK; } -int32_t EventPackage::PackageKeyEvent(libinput_event& event, EventKeyboard& key, UDSServer& udsServer) +int32_t EventPackage::PackageKeyEvent(libinput_event *event, EventKeyboard& key, UDSServer& udsServer) { - auto data = libinput_event_get_keyboard_event(&event); + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); + auto data = libinput_event_get_keyboard_event(event); CHKR(data, NULL_POINTER, RET_ERR); key.key = libinput_event_keyboard_get_key(data); auto ret = PackageEventDeviceInfo(event, udsServer, key); @@ -687,9 +704,10 @@ int32_t EventPackage::PackageKeyEvent(libinput_event& event, EventKeyboard& key, return RET_OK; } -int32_t EventPackage::PackageKeyEvent(libinput_event& event, +int32_t EventPackage::PackageKeyEvent(libinput_event *event, std::shared_ptr kevnPtr, UDSServer& udsServer) { + CHKR(event, PARAM_INPUT_INVALID, RET_ERR); MMI_LOGD("PackageKeyEvent begin"); CHKR(kevnPtr, NULL_POINTER, RET_ERR); kevnPtr->UpdateId(); @@ -700,7 +718,7 @@ int32_t EventPackage::PackageKeyEvent(libinput_event& event, MMI_LOGE("Device param package failed... ret:%{public}d errCode:%{public}d", ret, DEV_PARAM_PKG_FAIL); return DEV_PARAM_PKG_FAIL; } - auto data = libinput_event_get_keyboard_event(&event); + auto data = libinput_event_get_keyboard_event(event); CHKR(data, NULL_POINTER, RET_ERR); // libinput key transformed into HOS key auto hosKey = KeyValueTransformationByInput(libinput_event_keyboard_get_key(data)); diff --git a/service/event_standard/include/standard_event_handler.h b/service/event_standard/include/standard_event_handler.h index f95fbc750..486ce88ae 100644 --- a/service/event_standard/include/standard_event_handler.h +++ b/service/event_standard/include/standard_event_handler.h @@ -22,16 +22,16 @@ class StandardEventHandler { public: StandardEventHandler(); virtual ~StandardEventHandler(); - void StandardTouchEvent(libinput_event& event, StandardTouchStruct& data); - void PointerPressedStandard(libinput_event& event, StandardTouchStruct& data); + void StandardTouchEvent(libinput_event *event, StandardTouchStruct& data); + void PointerPressedStandard(libinput_event *event, StandardTouchStruct& data); void PointerPressedStandardEvent(struct libinput_event_pointer& szPoint, StandardTouchStruct& data); void PointerReleasedStandardEvent(struct libinput_event_pointer& szPoint, StandardTouchStruct& data); - void PointerAbsoluteStandardEvent(libinput_event& event, StandardTouchStruct& data); - void PointerMotionStandardEvent(libinput_event& event, StandardTouchStruct& data); - void TipStandardEvent(libinput_event& event, StandardTouchStruct& data); + void PointerAbsoluteStandardEvent(libinput_event *event, StandardTouchStruct& data); + void PointerMotionStandardEvent(libinput_event *event, StandardTouchStruct& data); + void TipStandardEvent(libinput_event *event, StandardTouchStruct& data); void TipUpStandardEvent(struct libinput_event_tablet_tool& szPoint, StandardTouchStruct& data); void TipDownStandardEvent(struct libinput_event_tablet_tool& szPoint, StandardTouchStruct& data); - void TipMotionStandardEvent(libinput_event& event, StandardTouchStruct& data); + void TipMotionStandardEvent(libinput_event *event, StandardTouchStruct& data); private: libinput_button_state leftButtonState_ = {}; uint32_t leftButton_ = 0; diff --git a/service/event_standard/src/standard_event_handler.cpp b/service/event_standard/src/standard_event_handler.cpp index 3ef4da624..d23168bdf 100644 --- a/service/event_standard/src/standard_event_handler.cpp +++ b/service/event_standard/src/standard_event_handler.cpp @@ -30,10 +30,11 @@ OHOS::MMI::StandardEventHandler::~StandardEventHandler() { } -void OHOS::MMI::StandardEventHandler::StandardTouchEvent(libinput_event& event, StandardTouchStruct& data) +void OHOS::MMI::StandardEventHandler::StandardTouchEvent(libinput_event *event, StandardTouchStruct& data) { + CHK(event, PARAM_INPUT_INVALID); enum libinput_event_type eventType = {}; - eventType = libinput_event_get_type(&event); + eventType = libinput_event_get_type(event); switch (eventType) { case libinput_event_type::LIBINPUT_EVENT_POINTER_BUTTON: { PointerPressedStandard(event, data); @@ -67,10 +68,11 @@ void OHOS::MMI::StandardEventHandler::StandardTouchEvent(libinput_event& event, } } -void OHOS::MMI::StandardEventHandler::PointerPressedStandard(libinput_event& event, StandardTouchStruct& data) +void OHOS::MMI::StandardEventHandler::PointerPressedStandard(libinput_event *event, StandardTouchStruct& data) { + CHK(event, PARAM_INPUT_INVALID); struct libinput_event_pointer *szPoint = nullptr; - szPoint = libinput_event_get_pointer_event(&event); + szPoint = libinput_event_get_pointer_event(event); CHK(szPoint, NULL_POINTER); leftButton_ = libinput_event_pointer_get_button(szPoint); data.buttonType = leftButton_; @@ -116,10 +118,11 @@ void OHOS::MMI::StandardEventHandler::PointerPressedStandardEvent(struct libinpu data.reRventType, data.curRventType, data.buttonType, data.buttonState); } -void OHOS::MMI::StandardEventHandler::PointerAbsoluteStandardEvent(libinput_event& event, StandardTouchStruct& data) +void OHOS::MMI::StandardEventHandler::PointerAbsoluteStandardEvent(libinput_event *event, StandardTouchStruct& data) { + CHK(event, PARAM_INPUT_INVALID); struct libinput_event_pointer *szPoint = nullptr; - szPoint = libinput_event_get_pointer_event(&event); + szPoint = libinput_event_get_pointer_event(event); CHK(szPoint, NULL_POINTER); data.time = libinput_event_pointer_get_time_usec(szPoint); data.x = libinput_event_pointer_get_absolute_x(szPoint); @@ -142,10 +145,11 @@ void OHOS::MMI::StandardEventHandler::PointerAbsoluteStandardEvent(libinput_even } } -void OHOS::MMI::StandardEventHandler::PointerMotionStandardEvent(libinput_event& event, StandardTouchStruct& data) +void OHOS::MMI::StandardEventHandler::PointerMotionStandardEvent(libinput_event *event, StandardTouchStruct& data) { + CHK(event, PARAM_INPUT_INVALID); struct libinput_event_pointer *szPoint = nullptr; - szPoint = libinput_event_get_pointer_event(&event); + szPoint = libinput_event_get_pointer_event(event); CHK(szPoint, NULL_POINTER); data.time = libinput_event_pointer_get_time_usec(szPoint); data.x = libinput_event_pointer_get_dx_unaccelerated(szPoint); @@ -172,10 +176,11 @@ void OHOS::MMI::StandardEventHandler::PointerMotionStandardEvent(libinput_event& } } -void OHOS::MMI::StandardEventHandler::TipStandardEvent(libinput_event& event, StandardTouchStruct& data) +void OHOS::MMI::StandardEventHandler::TipStandardEvent(libinput_event *event, StandardTouchStruct& data) { + CHK(event, PARAM_INPUT_INVALID); struct libinput_event_tablet_tool* szPoint = nullptr; - szPoint = libinput_event_get_tablet_tool_event(&event); + szPoint = libinput_event_get_tablet_tool_event(event); CHK(szPoint, NULL_POINTER); data.tipState = libinput_event_tablet_tool_get_tip_state(szPoint); if (data.tipState == LIBINPUT_TABLET_TOOL_TIP_UP) { @@ -217,10 +222,11 @@ void OHOS::MMI::StandardEventHandler::TipDownStandardEvent(struct libinput_event data.reRventType, data.curRventType, data.tipState, data.x, data.y); } -void OHOS::MMI::StandardEventHandler::TipMotionStandardEvent(libinput_event& event, StandardTouchStruct& data) +void OHOS::MMI::StandardEventHandler::TipMotionStandardEvent(libinput_event *event, StandardTouchStruct& data) { + CHK(event, PARAM_INPUT_INVALID); struct libinput_event_tablet_tool* szPoint = nullptr; - szPoint = libinput_event_get_tablet_tool_event(&event); + szPoint = libinput_event_get_tablet_tool_event(event); CHK(szPoint, NULL_POINTER); data.x = libinput_event_tablet_tool_get_x(szPoint); data.y = libinput_event_tablet_tool_get_y(szPoint); diff --git a/service/event_standard/test/standard_event_handler_test.cpp b/service/event_standard/test/standard_event_handler_test.cpp index d8e85ea69..3d8fc53f2 100755 --- a/service/event_standard/test/standard_event_handler_test.cpp +++ b/service/event_standard/test/standard_event_handler_test.cpp @@ -37,7 +37,7 @@ HWTEST_F(StandardEventHandlerTest, TEST_StandardTouchEvent_PointerButton, TestSi StandardEventHandler mmiStandard; event.type = LIBINPUT_EVENT_POINTER_BUTTON; - mmiStandard.StandardTouchEvent(event, data); + mmiStandard.StandardTouchEvent(&event, data); EXPECT_EQ(data.curRventType, RET_ERR); free(event.device->seat->libinput); free(event.device->seat); @@ -54,7 +54,7 @@ HWTEST_F(StandardEventHandlerTest, TEST_StandardTouchEvent_PointerMotion, TestSi StandardEventHandler mmiStandard; event.type = LIBINPUT_EVENT_POINTER_MOTION; - mmiStandard.StandardTouchEvent(event, data); + mmiStandard.StandardTouchEvent(&event, data); EXPECT_EQ(data.curRventType, RET_ERR); free(event.device->seat->libinput); free(event.device->seat); @@ -71,7 +71,7 @@ HWTEST_F(StandardEventHandlerTest, TEST_StandardTouchEvent_TableToolTip, TestSiz StandardEventHandler mmiStandard; event.type = LIBINPUT_EVENT_TABLET_TOOL_TIP; - mmiStandard.StandardTouchEvent(event, data); + mmiStandard.StandardTouchEvent(&event, data); EXPECT_EQ(data.curRventType, RET_ERR); free(event.device->seat->libinput); free(event.device->seat); @@ -88,7 +88,7 @@ HWTEST_F(StandardEventHandlerTest, TEST_StandardTouchEvent_Other, TestSize.Level StandardEventHandler mmiStandard; event.type = LIBINPUT_EVENT_NONE; - mmiStandard.StandardTouchEvent(event, data); + mmiStandard.StandardTouchEvent(&event, data); EXPECT_EQ(data.curRventType, RET_ERR); free(event.device->seat->libinput); free(event.device->seat); diff --git a/service/libinput_adapter/include/s_input.h b/service/libinput_adapter/include/s_input.h index 997a13c88..b0146abf0 100644 --- a/service/libinput_adapter/include/s_input.h +++ b/service/libinput_adapter/include/s_input.h @@ -27,7 +27,7 @@ class SInput { public: SInput(); virtual ~SInput(); - static void Loginfo_packaging_tool(libinput_event& event); + static void Loginfo_packaging_tool(libinput_event *event); bool Init(FunInputEvent funInputEvent, const std::string& seat_id = "seat0"); void EventDispatch(epoll_event& ev); void Stop(); diff --git a/service/libinput_adapter/src/s_input.cpp b/service/libinput_adapter/src/s_input.cpp index 5888761dd..d90698b5a 100644 --- a/service/libinput_adapter/src/s_input.cpp +++ b/service/libinput_adapter/src/s_input.cpp @@ -49,9 +49,10 @@ static void InitHiLogFunc(struct libinput* input) } } -void OHOS::MMI::SInput::Loginfo_packaging_tool(libinput_event& event) +void OHOS::MMI::SInput::Loginfo_packaging_tool(libinput_event *event) { - auto context = libinput_event_get_context(&event); + CHK(event, PARAM_INPUT_INVALID); + auto context = libinput_event_get_context(event); InitHiLogFunc(context); } @@ -166,6 +167,7 @@ void OHOS::MMI::SInput::WriteBrightness(const char *brightness) bool OHOS::MMI::SInput::HandlePowerKey(struct libinput_event *event) { + CHKF(event, PARAM_INPUT_INVALID); bool isKeyboardEvent = (libinput_event_get_type(event) == LIBINPUT_EVENT_KEYBOARD_KEY); if (!isKeyboardEvent) { return (screenState_ == 0); diff --git a/service/mouse_event_handler/include/mouse_event_handler.h b/service/mouse_event_handler/include/mouse_event_handler.h index 366aba123..6a6891430 100644 --- a/service/mouse_event_handler/include/mouse_event_handler.h +++ b/service/mouse_event_handler/include/mouse_event_handler.h @@ -27,7 +27,7 @@ namespace MMI { class MouseEventHandler : public PointerEvent { public: virtual ~MouseEventHandler(); - void SetMouseData(libinput_event& event, int32_t deviceId); + void SetMouseData(libinput_event *event, int32_t deviceId); static std::shared_ptr Create() { return std::shared_ptr(new MouseEventHandler(InputEvent::EVENT_TYPE_POINTER)); diff --git a/service/mouse_event_handler/src/mouse_event_handler.cpp b/service/mouse_event_handler/src/mouse_event_handler.cpp index 4da888cad..82cc83274 100644 --- a/service/mouse_event_handler/src/mouse_event_handler.cpp +++ b/service/mouse_event_handler/src/mouse_event_handler.cpp @@ -137,15 +137,16 @@ void OHOS::MMI::MouseEventHandler::SetMouseAxis(struct libinput_event_pointer& p } } -void OHOS::MMI::MouseEventHandler::SetMouseData(libinput_event& event, int32_t deviceId) +void OHOS::MMI::MouseEventHandler::SetMouseData(libinput_event *event, int32_t deviceId) { + CHK(event, PARAM_INPUT_INVALID); OHOS::MMI::PointerEvent::PointerItem pointerItem; struct libinput_event_pointer *pointEventData = nullptr; - pointEventData = libinput_event_get_pointer_event(&event); + pointEventData = libinput_event_get_pointer_event(event); uint64_t time = libinput_event_pointer_get_time_usec(pointEventData); - int32_t type = libinput_event_get_type(&event); + int32_t type = libinput_event_get_type(event); - enum evdev_device_udev_tags udevTags = libinput_device_get_tags(libinput_event_get_device(&event)); + enum evdev_device_udev_tags udevTags = libinput_device_get_tags(libinput_event_get_device(event)); if ((udevTags & EVDEV_UDEV_TAG_MOUSE) == EVDEV_UDEV_TAG_MOUSE) { this->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE); } else if ((udevTags & EVDEV_UDEV_TAG_TOUCHPAD) == EVDEV_UDEV_TAG_TOUCHPAD) { diff --git a/service/server_input_filter_manager/include/server_input_filter_manager.h b/service/server_input_filter_manager/include/server_input_filter_manager.h index c273fbc0b..888e214d0 100644 --- a/service/server_input_filter_manager/include/server_input_filter_manager.h +++ b/service/server_input_filter_manager/include/server_input_filter_manager.h @@ -65,7 +65,7 @@ public: std::string name_; Authority authority_; }; - bool OnTouchEvent(UDSServer& udsServer, libinput_event& event, EventTouch& touch, + bool OnTouchEvent(UDSServer& udsServer, libinput_event *event, EventTouch& touch, const uint64_t preHandlerTime, WindowSwitch& windowSwitch); int32_t AddTouchEventFilter(SessionPtr sess, std::string name, int32_t id, Authority authority); int32_t RemoveTouchEventFilter(SessionPtr sess, int32_t id); diff --git a/service/server_input_filter_manager/src/server_input_filter_manager.cpp b/service/server_input_filter_manager/src/server_input_filter_manager.cpp index 2143c61df..f390ccca3 100644 --- a/service/server_input_filter_manager/src/server_input_filter_manager.cpp +++ b/service/server_input_filter_manager/src/server_input_filter_manager.cpp @@ -221,9 +221,10 @@ void ServerInputFilterManager::OnEventTouchGetPointEventType(const EventTouch& t } } -bool ServerInputFilterManager::OnTouchEvent(UDSServer& udsServer, libinput_event& event, +bool ServerInputFilterManager::OnTouchEvent(UDSServer& udsServer, libinput_event *event, EventTouch& touch, const uint64_t preHandlerTime, WindowSwitch& windowSwitch) { + CHKF(event, PARAM_INPUT_INVALID); MMI_LOGD("ServerInputFilterManager::OnTouchEvent"); if (touchEventFilterMap_.size() == 0) { MMI_LOGD("touchEventFilterMap_ size is zero"); @@ -248,7 +249,7 @@ bool ServerInputFilterManager::OnTouchEvent(UDSServer& udsServer, libinput_event return false; } - auto device = libinput_event_get_device(&event); + auto device = libinput_event_get_device(event); CHKR(device, NULL_POINTER, LIBINPUT_DEV_EMPTY); MmiMessageId idMsg = MmiMessageId::INVALID; diff --git a/service/touch_transform_point/include/touch_transform_point_manager.h b/service/touch_transform_point/include/touch_transform_point_manager.h index 2d197db86..714d48f13 100644 --- a/service/touch_transform_point/include/touch_transform_point_manager.h +++ b/service/touch_transform_point/include/touch_transform_point_manager.h @@ -26,8 +26,8 @@ namespace OHOS { namespace MMI { class TouchTransformPointManager : public CSingleton { public: - std::shared_ptr onLibinputTouchEvent(libinput_event& event); - std::shared_ptr onLibinputTouchPadEvent(libinput_event& event); + std::shared_ptr onLibinputTouchEvent(libinput_event *event); + std::shared_ptr onLibinputTouchPadEvent(libinput_event *event); private: std::map> processors_; std::map> touchpadpro_; diff --git a/service/touch_transform_point/include/touch_transform_point_processor.h b/service/touch_transform_point/include/touch_transform_point_processor.h index 714a10e44..4e99ee54b 100644 --- a/service/touch_transform_point/include/touch_transform_point_processor.h +++ b/service/touch_transform_point/include/touch_transform_point_processor.h @@ -26,12 +26,12 @@ class TouchTransformPointProcessor { public: TouchTransformPointProcessor(); ~TouchTransformPointProcessor(); - std::shared_ptr onLibinputTouchEvent(libinput_event& event); + std::shared_ptr onLibinputTouchEvent(libinput_event *event); void setPointEventSource(int32_t sourceType); private: - void onEventTouchDown(libinput_event& event); - void onEventTouchMotion(libinput_event& event); - void onEventTouchUp(libinput_event& event); + void onEventTouchDown(libinput_event *event); + void onEventTouchMotion(libinput_event *event); + void onEventTouchUp(libinput_event *event); std::shared_ptr pointerEvent_; }; } diff --git a/service/touch_transform_point/include/touchpad_transform_point_processor.h b/service/touch_transform_point/include/touchpad_transform_point_processor.h index 225d4a5bf..7d815b724 100644 --- a/service/touch_transform_point/include/touchpad_transform_point_processor.h +++ b/service/touch_transform_point/include/touchpad_transform_point_processor.h @@ -26,12 +26,12 @@ class TouchPadTransformPointProcessor { public: TouchPadTransformPointProcessor(); ~TouchPadTransformPointProcessor(); - std::shared_ptr onLibinputTouchPadEvent(libinput_event& event); + std::shared_ptr onLibinputTouchPadEvent(libinput_event *event); void setPointEventSource(int32_t sourceType); private: - void onEventTouchPadDown(libinput_event& event); - void onEventTouchPadMotion(libinput_event& event); - void onEventTouchPadUp(libinput_event& event); + void onEventTouchPadDown(libinput_event *event); + void onEventTouchPadMotion(libinput_event *event); + void onEventTouchPadUp(libinput_event *event); std::shared_ptr pointerEvent_; }; } diff --git a/service/touch_transform_point/src/touch_transform_point_manager.cpp b/service/touch_transform_point/src/touch_transform_point_manager.cpp index 7861b5a4a..6fcff4df3 100644 --- a/service/touch_transform_point/src/touch_transform_point_manager.cpp +++ b/service/touch_transform_point/src/touch_transform_point_manager.cpp @@ -20,10 +20,11 @@ namespace OHOS::MMI { static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "TouchTransformPointManager" }; } constexpr int32_t ID = 1; -std::shared_ptr TouchTransformPointManager::onLibinputTouchEvent(libinput_event& event) +std::shared_ptr TouchTransformPointManager::onLibinputTouchEvent(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, nullptr); std::shared_ptr processor; - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); if (type == LIBINPUT_EVENT_TOUCH_CANCEL || type == LIBINPUT_EVENT_TOUCH_FRAME) { MMI_LOGD("this touch event is canceled"); return nullptr; @@ -39,8 +40,9 @@ std::shared_ptr TouchTransformPointManager::onLibinputTouchEvent(l return processor->onLibinputTouchEvent(event); } -std::shared_ptr TouchTransformPointManager::onLibinputTouchPadEvent(libinput_event& event) +std::shared_ptr TouchTransformPointManager::onLibinputTouchPadEvent(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, nullptr); std::shared_ptr processor; auto it = touchpadpro_.find(ID); if (it != touchpadpro_.end()) { 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 5dcaa2f05..1782f6c94 100644 --- a/service/touch_transform_point/src/touch_transform_point_processor.cpp +++ b/service/touch_transform_point/src/touch_transform_point_processor.cpp @@ -32,13 +32,14 @@ void TouchTransformPointProcessor::setPointEventSource(int32_t sourceType) pointerEvent_->SetSourceType(sourceType); } -void TouchTransformPointProcessor::onEventTouchDown(libinput_event& event) +void TouchTransformPointProcessor::onEventTouchDown(libinput_event *event) { + CHK(event, PARAM_INPUT_INVALID); MMI_LOGD("this touch event is down"); - auto data = libinput_event_get_touch_event(&event); + auto data = libinput_event_get_touch_event(event); auto time = libinput_event_touch_get_time(data); auto seat_slot = libinput_event_touch_get_seat_slot(data); - auto pressure = libinput_event_get_touch_pressure(&event); + auto pressure = libinput_event_get_touch_pressure(event); int32_t id = 1; int32_t logicalY = -1; int32_t logicalX = -1; @@ -70,13 +71,14 @@ void TouchTransformPointProcessor::onEventTouchDown(libinput_event& event) MMI_LOGD("this touch event is down end"); } -void TouchTransformPointProcessor::onEventTouchMotion(libinput_event& event) +void TouchTransformPointProcessor::onEventTouchMotion(libinput_event *event) { + CHK(event, PARAM_INPUT_INVALID); MMI_LOGD("this touch event is motion begin"); - auto data = libinput_event_get_touch_event(&event); + auto data = libinput_event_get_touch_event(event); auto time = libinput_event_touch_get_time(data); auto seat_slot = libinput_event_touch_get_seat_slot(data); - auto pressure = libinput_event_get_touch_pressure(&event); + auto pressure = libinput_event_get_touch_pressure(event); pointerEvent_->SetActionTime(time); pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE); int32_t logicalY = -1; @@ -94,10 +96,11 @@ void TouchTransformPointProcessor::onEventTouchMotion(libinput_event& event) MMI_LOGD("this touch event is motion end"); } -void TouchTransformPointProcessor::onEventTouchUp(libinput_event& event) +void TouchTransformPointProcessor::onEventTouchUp(libinput_event *event) { + CHK(event, PARAM_INPUT_INVALID); MMI_LOGD("this touch event is up"); - auto data = libinput_event_get_touch_event(&event); + auto data = libinput_event_get_touch_event(event); auto time = libinput_event_touch_get_time(data); auto seat_slot = libinput_event_touch_get_seat_slot(data); @@ -113,10 +116,11 @@ void TouchTransformPointProcessor::onEventTouchUp(libinput_event& event) MMI_LOGD("this touch event is up end"); } -std::shared_ptr TouchTransformPointProcessor::onLibinputTouchEvent(libinput_event& event) +std::shared_ptr TouchTransformPointProcessor::onLibinputTouchEvent(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, nullptr); MMI_LOGD("call onLibinputTouchEvent begin"); - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); if (pointerEvent_ == nullptr) { MMI_LOGE("pointerEvent_ is nullptr"); return nullptr; 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 8133e6673..1a40363d2 100644 --- a/service/touch_transform_point/src/touchpad_transform_point_processor.cpp +++ b/service/touch_transform_point/src/touchpad_transform_point_processor.cpp @@ -35,10 +35,11 @@ void OHOS::MMI::TouchPadTransformPointProcessor::setPointEventSource(int32_t sou pointerEvent_->SetSourceType(sourceType); } -void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadDown(libinput_event& event) +void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadDown(libinput_event *event) { + CHK(event, PARAM_INPUT_INVALID); MMI_LOGD("this touch pad event is down begin"); - auto data = libinput_event_get_touchpad_event(&event); + auto data = libinput_event_get_touchpad_event(event); auto time = libinput_event_touchpad_get_time(data); auto seat_slot = libinput_event_touchpad_get_seat_slot(data); auto logicalX = libinput_event_touchpad_get_x(data); @@ -64,10 +65,11 @@ void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadDown(libinput_ev MMI_LOGD("this touch pad event is down end"); } -void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadMotion(libinput_event& event) +void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadMotion(libinput_event *event) { + CHK(event, PARAM_INPUT_INVALID); MMI_LOGD("this touch pad event is motion begin"); - auto data = libinput_event_get_touchpad_event(&event); + auto data = libinput_event_get_touchpad_event(event); auto time = libinput_event_touchpad_get_time(data); auto seat_slot = libinput_event_touchpad_get_seat_slot(data); auto logicalX = libinput_event_touchpad_get_x(data); @@ -85,10 +87,11 @@ void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadMotion(libinput_ MMI_LOGD("this touch pad event is motion end"); } -void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadUp(libinput_event& event) +void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadUp(libinput_event *event) { + CHK(event, PARAM_INPUT_INVALID); MMI_LOGD("this touch pad event is up begin"); - auto data = libinput_event_get_touchpad_event(&event); + auto data = libinput_event_get_touchpad_event(event); auto time = libinput_event_touchpad_get_time(data); auto seat_slot = libinput_event_touchpad_get_seat_slot(data); auto logicalX = libinput_event_touchpad_get_x(data); @@ -108,10 +111,11 @@ void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadUp(libinput_even MMI_LOGD("this touch pad event is up end"); } -std::shared_ptr OHOS::MMI::TouchPadTransformPointProcessor::onLibinputTouchPadEvent(libinput_event& event) +std::shared_ptr OHOS::MMI::TouchPadTransformPointProcessor::onLibinputTouchPadEvent(libinput_event *event) { + CHKR(event, PARAM_INPUT_INVALID, nullptr); MMI_LOGD("call onLibinputTouchPadEvent begin"); - auto type = libinput_event_get_type(&event); + auto type = libinput_event_get_type(event); switch (type) { case LIBINPUT_EVENT_TOUCHPAD_DOWN: { onEventTouchPadDown(event); -- Gitee From 624c826d6df42fa2364bdf338da6876ce5302743 Mon Sep 17 00:00:00 2001 From: bobz202 Date: Mon, 17 Jan 2022 11:36:09 +0800 Subject: [PATCH 2/5] The warning to clean up Signed-off-by: bobz202 --- service/event_dispatch/src/event_dispatch.cpp | 21 +------------------ .../event_handle/src/input_event_handler.cpp | 6 ++++-- service/event_package/include/event_package.h | 2 +- .../include/mouse_event_handler.h | 2 +- .../src/touch_transform_point_manager.cpp | 2 +- .../touchpad_transform_point_processor.cpp | 3 ++- 6 files changed, 10 insertions(+), 26 deletions(-) diff --git a/service/event_dispatch/src/event_dispatch.cpp b/service/event_dispatch/src/event_dispatch.cpp index 849ffcebe..801e9a922 100644 --- a/service/event_dispatch/src/event_dispatch.cpp +++ b/service/event_dispatch/src/event_dispatch.cpp @@ -740,16 +740,6 @@ int32_t OHOS::MMI::EventDispatch::DispatchKeyEventByPid(UDSServer& udsServer, return RET_OK; } int32_t ret = RET_OK; - // int32_t ret = RET_OK; - // ret = KeyBoardRegisteredEventHandler(key, udsServer, event, INPUT_DEVICE_CAP_KEYBOARD, preHandlerTime); - // if (ret != RET_OK) { - // MMI_LOGE("Special Registered Event dispatch failed return:%{public}d errCode:%{public}d", ret, - // SPCL_REG_EVENT_DISP_FAIL); - // } - // MmiMessageId idMsg = MmiMessageId::INVALID; - // EventKeyboard prevKey = {}; - // MMIRegEvent->OnEventKeyGetSign(key, idMsg, prevKey); - auto fd = WinMgr->UpdateTarget(key); CHKR(fd > 0, FD_OBTAIN_FAIL, RET_ERR); #ifdef DEBUG_CODE_TEST @@ -765,16 +755,7 @@ int32_t OHOS::MMI::EventDispatch::DispatchKeyEventByPid(UDSServer& udsServer, key->GetActionStartTime(), key->GetEventType(), key->GetFlag(), key->GetKeyAction(), fd, preHandlerTime); - /* - if (AppRegs->IsMultimodeInputReady(MmiMessageId::ON_KEY, fd, 0)) { - NetPacket newPkt(MmiMessageId::ON_KEY); - newPkt << key << appInfo.abilityId << focusId << appInfo.fd << preHandlerTime; - if (!udsServer.SendMsg(appInfo.fd, newPkt)) { - MMI_LOGE("Sending structure of EventKeyboard failed! errCode:%{public}d\n", MSG_SEND_FAIL); - return MSG_SEND_FAIL; - } - } - */ + IEMServiceManager.ReportKeyEvent(key); NetPacket newPkt(MmiMessageId::ON_KEYEVENT); InputEventDataTransformation::KeyEventToNetPacket(key, newPkt); diff --git a/service/event_handle/src/input_event_handler.cpp b/service/event_handle/src/input_event_handler.cpp index 0e4566ac2..bf1154787 100644 --- a/service/event_handle/src/input_event_handler.cpp +++ b/service/event_handle/src/input_event_handler.cpp @@ -686,7 +686,8 @@ int32_t OHOS::MMI::InputEventHandler::OnGestureEvent(libinput_event *event) MMI_LOGD("interceptor of OnGestureEvent end ....."); return RET_OK; } - auto eventDispatchResult = eventDispatch_.DispatchGestureNewEvent(*udsServer_, event, pointerEvent, preHandlerTime); + auto eventDispatchResult = eventDispatch_.DispatchGestureNewEvent(*udsServer_, event, + pointerEvent, preHandlerTime); if (eventDispatchResult != RET_OK) { MMI_LOGE("Gesture New event dispatch failed... ret:%{public}d errCode:%{public}d", eventDispatchResult, GESTURE_EVENT_DISP_FAIL); @@ -734,7 +735,8 @@ int32_t OHOS::MMI::InputEventHandler::OnEventTabletTool(multimodal_libinput_even return TABLETTOOL_EVENT_PKG_FAIL; } MMI_LOGT("\n2.mapping event:\nEvent:eventType=%{public}d;", tableTool.eventType); - auto retEvent = eventDispatch_.DispatchTabletToolEvent(*udsServer_, ev.event, tableTool, preHandlerTime, winSwitch_); + auto retEvent = eventDispatch_.DispatchTabletToolEvent(*udsServer_, ev.event, tableTool, + preHandlerTime, winSwitch_); if (retEvent != RET_OK) { MMI_LOGE("Tabletool event dispatch failed... ret:%{public}d errCode:%{public}d", retEvent, TABLETTOOL_EVENT_DISP_FAIL); diff --git a/service/event_package/include/event_package.h b/service/event_package/include/event_package.h index bbefff677..ad6d935b5 100644 --- a/service/event_package/include/event_package.h +++ b/service/event_package/include/event_package.h @@ -37,7 +37,7 @@ namespace OHOS::MMI { int32_t PackageTabletPadEvent(libinput_event *event, EventTabletPad& tabletPad, UDSServer& udsServer); int32_t PackageDeviceManageEvent(libinput_event *event, DeviceManage& deviceManage, UDSServer& udsServer); int32_t PackageKeyEvent(libinput_event *event, EventKeyboard& key, UDSServer& udsServer); - int32_t PackageKeyEvent(libinput_event *event, std::shared_ptr kevnPtr, + int32_t PackageKeyEvent(libinput_event *event, std::shared_ptr kevnPtr, UDSServer& udsServer); int32_t PackageGestureEvent(libinput_event *event, EventGesture& gesture, UDSServer& udsServer); int32_t PackagePointerEvent(multimodal_libinput_event &ev, EventPointer& point, diff --git a/service/mouse_event_handler/include/mouse_event_handler.h b/service/mouse_event_handler/include/mouse_event_handler.h index 6a6891430..2747e2791 100644 --- a/service/mouse_event_handler/include/mouse_event_handler.h +++ b/service/mouse_event_handler/include/mouse_event_handler.h @@ -30,7 +30,7 @@ public: void SetMouseData(libinput_event *event, int32_t deviceId); static std::shared_ptr Create() { - return std::shared_ptr(new MouseEventHandler(InputEvent::EVENT_TYPE_POINTER)); + return std::make_shared(InputEvent::EVENT_TYPE_POINTER); } static int32_t SetMouseEndData(std::shared_ptr pointerEvent, int32_t deviceId); protected: diff --git a/service/touch_transform_point/src/touch_transform_point_manager.cpp b/service/touch_transform_point/src/touch_transform_point_manager.cpp index 6fcff4df3..1fee15a12 100644 --- a/service/touch_transform_point/src/touch_transform_point_manager.cpp +++ b/service/touch_transform_point/src/touch_transform_point_manager.cpp @@ -40,7 +40,7 @@ std::shared_ptr TouchTransformPointManager::onLibinputTouchEvent(l return processor->onLibinputTouchEvent(event); } -std::shared_ptr TouchTransformPointManager::onLibinputTouchPadEvent(libinput_event *event) +std::shared_ptr TouchTransformPointManager::onLibinputTouchPadEvent(libinput_event *event) { CHKR(event, PARAM_INPUT_INVALID, nullptr); std::shared_ptr processor; 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 1a40363d2..c89e03bfa 100644 --- a/service/touch_transform_point/src/touchpad_transform_point_processor.cpp +++ b/service/touch_transform_point/src/touchpad_transform_point_processor.cpp @@ -111,7 +111,8 @@ void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadUp(libinput_even MMI_LOGD("this touch pad event is up end"); } -std::shared_ptr OHOS::MMI::TouchPadTransformPointProcessor::onLibinputTouchPadEvent(libinput_event *event) +std::shared_ptr +OHOS::MMI::TouchPadTransformPointProcessor::onLibinputTouchPadEvent(libinput_event *event) { CHKR(event, PARAM_INPUT_INVALID, nullptr); MMI_LOGD("call onLibinputTouchPadEvent begin"); -- Gitee From 9485dfc0af9f45cee06233bcc5d06152a487f01f Mon Sep 17 00:00:00 2001 From: bobz202 Date: Mon, 17 Jan 2022 12:15:23 +0800 Subject: [PATCH 3/5] The warning to clean up Signed-off-by: bobz202 --- service/mouse_event_handler/include/mouse_event_handler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/mouse_event_handler/include/mouse_event_handler.h b/service/mouse_event_handler/include/mouse_event_handler.h index 2747e2791..6a6891430 100644 --- a/service/mouse_event_handler/include/mouse_event_handler.h +++ b/service/mouse_event_handler/include/mouse_event_handler.h @@ -30,7 +30,7 @@ public: void SetMouseData(libinput_event *event, int32_t deviceId); static std::shared_ptr Create() { - return std::make_shared(InputEvent::EVENT_TYPE_POINTER); + return std::shared_ptr(new MouseEventHandler(InputEvent::EVENT_TYPE_POINTER)); } static int32_t SetMouseEndData(std::shared_ptr pointerEvent, int32_t deviceId); protected: -- Gitee From 5ccf92009246d901941b936e79b118356fcf31c2 Mon Sep 17 00:00:00 2001 From: bobz202 Date: Mon, 17 Jan 2022 13:22:49 +0800 Subject: [PATCH 4/5] The warning to clean up Signed-off-by: bobz202 --- service/event_dispatch/src/event_dispatch.cpp | 5 ++--- service/event_handle/src/input_event_handler.cpp | 2 +- .../src/touchpad_transform_point_processor.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/service/event_dispatch/src/event_dispatch.cpp b/service/event_dispatch/src/event_dispatch.cpp index 801e9a922..04ba99fee 100644 --- a/service/event_dispatch/src/event_dispatch.cpp +++ b/service/event_dispatch/src/event_dispatch.cpp @@ -732,14 +732,13 @@ int32_t OHOS::MMI::EventDispatch::DispatchKeyEventByPid(UDSServer& udsServer, { MMI_LOGD("DispatchKeyEventByPid begin"); if (AbilityMgr->CheckLaunchAbility(key)) { - MMI_LOGD("keyEvent start launch an ability, keyCode : %{puiblic}d", key->GetKeyCode()); + MMI_LOGD("keyEvent start launch an ability, keyCode=%{puiblic}d", key->GetKeyCode()); return RET_OK; } if (KeyEventInputSubscribeFlt.FilterSubscribeKeyEvent(udsServer, key)) { MMI_LOGD("subscribe keyEvent filter success. keyCode=%{puiblic}d", key->GetKeyCode()); return RET_OK; } - int32_t ret = RET_OK; auto fd = WinMgr->UpdateTarget(key); CHKR(fd > 0, FD_OBTAIN_FAIL, RET_ERR); #ifdef DEBUG_CODE_TEST @@ -765,7 +764,7 @@ int32_t OHOS::MMI::EventDispatch::DispatchKeyEventByPid(UDSServer& udsServer, return MSG_SEND_FAIL; } MMI_LOGD("DispatchKeyEventByPid end"); - return ret; + return RET_OK; } int32_t OHOS::MMI::EventDispatch::DispatchKeyEvent(UDSServer& udsServer, libinput_event *event, diff --git a/service/event_handle/src/input_event_handler.cpp b/service/event_handle/src/input_event_handler.cpp index bf1154787..47fb26c34 100644 --- a/service/event_handle/src/input_event_handler.cpp +++ b/service/event_handle/src/input_event_handler.cpp @@ -686,7 +686,7 @@ int32_t OHOS::MMI::InputEventHandler::OnGestureEvent(libinput_event *event) MMI_LOGD("interceptor of OnGestureEvent end ....."); return RET_OK; } - auto eventDispatchResult = eventDispatch_.DispatchGestureNewEvent(*udsServer_, event, + auto eventDispatchResult = eventDispatch_.DispatchGestureNewEvent(*udsServer_, event, pointerEvent, preHandlerTime); if (eventDispatchResult != RET_OK) { MMI_LOGE("Gesture New event dispatch failed... ret:%{public}d errCode:%{public}d", 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 c89e03bfa..e13f83dc6 100644 --- a/service/touch_transform_point/src/touchpad_transform_point_processor.cpp +++ b/service/touch_transform_point/src/touchpad_transform_point_processor.cpp @@ -18,8 +18,8 @@ namespace OHOS::MMI { namespace { - static constexpr OHOS::HiviewDFX::HiLogLabel LABEL - = {LOG_CORE, MMI_LOG_DOMAIN, "TouchPadTransformPointProcessor"}; + static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, + "TouchPadTransformPointProcessor"}; } } @@ -111,8 +111,8 @@ void OHOS::MMI::TouchPadTransformPointProcessor::onEventTouchPadUp(libinput_even MMI_LOGD("this touch pad event is up end"); } -std::shared_ptr -OHOS::MMI::TouchPadTransformPointProcessor::onLibinputTouchPadEvent(libinput_event *event) +std::shared_ptr OHOS::MMI::TouchPadTransformPointProcessor::onLibinputTouchPadEvent( + libinput_event *event) { CHKR(event, PARAM_INPUT_INVALID, nullptr); MMI_LOGD("call onLibinputTouchPadEvent begin"); -- Gitee From 576b9445ed5cb3f42d0b34ba29206b73b1f9dbfd Mon Sep 17 00:00:00 2001 From: bobz202 Date: Mon, 17 Jan 2022 13:52:01 +0800 Subject: [PATCH 5/5] The warning to clean up Signed-off-by: bobz202 --- service/event_dispatch/src/event_dispatch.cpp | 4 ++-- .../src/touchpad_transform_point_processor.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/service/event_dispatch/src/event_dispatch.cpp b/service/event_dispatch/src/event_dispatch.cpp index 04ba99fee..b18a4b1b6 100644 --- a/service/event_dispatch/src/event_dispatch.cpp +++ b/service/event_dispatch/src/event_dispatch.cpp @@ -732,11 +732,11 @@ int32_t OHOS::MMI::EventDispatch::DispatchKeyEventByPid(UDSServer& udsServer, { MMI_LOGD("DispatchKeyEventByPid begin"); if (AbilityMgr->CheckLaunchAbility(key)) { - MMI_LOGD("keyEvent start launch an ability, keyCode=%{puiblic}d", key->GetKeyCode()); + MMI_LOGD("keyEvent start launch an ability, keyCode=%{public}d", key->GetKeyCode()); return RET_OK; } if (KeyEventInputSubscribeFlt.FilterSubscribeKeyEvent(udsServer, key)) { - MMI_LOGD("subscribe keyEvent filter success. keyCode=%{puiblic}d", key->GetKeyCode()); + MMI_LOGD("subscribe keyEvent filter success. keyCode=%{public}d", key->GetKeyCode()); return RET_OK; } auto fd = WinMgr->UpdateTarget(key); 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 e13f83dc6..d7ebc6385 100644 --- a/service/touch_transform_point/src/touchpad_transform_point_processor.cpp +++ b/service/touch_transform_point/src/touchpad_transform_point_processor.cpp @@ -18,7 +18,7 @@ namespace OHOS::MMI { namespace { - static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, + static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "TouchPadTransformPointProcessor"}; } } -- Gitee