diff --git a/services/aams/src/accessibility_gesture_recognizer.cpp b/services/aams/src/accessibility_gesture_recognizer.cpp old mode 100644 new mode 100755 index 86719be41c5ecfeb7988f97d542b6cde68a2cc49..4b34778c56bf2bfd4f672b328636c9408ea25c4a --- a/services/aams/src/accessibility_gesture_recognizer.cpp +++ b/services/aams/src/accessibility_gesture_recognizer.cpp @@ -154,8 +154,8 @@ void AccessibilityGestureRecognizer::HandleTouchDownEvent(MMI::PointerEvent &eve if (!event.GetPointerItem(event.GetPointerId(), pointerIterm)) { HILOG_WARN("get GetPointerItem(%d) failed", event.GetPointerId()); } - mp.px_ = static_cast(pointerIterm.GetGlobalX()); - mp.py_ = static_cast(pointerIterm.GetGlobalY()); + mp.px_ = static_cast(pointerIterm.GetDisplayX()); + mp.py_ = static_cast(pointerIterm.GetDisplayY()); isDoubleTap_ = false; isRecognizingGesture_ = true; isGestureStarted_ = false; @@ -176,8 +176,8 @@ bool AccessibilityGestureRecognizer::HandleTouchMoveEvent(MMI::PointerEvent &eve HILOG_ERROR("get GetPointerItem(%d) failed", event.GetPointerId()); } int64_t eventTime = event.GetActionTime(); - float offsetX = startPointer_.GetGlobalX() - pointerIterm.GetGlobalX(); - float offsetY = startPointer_.GetGlobalY() - pointerIterm.GetGlobalY(); + float offsetX = startPointer_.GetDisplayX() - pointerIterm.GetDisplayX(); + float offsetY = startPointer_.GetDisplayY() - pointerIterm.GetDisplayY(); double duration = hypot(offsetX, offsetY); if (isRecognizingGesture_) { if (duration > threshold_) { @@ -201,11 +201,11 @@ bool AccessibilityGestureRecognizer::HandleTouchMoveEvent(MMI::PointerEvent &eve return listener_->OnCancelled(event); } } - if ((abs(pointerIterm.GetGlobalX() - prePointer_.GetGlobalX())) >= xMinPixels_ || - (abs(pointerIterm.GetGlobalY() - prePointer_.GetGlobalY())) >= yMinPixels_) { + if ((abs(pointerIterm.GetDisplayX() - prePointer_.GetDisplayX())) >= xMinPixels_ || + (abs(pointerIterm.GetDisplayY() - prePointer_.GetDisplayY())) >= yMinPixels_) { prePointer_ = pointerIterm; - mp.px_ = pointerIterm.GetGlobalX(); - mp.py_ = pointerIterm.GetGlobalY(); + mp.px_ = pointerIterm.GetDisplayX(); + mp.py_ = pointerIterm.GetDisplayY(); pointerRoute_.push_back(mp); } } @@ -229,10 +229,10 @@ bool AccessibilityGestureRecognizer::HandleTouchUpEvent(MMI::PointerEvent &event return DoubleTapRecognized(event); } if (isGestureStarted_) { - if ((abs(pointerIterm.GetGlobalX() - prePointer_.GetGlobalX())) >= xMinPixels_ || - (abs(pointerIterm.GetGlobalY() - prePointer_.GetGlobalY())) >= yMinPixels_) { - mp.px_ = pointerIterm.GetGlobalX(); - mp.py_ = pointerIterm.GetGlobalY(); + if ((abs(pointerIterm.GetDisplayX() - prePointer_.GetDisplayX())) >= xMinPixels_ || + (abs(pointerIterm.GetDisplayY() - prePointer_.GetDisplayY())) >= yMinPixels_) { + mp.px_ = pointerIterm.GetDisplayX(); + mp.py_ = pointerIterm.GetDisplayY(); pointerRoute_.push_back(mp); } return recognizeDirectionGesture(event); @@ -429,8 +429,8 @@ bool AccessibilityGestureRecognizer::isDoubleTap(MMI::PointerEvent &event) MMI::PointerEvent::PointerItem firstPI; pCurDown_->GetPointerItem(pCurDown_->GetPointerId(), firstPI); - int32_t durationX = firstPI.GetGlobalX() - curPI.GetGlobalX(); - int32_t durationY = firstPI.GetGlobalY() - curPI.GetGlobalY(); + int32_t durationX = firstPI.GetDisplayX() - curPI.GetDisplayX(); + int32_t durationY = firstPI.GetDisplayY() - curPI.GetDisplayY(); return (durationX * durationX + durationY * durationY < doubleTapScaledSlop_); } diff --git a/services/aams/src/accessibility_mouse_autoclick.cpp b/services/aams/src/accessibility_mouse_autoclick.cpp old mode 100644 new mode 100755 index a69db1b52d7a431336a8bd668a518b24c7e4bb21..42c97a3c17580a9c0d17bdb244dcf6be4519bd40 --- a/services/aams/src/accessibility_mouse_autoclick.cpp +++ b/services/aams/src/accessibility_mouse_autoclick.cpp @@ -148,13 +148,13 @@ bool AccessibilityMouseAutoclick::IsMouseMovement(MMI::PointerEvent &event) int32_t pointerId = event.GetPointerId(); MMI::PointerEvent::PointerItem item; event.GetPointerItem(pointerId, item); - int32_t newX = item.GetGlobalX(); - int32_t newY = item.GetGlobalY(); + int32_t newX = item.GetDisplayX(); + int32_t newY = item.GetDisplayY(); pointerId = lastMouseEvent_->GetPointerId(); lastMouseEvent_->GetPointerItem(pointerId, item); - int32_t oldX = item.GetGlobalX(); - int32_t oldY = item.GetGlobalY(); + int32_t oldX = item.GetDisplayX(); + int32_t oldY = item.GetDisplayY(); if ((newX != oldX) || (newY != oldY)) { return true; } diff --git a/services/aams/src/accessibility_touchEvent_injector.cpp b/services/aams/src/accessibility_touchEvent_injector.cpp old mode 100644 new mode 100755 index 7a1da08b88dc53d0b1f713918f39c08026b06068..4da955cd1c67aae761dd70eb35aede4c0adf694d --- a/services/aams/src/accessibility_touchEvent_injector.cpp +++ b/services/aams/src/accessibility_touchEvent_injector.cpp @@ -222,8 +222,8 @@ void TouchEventInjector::ParseTapsEvents(int64_t startTime) // Append down event int32_t px = static_cast(positions[i].positionX_); int32_t py = static_cast(positions[i].positionY_); - pointer.SetGlobalX(px); - pointer.SetGlobalY(py); + pointer.SetDisplayX(px); + pointer.SetDisplayY(py); pointer.SetDownTime(downTime); event = obtainTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, pointer, downTime); HILOG_DEBUG("append down event"); @@ -263,8 +263,8 @@ void TouchEventInjector::ParseMovesEvents(int64_t startTime) int32_t px = static_cast(positions[i].positionX_); int32_t py = static_cast(positions[i].positionY_); pointer.SetPointerId(1); - pointer.SetGlobalX(px); - pointer.SetGlobalY(py); + pointer.SetDisplayX(px); + pointer.SetDisplayY(py); pointer.SetDownTime(downTime); if (i == 0) { // Append down event HILOG_DEBUG("append down event"); diff --git a/services/aams/src/accessibility_touch_guider.cpp b/services/aams/src/accessibility_touch_guider.cpp old mode 100644 new mode 100755 index 3f125b146107b8e2f4ef969374f364ac4d40f153..1e1dbe5433addf0a7a015ac7fdd1e110f20932c2 --- a/services/aams/src/accessibility_touch_guider.cpp +++ b/services/aams/src/accessibility_touch_guider.cpp @@ -450,8 +450,8 @@ void TouchGuider::HandleTransmitingState(MMI::PointerEvent &event) // Adjust this event's location. MMI::PointerEvent::PointerItem pointer = {}; event.GetPointerItem(event.GetPointerId(), pointer); - pointer.SetGlobalX(pointer.GetGlobalX() + longPressOffsetX_); - pointer.SetGlobalY(pointer.GetGlobalY() + longPressOffsetY_); + pointer.SetDisplayX(pointer.GetDisplayX() + longPressOffsetX_); + pointer.SetDisplayY(pointer.GetDisplayY() + longPressOffsetY_); event.RemovePointerItem(event.GetPointerId()); event.AddPointerItem(pointer); longPressPointId_ = INIT_POINT_ID; @@ -598,10 +598,10 @@ void TouchGuider::HandleDraggingStateInnerMove(MMI::PointerEvent &event) MMI::PointerEvent::PointerItem pointerS = {}; event.GetPointerItem(pIds[INDEX_0], pointerF); event.GetPointerItem(pIds[INDEX_1], pointerS); - float xPointF = pointerF.GetGlobalX(); - float xPointS = pointerS.GetGlobalX(); - float yPointF = pointerF.GetGlobalY(); - float yPointS = pointerS.GetGlobalY(); + float xPointF = pointerF.GetDisplayX(); + float xPointS = pointerS.GetDisplayX(); + float yPointF = pointerF.GetDisplayY(); + float yPointS = pointerS.GetDisplayY(); float offsetX = abs(xPointF - xPointS); float offsetY = abs(yPointF - yPointS); double duration = hypot(offsetX, offsetY); @@ -609,8 +609,8 @@ void TouchGuider::HandleDraggingStateInnerMove(MMI::PointerEvent &event) // Adjust this event's location. MMI::PointerEvent::PointerItem pointer = {}; event.GetPointerItem(event.GetPointerId(), pointer); - pointer.SetGlobalX(pointer.GetGlobalX() + DIVIDE_2(offsetX)); - pointer.SetGlobalY(pointer.GetGlobalY() + DIVIDE_2(offsetY)); + pointer.SetDisplayX(pointer.GetDisplayX() + DIVIDE_2(offsetX)); + pointer.SetDisplayY(pointer.GetDisplayY() + DIVIDE_2(offsetY)); event.RemovePointerItem(event.GetPointerId()); event.AddPointerItem(pointer); } @@ -648,10 +648,10 @@ bool TouchGuider::IsDragGestureAccept(MMI::PointerEvent &event) HILOG_WARN("GetPointerItem(%d) failed", pIds[1]); } - float xPointF = pointerF.GetGlobalX(); - float xPointS = pointerS.GetGlobalX(); - float yPointF = pointerF.GetGlobalY(); - float yPointS = pointerS.GetGlobalY(); + float xPointF = pointerF.GetDisplayX(); + float xPointS = pointerS.GetDisplayX(); + float yPointF = pointerF.GetDisplayY(); + float yPointS = pointerS.GetDisplayY(); float xPointDownF = receivedRecorder_.pointerDownX[INDEX_0]; float xPointDownS = receivedRecorder_.pointerDownX[INDEX_1]; float yPointDownF = receivedRecorder_.pointerDownY[INDEX_0]; @@ -715,8 +715,8 @@ void TouchGuider::RecordReceivedEvent(MMI::PointerEvent &event) receivedRecorder_.lastEvent = std::make_shared(event); switch (event.GetPointerAction()) { case MMI::PointerEvent::POINTER_ACTION_DOWN: - receivedRecorder_.pointerDownX[pointId] = pointer.GetGlobalX(); - receivedRecorder_.pointerDownY[pointId] = pointer.GetGlobalY(); + receivedRecorder_.pointerDownX[pointId] = pointer.GetDisplayX(); + receivedRecorder_.pointerDownY[pointId] = pointer.GetDisplayY(); break; case MMI::PointerEvent::POINTER_ACTION_UP: receivedRecorder_.pointerDownX[pointId] = 0; diff --git a/services/aams/src/accessibility_zoom_gesture.cpp b/services/aams/src/accessibility_zoom_gesture.cpp old mode 100644 new mode 100755 index 234b9f9427a9c6d67e084ec220d040d7bd6165f1..ea9b0426a041c4abba628a075df8eca58168823a --- a/services/aams/src/accessibility_zoom_gesture.cpp +++ b/services/aams/src/accessibility_zoom_gesture.cpp @@ -382,8 +382,8 @@ void AccessibilityZoomGesture::CalcFocusCoordinate(MMI::PointerEvent &event, ZOO } MMI::PointerEvent::PointerItem item; event.GetPointerItem(pointerId, item); - sumX += static_cast(item.GetGlobalX()); - sumY += static_cast(item.GetGlobalY()); + sumX += static_cast(item.GetDisplayX()); + sumY += static_cast(item.GetDisplayY()); } coordinate.centerX = sumX / count; @@ -420,8 +420,8 @@ float AccessibilityZoomGesture::CalcScaleSpan(MMI::PointerEvent &event, ZOOM_FOC } MMI::PointerEvent::PointerItem item; event.GetPointerItem(pointerId, item); - sumSpanX += static_cast(abs(item.GetGlobalX() - coordinate.centerX)); - sumSpanY += static_cast(abs(item.GetGlobalY() - coordinate.centerY)); + sumSpanX += static_cast(abs(item.GetDisplayX() - coordinate.centerX)); + sumSpanY += static_cast(abs(item.GetDisplayY() - coordinate.centerY)); } float spanX = sumSpanX / count; @@ -511,8 +511,8 @@ float AccessibilityZoomGesture::CalcSeparationDistance(std::shared_ptrGetPointerItem(firstEvent->GetPointerId(), firstItem); secondEvent->GetPointerItem(secondEvent->GetPointerId(), secondItem); - int32_t durationX = secondItem.GetGlobalX() - firstItem.GetGlobalX(); - int32_t durationY = secondItem.GetGlobalY() - firstItem.GetGlobalY(); + int32_t durationX = secondItem.GetDisplayX() - firstItem.GetDisplayX(); + int32_t durationY = secondItem.GetDisplayY() - firstItem.GetDisplayY(); float distance = static_cast(hypot(durationX, durationY)); return distance; @@ -528,8 +528,8 @@ void AccessibilityZoomGesture::OnTripleTaps(MMI::PointerEvent &event) int32_t pointerId = event.GetPointerId(); MMI::PointerEvent::PointerItem item; event.GetPointerItem(pointerId, item); - int32_t centerX = item.GetGlobalX(); - int32_t centerY = item.GetGlobalY(); + int32_t centerX = item.GetDisplayX(); + int32_t centerY = item.GetDisplayY(); zoomHandler_->OnZoomIn(centerX, centerY); break; } diff --git a/services/aams/test/mock/src/mock_accessibility_gesture_recognizer.cpp b/services/aams/test/mock/src/mock_accessibility_gesture_recognizer.cpp old mode 100644 new mode 100755 index e98ca19e9c2cf5562a1ee61ca6d5c1570ad8da9b..a3e70f0c6b114a5f31efd9d632a4c234572e6916 --- a/services/aams/test/mock/src/mock_accessibility_gesture_recognizer.cpp +++ b/services/aams/test/mock/src/mock_accessibility_gesture_recognizer.cpp @@ -151,8 +151,8 @@ void AccessibilityGestureRecognizer::HandleTouchDownEvent(MMI::PointerEvent& eve if (!event.GetPointerItem(event.GetPointerId(), pointerIterm)) { HILOG_ERROR("get GetPointerItem(%d) failed", event.GetPointerId()); } - mp.px_ = static_cast(pointerIterm.GetGlobalX()); - mp.py_ = static_cast(pointerIterm.GetGlobalY()); + mp.px_ = static_cast(pointerIterm.GetDisplayX()); + mp.py_ = static_cast(pointerIterm.GetDisplayY()); isDoubleTap_ = false; isRecognizingGesture_ = true; isGestureStarted_ = false; @@ -173,8 +173,8 @@ bool AccessibilityGestureRecognizer::HandleTouchMoveEvent(MMI::PointerEvent& eve HILOG_ERROR("get GetPointerItem(%d) failed", event.GetPointerId()); } int64_t eventTime = event.GetActionTime() / US_TO_MS; - float offsetX = startPointer_.GetGlobalX() - pointerIterm.GetGlobalX(); - float offsetY = startPointer_.GetGlobalY() - pointerIterm.GetGlobalY(); + float offsetX = startPointer_.GetDisplayX() - pointerIterm.GetDisplayX(); + float offsetY = startPointer_.GetDisplayY() - pointerIterm.GetDisplayY(); double duration = hypot(offsetX, offsetY); if (isRecognizingGesture_) { if (duration > threshold_) { @@ -197,11 +197,11 @@ bool AccessibilityGestureRecognizer::HandleTouchMoveEvent(MMI::PointerEvent& eve return listener_->OnCancelled(event); } } - if ((abs(pointerIterm.GetGlobalX() - prePointer_.GetGlobalX())) >= xMinPixels_ || - (abs(pointerIterm.GetGlobalY() - prePointer_.GetGlobalY())) >= yMinPixels_) { + if ((abs(pointerIterm.GetDisplayX() - prePointer_.GetDisplayX())) >= xMinPixels_ || + (abs(pointerIterm.GetDisplayY() - prePointer_.GetDisplayY())) >= yMinPixels_) { prePointer_ = pointerIterm; - mp.px_ = pointerIterm.GetGlobalX(); - mp.py_ = pointerIterm.GetGlobalY(); + mp.px_ = pointerIterm.GetDisplayX(); + mp.py_ = pointerIterm.GetDisplayY(); pointerRoute_.push_back(mp); } } @@ -225,10 +225,10 @@ bool AccessibilityGestureRecognizer::HandleTouchUpEvent(MMI::PointerEvent& event return DoubleTapRecognized(event); } if (isGestureStarted_) { - if ((abs(pointerIterm.GetGlobalX() - prePointer_.GetGlobalX())) >= xMinPixels_ || - (abs(pointerIterm.GetGlobalY() - prePointer_.GetGlobalY())) >= yMinPixels_) { - mp.px_ = pointerIterm.GetGlobalX(); - mp.py_ = pointerIterm.GetGlobalY(); + if ((abs(pointerIterm.GetDisplayX() - prePointer_.GetDisplayX())) >= xMinPixels_ || + (abs(pointerIterm.GetDisplayY() - prePointer_.GetDisplayY())) >= yMinPixels_) { + mp.px_ = pointerIterm.GetDisplayX(); + mp.py_ = pointerIterm.GetDisplayY(); pointerRoute_.push_back(mp); } return recognizeDirectionGesture(event); @@ -421,8 +421,8 @@ bool AccessibilityGestureRecognizer::isDoubleTap(MMI::PointerEvent& event) MMI::PointerEvent::PointerItem firstPI; pCurDown_->GetPointerItem(pCurDown_->GetPointerId(), firstPI); - int32_t durationX = firstPI.GetGlobalX() - curPI.GetGlobalX(); - int32_t durationY = firstPI.GetGlobalY() - curPI.GetGlobalY(); + int32_t durationX = firstPI.GetDisplayX() - curPI.GetDisplayX(); + int32_t durationY = firstPI.GetDisplayY() - curPI.GetDisplayY(); return (durationX * durationX + durationY * durationY < doubleTapScaledSlop_); } diff --git a/services/aams/test/mock/src/mock_accessibility_touch_guider.cpp b/services/aams/test/mock/src/mock_accessibility_touch_guider.cpp old mode 100644 new mode 100755 index fc40352791508f7e37d2de3810b5e175f56b5f3e..fff36148e21ff04d2e8848cb7a9fef1b27cfcf12 --- a/services/aams/test/mock/src/mock_accessibility_touch_guider.cpp +++ b/services/aams/test/mock/src/mock_accessibility_touch_guider.cpp @@ -226,8 +226,8 @@ void TouchGuider::TouchGuideListener::OnDoubleTapLongPress(MMI::PointerEvent& ev return; } MMI::PointerEvent::PointerItem eventPoint = {}; - server_.longPressOffsetX_ = eventPoint.GetGlobalX() - clickPoint.GetGlobalX(); - server_.longPressOffsetY_ = eventPoint.GetGlobalY() - clickPoint.GetGlobalY(); + server_.longPressOffsetX_ = eventPoint.GetDisplayX() - clickPoint.GetDisplayX(); + server_.longPressOffsetY_ = eventPoint.GetDisplayY() - clickPoint.GetDisplayY(); server_.currentState_ = static_cast(TouchGuideState::TRANSMITTING); } @@ -411,8 +411,8 @@ void TouchGuider::HandleTransmitingState(MMI::PointerEvent& event) // Adjust this event's location. MMI::PointerEvent::PointerItem pointer = {}; event.GetPointerItem(event.GetPointerId(), pointer); - pointer.SetGlobalX(pointer.GetGlobalX() + longPressOffsetX_); - pointer.SetGlobalY(pointer.GetGlobalY() + longPressOffsetY_); + pointer.SetDisplayX(pointer.GetDisplayX() + longPressOffsetX_); + pointer.SetDisplayY(pointer.GetDisplayY() + longPressOffsetY_); event.RemovePointerItem(event.GetPointerId()); event.AddPointerItem(pointer); longPressPointId_ = INIT_POINT_ID; @@ -538,10 +538,10 @@ void TouchGuider::HandleDraggingStateInnerMove(MMI::PointerEvent& event) MMI::PointerEvent::PointerItem pointerS = {}; event.GetPointerItem(pIds[INDEX_0], pointerF); event.GetPointerItem(pIds[INDEX_1], pointerS); - float xPointF = pointerF.GetGlobalX(); - float xPointS = pointerS.GetGlobalX(); - float yPointF = pointerF.GetGlobalY(); - float yPointS = pointerS.GetGlobalY(); + float xPointF = pointerF.GetDisplayX(); + float xPointS = pointerS.GetDisplayX(); + float yPointF = pointerF.GetDisplayY(); + float yPointS = pointerS.GetDisplayY(); float offsetX = abs(xPointF - xPointS); float offsetY = abs(yPointF - yPointS); double duration = hypot(offsetX, offsetY); @@ -549,8 +549,8 @@ void TouchGuider::HandleDraggingStateInnerMove(MMI::PointerEvent& event) // Adjust this event's location. MMI::PointerEvent::PointerItem pointer = {}; event.GetPointerItem(event.GetPointerId(), pointer); - pointer.SetGlobalX(pointer.GetGlobalX() + DIVIDE_2(offsetX)); - pointer.SetGlobalY(pointer.GetGlobalY() + DIVIDE_2(offsetY)); + pointer.SetDisplayX(pointer.GetDisplayX() + DIVIDE_2(offsetX)); + pointer.SetDisplayY(pointer.GetDisplayY() + DIVIDE_2(offsetY)); event.RemovePointerItem(event.GetPointerId()); event.AddPointerItem(pointer); } @@ -589,10 +589,10 @@ bool TouchGuider::IsDragGestureAccept(MMI::PointerEvent& event) HILOG_ERROR("GetPointerItem(%d) failed", pIds[1]); } - float xPointF = pointerF.GetGlobalX(); - float xPointS = pointerS.GetGlobalX(); - float yPointF = pointerF.GetGlobalY(); - float yPointS = pointerS.GetGlobalY(); + float xPointF = pointerF.GetDisplayX(); + float xPointS = pointerS.GetDisplayX(); + float yPointF = pointerF.GetDisplayY(); + float yPointS = pointerS.GetDisplayY(); float xPointDownF = receivedRecorder_.pointerDownX[INDEX_0]; float xPointDownS = receivedRecorder_.pointerDownX[INDEX_1]; float yPointDownF = receivedRecorder_.pointerDownY[INDEX_0]; @@ -655,8 +655,8 @@ void TouchGuider::RecordReceivedEvent(MMI::PointerEvent& event) receivedRecorder_.lastEvent = std::make_shared(event); switch (event.GetPointerAction()) { case MMI::PointerEvent::POINTER_ACTION_DOWN: - receivedRecorder_.pointerDownX[pointId] = pointer.GetGlobalX(); - receivedRecorder_.pointerDownY[pointId] = pointer.GetGlobalY(); + receivedRecorder_.pointerDownX[pointId] = pointer.GetDisplayX(); + receivedRecorder_.pointerDownY[pointId] = pointer.GetDisplayY(); break; case MMI::PointerEvent::POINTER_ACTION_UP: receivedRecorder_.pointerDownX[pointId] = 0; diff --git a/services/aams/test/unittest/accessibility_input_interceptor_test.cpp b/services/aams/test/unittest/accessibility_input_interceptor_test.cpp old mode 100644 new mode 100755 index 1faf969f2c792546209587125bf6e1a9ab30c451..4009d15ada5b6179abc824044a33e6f75ed24499 --- a/services/aams/test/unittest/accessibility_input_interceptor_test.cpp +++ b/services/aams/test/unittest/accessibility_input_interceptor_test.cpp @@ -196,8 +196,8 @@ HWTEST_F(AccessibilityInputInterceptorTest, AccessibilityInputInterceptorTest_Un MMI::PointerEvent::PointerItem item = {}; item.SetPointerId(1); - item.SetGlobalX(1); - item.SetGlobalY(1); + item.SetDisplayX(1); + item.SetDisplayY(1); event->SetSourceType(MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN); event->SetPointerAction(MMI::PointerEvent::POINTER_ACTION_DOWN); event->AddPointerItem(item); diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp old mode 100644 new mode 100755 index 61f42158e25264dea76b5ccc0d5430ac0626235e..41c11c9500b5ba471a588b12088143e1bdb591ee --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -254,8 +254,8 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_006, TestSize.Level1 point.SetPointerId(1); MMI::PointerEvent::PointerItem otherPoint = {}; otherPoint.SetPointerId(2); - otherPoint.SetGlobalX(10); - otherPoint.SetGlobalY(10); + otherPoint.SetDisplayX(10); + otherPoint.SetDisplayY(10); points.emplace_back(point); std::shared_ptr event = @@ -308,12 +308,12 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_007, TestSize.Level1 point.SetPointerId(1); MMI::PointerEvent::PointerItem otherPoint = {}; otherPoint.SetPointerId(2); - otherPoint.SetGlobalX(10); - otherPoint.SetGlobalY(10); + otherPoint.SetDisplayX(10); + otherPoint.SetDisplayY(10); MMI::PointerEvent::PointerItem otherPoint1 = {}; otherPoint1.SetPointerId(3); - otherPoint1.SetGlobalX(10); - otherPoint1.SetGlobalY(10); + otherPoint1.SetDisplayX(10); + otherPoint1.SetDisplayY(10); points.emplace_back(point); std::shared_ptr event = @@ -382,12 +382,12 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_009, TestSize.Level1 point.SetPointerId(1); MMI::PointerEvent::PointerItem otherPoint = {}; otherPoint.SetPointerId(2); - otherPoint.SetGlobalX(500); - otherPoint.SetGlobalY(500); + otherPoint.SetDisplayX(500); + otherPoint.SetDisplayY(500); MMI::PointerEvent::PointerItem otherPoint1 = {}; otherPoint1.SetPointerId(3); - otherPoint1.SetGlobalX(500); - otherPoint1.SetGlobalY(500); + otherPoint1.SetDisplayX(500); + otherPoint1.SetDisplayY(500); points.emplace_back(point); std::shared_ptr event = @@ -436,8 +436,8 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_010, TestSize.Level1 point.SetPointerId(1); MMI::PointerEvent::PointerItem otherPoint = {}; otherPoint.SetPointerId(2); - otherPoint.SetGlobalX(10); - otherPoint.SetGlobalY(10); + otherPoint.SetDisplayX(10); + otherPoint.SetDisplayY(10); points.emplace_back(point); std::shared_ptr event = @@ -482,12 +482,12 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_011, TestSize.Level1 point.SetPointerId(1); MMI::PointerEvent::PointerItem otherPoint = {}; otherPoint.SetPointerId(2); - otherPoint.SetGlobalX(500); - otherPoint.SetGlobalY(500); + otherPoint.SetDisplayX(500); + otherPoint.SetDisplayY(500); MMI::PointerEvent::PointerItem otherPoint1 = {}; otherPoint1.SetPointerId(3); - otherPoint1.SetGlobalX(500); - otherPoint1.SetGlobalY(500); + otherPoint1.SetDisplayX(500); + otherPoint1.SetDisplayY(500); points.emplace_back(point); std::shared_ptr event = @@ -533,12 +533,12 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_012, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(10); - point.SetGlobalY(10); + point.SetDisplayX(10); + point.SetDisplayY(10); MMI::PointerEvent::PointerItem otherPoint = {}; otherPoint.SetPointerId(2); - otherPoint.SetGlobalX(50); - otherPoint.SetGlobalY(10); + otherPoint.SetDisplayX(50); + otherPoint.SetDisplayY(10); points.emplace_back(point); std::shared_ptr event = @@ -615,16 +615,16 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_014, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(500); - point.SetGlobalY(500); + point.SetDisplayX(500); + point.SetDisplayY(500); MMI::PointerEvent::PointerItem movepoint = {}; movepoint.SetPointerId(1); - movepoint.SetGlobalX(2500); - movepoint.SetGlobalY(500); + movepoint.SetDisplayX(2500); + movepoint.SetDisplayY(500); MMI::PointerEvent::PointerItem othermovepoint = {}; othermovepoint.SetPointerId(1); - othermovepoint.SetGlobalX(2500); - othermovepoint.SetGlobalY(750); + othermovepoint.SetDisplayX(2500); + othermovepoint.SetDisplayY(750); points.emplace_back(point); std::shared_ptr event = @@ -668,20 +668,20 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_015, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(2500); - point.SetGlobalY(2500); + point.SetDisplayX(2500); + point.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint1 = {}; movepoint1.SetPointerId(1); - movepoint1.SetGlobalX(3500); - movepoint1.SetGlobalY(2500); + movepoint1.SetDisplayX(3500); + movepoint1.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint2 = {}; movepoint2.SetPointerId(1); - movepoint2.SetGlobalX(5000); - movepoint2.SetGlobalY(2500); + movepoint2.SetDisplayX(5000); + movepoint2.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint3 = {}; movepoint3.SetPointerId(1); - movepoint3.SetGlobalX(4000); - movepoint3.SetGlobalY(0); + movepoint3.SetDisplayX(4000); + movepoint3.SetDisplayY(0); points.emplace_back(point); std::shared_ptr event = @@ -742,20 +742,20 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_016, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(2500); - point.SetGlobalY(2500); + point.SetDisplayX(2500); + point.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint1 = {}; movepoint1.SetPointerId(1); - movepoint1.SetGlobalX(1500); - movepoint1.SetGlobalY(2500); + movepoint1.SetDisplayX(1500); + movepoint1.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint2 = {}; movepoint2.SetPointerId(1); - movepoint2.SetGlobalX(0); - movepoint2.SetGlobalY(2500); + movepoint2.SetDisplayX(0); + movepoint2.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint3 = {}; movepoint3.SetPointerId(1); - movepoint3.SetGlobalX(1000); - movepoint3.SetGlobalY(0); + movepoint3.SetDisplayX(1000); + movepoint3.SetDisplayY(0); points.emplace_back(point); std::shared_ptr event = @@ -816,20 +816,20 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_017, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(2500); - point.SetGlobalY(2500); + point.SetDisplayX(2500); + point.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint1 = {}; movepoint1.SetPointerId(1); - movepoint1.SetGlobalX(2500); - movepoint1.SetGlobalY(3500); + movepoint1.SetDisplayX(2500); + movepoint1.SetDisplayY(3500); MMI::PointerEvent::PointerItem movepoint2 = {}; movepoint2.SetPointerId(1); - movepoint2.SetGlobalX(2500); - movepoint2.SetGlobalY(5000); + movepoint2.SetDisplayX(2500); + movepoint2.SetDisplayY(5000); MMI::PointerEvent::PointerItem movepoint3 = {}; movepoint3.SetPointerId(1); - movepoint3.SetGlobalX(0); - movepoint3.SetGlobalY(4000); + movepoint3.SetDisplayX(0); + movepoint3.SetDisplayY(4000); points.emplace_back(point); std::shared_ptr event = @@ -890,20 +890,20 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_018, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(2500); - point.SetGlobalY(2500); + point.SetDisplayX(2500); + point.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint1 = {}; movepoint1.SetPointerId(1); - movepoint1.SetGlobalX(2500); - movepoint1.SetGlobalY(3500); + movepoint1.SetDisplayX(2500); + movepoint1.SetDisplayY(3500); MMI::PointerEvent::PointerItem movepoint2 = {}; movepoint2.SetPointerId(1); - movepoint2.SetGlobalX(2500); - movepoint2.SetGlobalY(5000); + movepoint2.SetDisplayX(2500); + movepoint2.SetDisplayY(5000); MMI::PointerEvent::PointerItem movepoint3 = {}; movepoint3.SetPointerId(1); - movepoint3.SetGlobalX(5000); - movepoint3.SetGlobalY(4000); + movepoint3.SetDisplayX(5000); + movepoint3.SetDisplayY(4000); points.emplace_back(point); std::shared_ptr event = @@ -964,16 +964,16 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_019, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(2500); - point.SetGlobalY(2500); + point.SetDisplayX(2500); + point.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint1 = {}; movepoint1.SetPointerId(1); - movepoint1.SetGlobalX(1000); - movepoint1.SetGlobalY(2500); + movepoint1.SetDisplayX(1000); + movepoint1.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint2 = {}; movepoint2.SetPointerId(1); - movepoint2.SetGlobalX(0); - movepoint2.SetGlobalY(2500); + movepoint2.SetDisplayX(0); + movepoint2.SetDisplayY(2500); points.emplace_back(point); std::shared_ptr event = @@ -1026,12 +1026,12 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnTouchEvent_020, TestSize.Level1 std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; point.SetPointerId(1); - point.SetGlobalX(2500); - point.SetGlobalY(2500); + point.SetDisplayX(2500); + point.SetDisplayY(2500); MMI::PointerEvent::PointerItem movepoint1 = {}; movepoint1.SetPointerId(1); - movepoint1.SetGlobalX(2250); - movepoint1.SetGlobalY(2500); + movepoint1.SetDisplayX(2250); + movepoint1.SetDisplayY(2500); points.emplace_back(point); std::shared_ptr event = diff --git a/services/test/mock/multimodalinput/src/mock_pointer_event.cpp b/services/test/mock/multimodalinput/src/mock_pointer_event.cpp old mode 100644 new mode 100755 index 60988b4ad174dab81e8b382acae50d167555ebcd..eb9da0ec8b1d3e27978911d01a0669c0258462a6 --- a/services/test/mock/multimodalinput/src/mock_pointer_event.cpp +++ b/services/test/mock/multimodalinput/src/mock_pointer_event.cpp @@ -53,42 +53,42 @@ void PointerEvent::PointerItem::SetPressed(bool pressed) pressed_ = pressed; } -int32_t PointerEvent::PointerItem::GetGlobalX() const +int32_t PointerEvent::PointerItem::GetDisplayX() const { return globalX_; } -void PointerEvent::PointerItem::SetGlobalX(int32_t x) +void PointerEvent::PointerItem::SetDisplayX(int32_t x) { globalX_ = x; } -int32_t PointerEvent::PointerItem::GetGlobalY() const +int32_t PointerEvent::PointerItem::GetDisplayY() const { return globalY_; } -void PointerEvent::PointerItem::SetGlobalY(int32_t y) +void PointerEvent::PointerItem::SetDisplayY(int32_t y) { globalY_ = y; } -int32_t PointerEvent::PointerItem::GetLocalX() const +int32_t PointerEvent::PointerItem::GetWindowX() const { return localX_; } -void PointerEvent::PointerItem::SetLocalX(int32_t x) +void PointerEvent::PointerItem::SetWindowX(int32_t x) { localX_ = x; } -int32_t PointerEvent::PointerItem::GetLocalY() const +int32_t PointerEvent::PointerItem::GetWindowY() const { return localY_; } -void PointerEvent::PointerItem::SetLocalY(int32_t y) +void PointerEvent::PointerItem::SetWindowY(int32_t y) { localY_ = y; } diff --git a/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp b/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp old mode 100644 new mode 100755 index e7b59b2afca90813a8835c9adef339d75aa55045..2ec55789098be69be2ce30afe10d2e23ede9c333 --- a/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp +++ b/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp @@ -196,20 +196,20 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent001, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(500); - point1.SetGlobalY(500); + point1.SetDisplayX(500); + point1.SetDisplayY(500); point1.SetPointerId(1); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetGlobalX(1000); - point2.SetGlobalY(500); + point2.SetDisplayX(1000); + point2.SetDisplayY(500); point2.SetPointerId(2); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetGlobalX(2000); - point3.SetGlobalY(500); + point3.SetDisplayX(2000); + point3.SetDisplayY(500); point3.SetPointerId(1); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetGlobalX(2500); - point4.SetGlobalY(500); + point4.SetDisplayX(2500); + point4.SetDisplayY(500); point4.SetPointerId(2); points.emplace_back(point1); @@ -308,20 +308,20 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent004, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(2500); - point1.SetGlobalY(2500); + point1.SetDisplayX(2500); + point1.SetDisplayY(2500); point1.SetPointerId(1); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetGlobalX(1500); - point2.SetGlobalY(2500); + point2.SetDisplayX(1500); + point2.SetDisplayY(2500); point2.SetPointerId(1); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetGlobalX(0); - point3.SetGlobalY(2500); + point3.SetDisplayX(0); + point3.SetDisplayY(2500); point3.SetPointerId(1); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetGlobalX(2500); - point4.SetGlobalY(2250); + point4.SetDisplayX(2500); + point4.SetDisplayY(2250); point4.SetPointerId(1); points.emplace_back(point1); @@ -380,20 +380,20 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent005, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(2500); - point1.SetGlobalY(2500); + point1.SetDisplayX(2500); + point1.SetDisplayY(2500); point1.SetPointerId(1); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetGlobalX(2500); - point2.SetGlobalY(3500); + point2.SetDisplayX(2500); + point2.SetDisplayY(3500); point2.SetPointerId(1); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetGlobalX(2500); - point3.SetGlobalY(5000); + point3.SetDisplayX(2500); + point3.SetDisplayY(5000); point3.SetPointerId(1); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetGlobalX(2250); - point4.SetGlobalY(2500); + point4.SetDisplayX(2250); + point4.SetDisplayY(2500); point4.SetPointerId(1); points.emplace_back(point1); @@ -452,20 +452,20 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent006, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(2500); - point1.SetGlobalY(2500); + point1.SetDisplayX(2500); + point1.SetDisplayY(2500); point1.SetPointerId(1); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetGlobalX(3500); - point2.SetGlobalY(2500); + point2.SetDisplayX(3500); + point2.SetDisplayY(2500); point2.SetPointerId(1); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetGlobalX(5000); - point3.SetGlobalY(2500); + point3.SetDisplayX(5000); + point3.SetDisplayY(2500); point3.SetPointerId(1); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetGlobalX(2500); - point4.SetGlobalY(2250); + point4.SetDisplayX(2500); + point4.SetDisplayY(2250); point4.SetPointerId(1); points.emplace_back(point1); @@ -524,20 +524,20 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent007, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(2500); - point1.SetGlobalY(2500); + point1.SetDisplayX(2500); + point1.SetDisplayY(2500); point1.SetPointerId(1); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetGlobalX(2500); - point2.SetGlobalY(1500); + point2.SetDisplayX(2500); + point2.SetDisplayY(1500); point2.SetPointerId(1); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetGlobalX(2500); - point3.SetGlobalY(0); + point3.SetDisplayX(2500); + point3.SetDisplayY(0); point3.SetPointerId(1); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetGlobalX(2250); - point4.SetGlobalY(2500); + point4.SetDisplayX(2250); + point4.SetDisplayY(2500); point4.SetPointerId(1); points.emplace_back(point1); @@ -596,16 +596,16 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent008, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(2500); - point1.SetGlobalY(2500); + point1.SetDisplayX(2500); + point1.SetDisplayY(2500); point1.SetPointerId(1); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetGlobalX(2500); - point2.SetGlobalY(1500); + point2.SetDisplayX(2500); + point2.SetDisplayY(1500); point2.SetPointerId(1); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetGlobalX(2500); - point3.SetGlobalY(0); + point3.SetDisplayX(2500); + point3.SetDisplayY(0); point3.SetPointerId(1); points.emplace_back(point1); @@ -692,8 +692,8 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent010, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(300); - point1.SetGlobalY(500); + point1.SetDisplayX(300); + point1.SetDisplayY(500); point1.SetPointerId(1); points.emplace_back(point1); @@ -739,8 +739,8 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnTouchEvent011, Test MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetGlobalX(300); - point1.SetGlobalY(500); + point1.SetDisplayX(300); + point1.SetDisplayY(500); point1.SetPointerId(1); points.emplace_back(point1);