X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Ftizen-wayland%2Fecore-wl2%2Fwindow-base-ecore-wl2.cpp;h=c1c128396d0ad6de16bf9c5f315d7854a89d0429;hb=aacd2634a24ed8cf4ee00245eeae60cb1f43307b;hp=814b2a6be1a1d9646c6aee79fe3e7110be6bc527;hpb=983f9145571e3ad1a69caff5d4107f26540b8fb1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp index 814b2a6..c1c1283 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // INTERNAL HEADERS #include +#include #include #include #include @@ -41,6 +42,19 @@ #include #endif +#define START_DURATION_CHECK() \ + uint32_t durationMilliSeconds = static_cast(-1); \ + uint32_t startTime, endTime; \ + startTime = TimeService::GetMilliSeconds(); + +#define FINISH_DURATION_CHECK(functionName) \ + endTime = TimeService::GetMilliSeconds(); \ + durationMilliSeconds = endTime - startTime; \ + if(durationMilliSeconds > 0) \ + { \ + DALI_LOG_DEBUG_INFO("%s : duration [%u ms]\n", functionName, durationMilliSeconds); \ + } + #include namespace Dali @@ -57,8 +71,25 @@ Debug::Filter* gWindowBaseLogFilter = Debug::Filter::New(Debug::NoLogging, false DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_PERFORMANCE_MARKER, false); -const uint32_t MAX_TIZEN_CLIENT_VERSION = 7; -const unsigned int PRIMARY_TOUCH_BUTTON_ID = 1; +/** + * @brief Enumeration of location for window resized by display server. + */ +enum class ResizeLocation +{ + INVALID = 0, ///< Invalid value + TOP_LEFT = 5, ///< Start resizing window to the top-left edge. + LEFT = 4, ///< Start resizing window to the left side. + BOTTOM_LEFT = 6, ///< Start resizing window to the bottom-left edge. + BOTTOM = 2, ///< Start resizing window to the bottom side. + BOTTOM_RIGHT = 10, ///< Start resizing window to the bottom-right edge. + RIGHT = 8, ///< Start resizing window to the right side. + TOP_RIGHT = 9, ///< Start resizing window to the top-right edge. + TOP = 1 ///< Start resizing window to the top side. +}; + +const uint32_t MAX_TIZEN_CLIENT_VERSION = 7; +const unsigned int PRIMARY_TOUCH_BUTTON_ID = 1; +const ResizeLocation RESIZE_LOCATIONS[] = {ResizeLocation::TOP_LEFT, ResizeLocation::LEFT, ResizeLocation::BOTTOM_LEFT, ResizeLocation::BOTTOM, ResizeLocation::BOTTOM_RIGHT, ResizeLocation::RIGHT, ResizeLocation::TOP_RIGHT, ResizeLocation::TOP, ResizeLocation::INVALID}; #if defined(VCONF_ENABLED) const char* DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME = "db/setting/accessibility/font_name"; // It will be update at vconf-key.h and replaced. @@ -230,6 +261,69 @@ void FindKeyCode(struct xkb_keymap* keyMap, xkb_keycode_t key, void* data) } } +/** + * Return the recalculated window resizing location according to the current orientation. + */ +ResizeLocation RecalculateLocationToCurrentOrientation(WindowResizeDirection direction, int windowRotationAngle) +{ + int index = 8; + switch(direction) + { + case WindowResizeDirection::TOP_LEFT: + { + index = 0; + break; + } + case WindowResizeDirection::LEFT: + { + index = 1; + break; + } + case WindowResizeDirection::BOTTOM_LEFT: + { + index = 2; + break; + } + case WindowResizeDirection::BOTTOM: + { + index = 3; + break; + } + case WindowResizeDirection::BOTTOM_RIGHT: + { + index = 4; + break; + } + case WindowResizeDirection::RIGHT: + { + index = 5; + break; + } + case WindowResizeDirection::TOP_RIGHT: + { + index = 6; + break; + } + case WindowResizeDirection::TOP: + { + index = 7; + break; + } + default: + { + index = 8; + break; + } + } + + if(index != 8 && windowRotationAngle != 0) + { + index = (index + (windowRotationAngle / 90) * 2) % 8; + } + + return RESIZE_LOCATIONS[index]; +} + ///////////////////////////////////////////////////////////////////////////////////////////////// // Window Callbacks ///////////////////////////////////////////////////////////////////////////////////////////////// @@ -391,6 +485,34 @@ static Eina_Bool EcoreEventMouseWheel(void* data, int type, void* event) } /** + * Called when a mouse in is received. + */ +static Eina_Bool EcoreEventMouseIn(void* data, int type, void* event) +{ + WindowBaseEcoreWl2* windowBase = static_cast(data); + if(windowBase) + { + windowBase->OnMouseInOut(data, type, event, Dali::DevelWindow::MouseInOutEvent::Type::IN); + } + return ECORE_CALLBACK_PASS_ON; +} + +/** + * Called when a mouse out is received. + */ +static Eina_Bool EcoreEventMouseOut(void* data, int type, void* event) +{ + WindowBaseEcoreWl2* windowBase = static_cast(data); + if(windowBase) + { + // When the mouse is out, the previous mouse must be canceled. + windowBase->OnMouseButtonCancel(data, type, event); + windowBase->OnMouseInOut(data, type, event, Dali::DevelWindow::MouseInOutEvent::Type::OUT); + } + return ECORE_CALLBACK_PASS_ON; +} + +/** * Called when a detent rotation event is recevied. */ static Eina_Bool EcoreEventDetentRotation(void* data, int type, void* event) @@ -718,8 +840,6 @@ WindowBaseEcoreWl2::WindowBaseEcoreWl2(Dali::PositionSize positionSize, Any surf mWindowRotationAngle(0), mScreenRotationAngle(0), mSupportedPreProtation(0), - mScreenWidth(0), - mScreenHeight(0), mNotificationChangeState(0), mScreenOffModeChangeState(0), mBrightnessChangeState(0), @@ -764,8 +884,6 @@ WindowBaseEcoreWl2::~WindowBaseEcoreWl2() if(mOwnSurface) { ecore_wl2_window_free(mEcoreWindow); - - WindowSystem::Shutdown(); } } @@ -781,8 +899,6 @@ void WindowBaseEcoreWl2::Initialize(PositionSize positionSize, Any surface, bool else { // we own the surface about to created - WindowSystem::Initialize(); - mOwnSurface = true; CreateWindow(positionSize); } @@ -812,6 +928,10 @@ void WindowBaseEcoreWl2::Initialize(PositionSize positionSize, Any surface, bool // Register Mouse wheel events mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, EcoreEventMouseWheel, this)); + // Register Mouse IO events + mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_IN, EcoreEventMouseIn, this)); + mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_MOUSE_OUT, EcoreEventMouseOut, this)); + // Register Detent event mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_EVENT_DETENT_ROTATE, EcoreEventDetentRotation, this)); @@ -1063,6 +1183,8 @@ void WindowBaseEcoreWl2::OnMouseButtonDown(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_DOWN"); + Device::Class::Type deviceClass; Device::Subclass::Type deviceSubclass; @@ -1103,6 +1225,8 @@ void WindowBaseEcoreWl2::OnMouseButtonUp(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_UP"); + Device::Class::Type deviceClass; Device::Subclass::Type deviceSubclass; @@ -1130,6 +1254,8 @@ void WindowBaseEcoreWl2::OnMouseButtonMove(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_MOVE"); + Device::Class::Type deviceClass; Device::Subclass::Type deviceSubclass; @@ -1156,6 +1282,8 @@ void WindowBaseEcoreWl2::OnMouseButtonCancel(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_CANCEL"); + Integration::Point point; point.SetDeviceId(touchEvent->multi.device); point.SetState(PointState::INTERRUPTED); @@ -1173,6 +1301,8 @@ void WindowBaseEcoreWl2::OnMouseWheel(void* data, int type, void* event) if(mouseWheelEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_WHEEL"); + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnMouseWheel: direction: %d, modifiers: %d, x: %d, y: %d, z: %d\n", mouseWheelEvent->direction, mouseWheelEvent->modifiers, mouseWheelEvent->x, mouseWheelEvent->y, mouseWheelEvent->z); Integration::WheelEvent wheelEvent(Integration::WheelEvent::MOUSE_WHEEL, mouseWheelEvent->direction, mouseWheelEvent->modifiers, Vector2(mouseWheelEvent->x, mouseWheelEvent->y), mouseWheelEvent->z, mouseWheelEvent->timestamp); @@ -1181,6 +1311,28 @@ void WindowBaseEcoreWl2::OnMouseWheel(void* data, int type, void* event) } } +void WindowBaseEcoreWl2::OnMouseInOut(void* data, int type, void* event, Dali::DevelWindow::MouseInOutEvent::Type action) +{ + Ecore_Event_Mouse_IO* mouseInOutEvent = static_cast(event); + + if(mouseInOutEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) + { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_IN_OUT"); + + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnMouseInOut: timestamp: %d, modifiers: %d, x: %d, y: %d\n", mouseInOutEvent->timestamp, mouseInOutEvent->modifiers, mouseInOutEvent->x, mouseInOutEvent->y); + + Device::Class::Type deviceClass; + Device::Subclass::Type deviceSubclass; + + GetDeviceClass(ecore_device_class_get(mouseInOutEvent->dev), deviceClass); + GetDeviceSubclass(ecore_device_subclass_get(mouseInOutEvent->dev), deviceSubclass); + + Dali::DevelWindow::MouseInOutEvent inOutEvent(action, mouseInOutEvent->modifiers, Vector2(mouseInOutEvent->x, mouseInOutEvent->y), mouseInOutEvent->timestamp, deviceClass, deviceSubclass); + + mMouseInOutEventSignal.Emit(inOutEvent); + } +} + void WindowBaseEcoreWl2::OnDetentRotation(void* data, int type, void* event) { Ecore_Event_Detent_Rotate* detentEvent = static_cast(event); @@ -1205,14 +1357,7 @@ void WindowBaseEcoreWl2::OnKeyDown(void* data, int type, void* event) std::string keyString(""); std::string compose(""); -#ifdef TRACE_ENABLED - std::ostringstream stream; - if(gTraceFilter->IsTraceEnabled()) - { - stream << "DALI_ON_KEY_DOWN [" << keyName << "]"; - DALI_TRACE_BEGIN(gTraceFilter, stream.str().c_str()); - } -#endif + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_KEY_DOWN"); // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string. if(keyEvent->compose) @@ -1260,13 +1405,6 @@ void WindowBaseEcoreWl2::OnKeyDown(void* data, int type, void* event) Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::DOWN, compose, deviceName, deviceClass, deviceSubclass); mKeyEventSignal.Emit(keyEvent); - -#ifdef TRACE_ENABLED - if(gTraceFilter->IsTraceEnabled()) - { - DALI_TRACE_END(gTraceFilter, stream.str().c_str()); - } -#endif } } @@ -1290,14 +1428,7 @@ void WindowBaseEcoreWl2::OnKeyUp(void* data, int type, void* event) std::string keyString(""); std::string compose(""); -#ifdef TRACE_ENABLED - std::ostringstream stream; - if(gTraceFilter->IsTraceEnabled()) - { - stream << "DALI_ON_KEY_UP [" << keyName << "]" << std::endl; - DALI_TRACE_BEGIN(gTraceFilter, stream.str().c_str()); - } -#endif + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_KEY_UP"); // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string. if(keyEvent->compose) @@ -1345,13 +1476,6 @@ void WindowBaseEcoreWl2::OnKeyUp(void* data, int type, void* event) Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::UP, compose, deviceName, deviceClass, deviceSubclass); mKeyEventSignal.Emit(keyEvent); - -#ifdef TRACE_ENABLED - if(gTraceFilter->IsTraceEnabled()) - { - DALI_TRACE_END(gTraceFilter, stream.str().c_str()); - } -#endif } } @@ -1532,6 +1656,8 @@ std::string WindowBaseEcoreWl2::GetNativeWindowResourceId() EGLNativeWindowType WindowBaseEcoreWl2::CreateEglWindow(int width, int height) { int totalAngle = (mWindowRotationAngle + mScreenRotationAngle) % 360; + + START_DURATION_CHECK(); if(totalAngle == 90 || totalAngle == 270) { mEglWindow = wl_egl_window_create(mWlSurface, height, width); @@ -1540,6 +1666,7 @@ EGLNativeWindowType WindowBaseEcoreWl2::CreateEglWindow(int width, int height) { mEglWindow = wl_egl_window_create(mWlSurface, width, height); } + FINISH_DURATION_CHECK("wl_egl_window_create"); return static_cast(mEglWindow); } @@ -1548,7 +1675,10 @@ void WindowBaseEcoreWl2::DestroyEglWindow() { if(mEglWindow != NULL) { + START_DURATION_CHECK(); wl_egl_window_destroy(mEglWindow); + FINISH_DURATION_CHECK("wl_egl_window_destroy"); + mEglWindow = NULL; } } @@ -1586,7 +1716,9 @@ void WindowBaseEcoreWl2::SetEglWindowRotation(int angle) } } + START_DURATION_CHECK(); wl_egl_window_tizen_set_rotation(mEglWindow, rotation); + FINISH_DURATION_CHECK("wl_egl_window_tizen_set_rotation"); } void WindowBaseEcoreWl2::SetEglWindowBufferTransform(int angle) @@ -1623,7 +1755,9 @@ void WindowBaseEcoreWl2::SetEglWindowBufferTransform(int angle) } DALI_LOG_RELEASE_INFO("wl_egl_window_tizen_set_buffer_transform() with buffer Transform [%d]\n", bufferTransform); + START_DURATION_CHECK(); wl_egl_window_tizen_set_buffer_transform(mEglWindow, bufferTransform); + FINISH_DURATION_CHECK("wl_egl_window_tizen_set_buffer_transform"); } void WindowBaseEcoreWl2::SetEglWindowTransform(int angle) @@ -1660,12 +1794,15 @@ void WindowBaseEcoreWl2::SetEglWindowTransform(int angle) } DALI_LOG_RELEASE_INFO("wl_egl_window_tizen_set_window_transform() with window Transform [%d]\n", windowTransform); + START_DURATION_CHECK(); wl_egl_window_tizen_set_window_transform(mEglWindow, windowTransform); + FINISH_DURATION_CHECK("wl_egl_window_tizen_set_window_transform"); } void WindowBaseEcoreWl2::ResizeEglWindow(PositionSize positionSize) { DALI_LOG_RELEASE_INFO("wl_egl_window_resize(), (%d, %d) [%d x %d]\n", positionSize.x, positionSize.y, positionSize.width, positionSize.height); + START_DURATION_CHECK(); wl_egl_window_resize(mEglWindow, positionSize.width, positionSize.height, positionSize.x, positionSize.y); // Note: Both "Resize" and "MoveResize" cases can reach here, but only "MoveResize" needs to submit serial number @@ -1674,12 +1811,16 @@ void WindowBaseEcoreWl2::ResizeEglWindow(PositionSize positionSize) wl_egl_window_tizen_set_window_serial(mEglWindow, mMoveResizeSerial); mLastSubmittedMoveResizeSerial = mMoveResizeSerial; } + FINISH_DURATION_CHECK("wl_egl_window functions"); } bool WindowBaseEcoreWl2::IsEglWindowRotationSupported() { + START_DURATION_CHECK(); // Check capability wl_egl_window_tizen_capability capability = static_cast(wl_egl_window_tizen_get_capabilities(mEglWindow)); + FINISH_DURATION_CHECK("wl_egl_window_tizen_get_capabilities"); + if(capability == WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_SUPPORTED) { mSupportedPreProtation = true; @@ -1692,24 +1833,26 @@ bool WindowBaseEcoreWl2::IsEglWindowRotationSupported() PositionSize WindowBaseEcoreWl2::RecalculatePositionSizeToSystem(PositionSize positionSize) { PositionSize newPositionSize; + int32_t screenWidth, screenHeight; + WindowSystem::GetScreenSize(screenWidth, screenHeight); if(mWindowRotationAngle == 90) { newPositionSize.x = positionSize.y; - newPositionSize.y = mScreenHeight - (positionSize.x + positionSize.width); + newPositionSize.y = screenHeight - (positionSize.x + positionSize.width); newPositionSize.width = positionSize.height; newPositionSize.height = positionSize.width; } else if(mWindowRotationAngle == 180) { - newPositionSize.x = mScreenWidth - (positionSize.x + positionSize.width); - newPositionSize.y = mScreenHeight - (positionSize.y + positionSize.height); + newPositionSize.x = screenWidth - (positionSize.x + positionSize.width); + newPositionSize.y = screenHeight - (positionSize.y + positionSize.height); newPositionSize.width = positionSize.width; newPositionSize.height = positionSize.height; } else if(mWindowRotationAngle == 270) { - newPositionSize.x = mScreenWidth - (positionSize.y + positionSize.height); + newPositionSize.x = screenWidth - (positionSize.y + positionSize.height); newPositionSize.y = positionSize.x; newPositionSize.width = positionSize.height; newPositionSize.height = positionSize.width; @@ -1728,25 +1871,27 @@ PositionSize WindowBaseEcoreWl2::RecalculatePositionSizeToSystem(PositionSize po PositionSize WindowBaseEcoreWl2::RecalculatePositionSizeToCurrentOrientation(PositionSize positionSize) { PositionSize newPositionSize; + int32_t screenWidth, screenHeight; + WindowSystem::GetScreenSize(screenWidth, screenHeight); if(mWindowRotationAngle == 90) { - newPositionSize.x = mScreenHeight - (positionSize.y + positionSize.height); + newPositionSize.x = screenHeight - (positionSize.y + positionSize.height); newPositionSize.y = positionSize.x; newPositionSize.width = positionSize.height; newPositionSize.height = positionSize.width; } else if(mWindowRotationAngle == 180) { - newPositionSize.x = mScreenWidth - (positionSize.x + positionSize.width); - newPositionSize.y = mScreenHeight - (positionSize.y + positionSize.height); + newPositionSize.x = screenWidth - (positionSize.x + positionSize.width); + newPositionSize.y = screenHeight - (positionSize.y + positionSize.height); newPositionSize.width = positionSize.width; newPositionSize.height = positionSize.height; } else if(mWindowRotationAngle == 270) { newPositionSize.x = positionSize.y; - newPositionSize.y = mScreenWidth - (positionSize.x + positionSize.width); + newPositionSize.y = screenWidth - (positionSize.x + positionSize.width); newPositionSize.width = positionSize.height; newPositionSize.height = positionSize.width; } @@ -1767,7 +1912,9 @@ void WindowBaseEcoreWl2::Move(PositionSize positionSize) mWindowPositionSize = newPositionSize; DALI_LOG_RELEASE_INFO("ecore_wl2_window_position_set x[%d], y[%d]\n", newPositionSize.x, newPositionSize.y); + START_DURATION_CHECK(); ecore_wl2_window_position_set(mEcoreWindow, newPositionSize.x, newPositionSize.y); + FINISH_DURATION_CHECK("ecore_wl2_window_position_set"); } void WindowBaseEcoreWl2::Resize(PositionSize positionSize) @@ -1776,7 +1923,9 @@ void WindowBaseEcoreWl2::Resize(PositionSize positionSize) mWindowPositionSize = newPositionSize; DALI_LOG_RELEASE_INFO("ecore_wl2_window_sync_geometry_set, x[%d], y[%d], w{%d], h[%d]\n", newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); + START_DURATION_CHECK(); ecore_wl2_window_sync_geometry_set(mEcoreWindow, ++mMoveResizeSerial, newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); + FINISH_DURATION_CHECK("ecore_wl2_window_sync_geometry_set"); } void WindowBaseEcoreWl2::MoveResize(PositionSize positionSize) @@ -1785,7 +1934,17 @@ void WindowBaseEcoreWl2::MoveResize(PositionSize positionSize) mWindowPositionSize = newPositionSize; DALI_LOG_RELEASE_INFO("ecore_wl2_window_sync_geometry_set, x[%d], y[%d], w{%d], h[%d]\n", newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); + START_DURATION_CHECK(); ecore_wl2_window_sync_geometry_set(mEcoreWindow, ++mMoveResizeSerial, newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); + FINISH_DURATION_CHECK("ecore_wl2_window_sync_geometry_set"); +} + +void WindowBaseEcoreWl2::SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan) +{ + DALI_LOG_RELEASE_INFO("ecore_wl2_window_layout_set, numCols[%d], numRows[%d], column[%d], row[%d], colSpan[%d], rowSpan[%d]\n", numCols, numRows, column, row, colSpan, rowSpan); + START_DURATION_CHECK(); + ecore_wl2_window_layout_set(mEcoreWindow, numCols, numRows, column, row, colSpan, rowSpan); + FINISH_DURATION_CHECK("ecore_wl2_window_layout_set"); } void WindowBaseEcoreWl2::SetClass(const std::string& name, const std::string& className) @@ -1796,23 +1955,31 @@ void WindowBaseEcoreWl2::SetClass(const std::string& name, const std::string& cl void WindowBaseEcoreWl2::Raise() { + START_DURATION_CHECK(); // Use ecore_wl2_window_activate to prevent the window shown without rendering ecore_wl2_window_activate(mEcoreWindow); + FINISH_DURATION_CHECK("ecore_wl2_window_activate"); } void WindowBaseEcoreWl2::Lower() { + START_DURATION_CHECK(); ecore_wl2_window_lower(mEcoreWindow); + FINISH_DURATION_CHECK("ecore_wl2_window_lower"); } void WindowBaseEcoreWl2::Activate() { + START_DURATION_CHECK(); ecore_wl2_window_activate(mEcoreWindow); + FINISH_DURATION_CHECK("ecore_wl2_window_activate"); } void WindowBaseEcoreWl2::Maximize(bool maximize) { + START_DURATION_CHECK(); ecore_wl2_window_maximized_set(mEcoreWindow, maximize); + FINISH_DURATION_CHECK("ecore_wl2_window_maximized_set"); } bool WindowBaseEcoreWl2::IsMaximized() const @@ -1823,12 +1990,17 @@ bool WindowBaseEcoreWl2::IsMaximized() const void WindowBaseEcoreWl2::SetMaximumSize(Dali::Window::WindowSize size) { DALI_LOG_RELEASE_INFO("ecore_wl2_window_maximum_size_set, width: %d, height: %d\n", size.GetWidth(), size.GetHeight()); + START_DURATION_CHECK(); ecore_wl2_window_maximum_size_set(mEcoreWindow, size.GetWidth(), size.GetHeight()); + FINISH_DURATION_CHECK("ecore_wl2_window_maximum_size_set"); + ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE); } void WindowBaseEcoreWl2::Minimize(bool minimize) { + START_DURATION_CHECK(); ecore_wl2_window_iconified_set(mEcoreWindow, minimize); + FINISH_DURATION_CHECK("ecore_wl2_window_iconified_set"); } bool WindowBaseEcoreWl2::IsMinimized() const @@ -1839,7 +2011,10 @@ bool WindowBaseEcoreWl2::IsMinimized() const void WindowBaseEcoreWl2::SetMimimumSize(Dali::Window::WindowSize size) { DALI_LOG_RELEASE_INFO("ecore_wl2_window_minimum_size_set, width: %d, height: %d\n", size.GetWidth(), size.GetHeight()); + START_DURATION_CHECK(); ecore_wl2_window_minimum_size_set(mEcoreWindow, size.GetWidth(), size.GetHeight()); + FINISH_DURATION_CHECK("ecore_wl2_window_minimum_size_set"); + ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE); } void WindowBaseEcoreWl2::SetAvailableAnlges(const std::vector& angles) @@ -1851,25 +2026,34 @@ void WindowBaseEcoreWl2::SetAvailableAnlges(const std::vector& angles) rotations[i] = static_cast(angles[i]); DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "%d ", rotations[i]); } + + START_DURATION_CHECK(); ecore_wl2_window_available_rotations_set(mEcoreWindow, rotations, angles.size()); + FINISH_DURATION_CHECK("ecore_wl2_window_available_rotations_set"); } void WindowBaseEcoreWl2::SetPreferredAngle(int angle) { DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetPreferredAngle, angle: %d\n", angle); + START_DURATION_CHECK(); ecore_wl2_window_preferred_rotation_set(mEcoreWindow, angle); + FINISH_DURATION_CHECK("ecore_wl2_window_preferred_rotation_set"); } void WindowBaseEcoreWl2::SetAcceptFocus(bool accept) { + START_DURATION_CHECK(); ecore_wl2_window_focus_skip_set(mEcoreWindow, !accept); + FINISH_DURATION_CHECK("ecore_wl2_window_focus_skip_set"); } void WindowBaseEcoreWl2::Show() { if(!mVisible) { + START_DURATION_CHECK(); ecore_wl2_window_geometry_set(mEcoreWindow, mWindowPositionSize.x, mWindowPositionSize.y, mWindowPositionSize.width, mWindowPositionSize.height); + FINISH_DURATION_CHECK("ecore_wl2_window_geometry_set"); } mVisible = true; @@ -1936,7 +2120,9 @@ unsigned int WindowBaseEcoreWl2::AddAuxiliaryHint(const std::string& hint, const unsigned int id = mAuxiliaryHints.size(); + START_DURATION_CHECK(); ecore_wl2_window_aux_hint_add(mEcoreWindow, static_cast(id), hint.c_str(), value.c_str()); + FINISH_DURATION_CHECK("ecore_wl2_window_aux_hint_add"); DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl2::AddAuxiliaryHint: hint = %s, value = %s, id = %d\n", hint.c_str(), value.c_str(), id); @@ -1953,7 +2139,9 @@ bool WindowBaseEcoreWl2::RemoveAuxiliaryHint(unsigned int id) mAuxiliaryHints[id - 1].second = std::string(); + START_DURATION_CHECK(); ecore_wl2_window_aux_hint_del(mEcoreWindow, static_cast(id)); + FINISH_DURATION_CHECK("ecore_wl2_window_aux_hint_del"); DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl2::RemoveAuxiliaryHint: id = %d, hint = %s\n", id, mAuxiliaryHints[id - 1].first.c_str()); @@ -1970,7 +2158,9 @@ bool WindowBaseEcoreWl2::SetAuxiliaryHintValue(unsigned int id, const std::strin mAuxiliaryHints[id - 1].second = value; + START_DURATION_CHECK(); ecore_wl2_window_aux_hint_change(mEcoreWindow, static_cast(id), value.c_str()); + FINISH_DURATION_CHECK("ecore_wl2_window_aux_hint_change"); DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl2::SetAuxiliaryHintValue: id = %d, hint = %s, value = %s\n", id, mAuxiliaryHints[id - 1].first.c_str(), mAuxiliaryHints[id - 1].second.c_str()); @@ -2006,9 +2196,56 @@ unsigned int WindowBaseEcoreWl2::GetAuxiliaryHintId(const std::string& hint) con return 0; } +Rect WindowBaseEcoreWl2::RecalculateInputRect(const Rect& rect) +{ + Rect newRect; + + if(mWindowRotationAngle == 90) + { + newRect.x = rect.y; + newRect.y = mWindowPositionSize.height - (rect.x + rect.width); + newRect.width = rect.height; + newRect.height = rect.width; + } + else if(mWindowRotationAngle == 180) + { + newRect.x = mWindowPositionSize.width - (rect.x + rect.width); + newRect.y = mWindowPositionSize.height - (rect.y + rect.height); + newRect.width = rect.width; + newRect.height = rect.height; + } + else if(mWindowRotationAngle == 270) + { + newRect.x = mWindowPositionSize.width - (rect.y + rect.height); + newRect.y = rect.x; + newRect.width = rect.height; + newRect.height = rect.width; + } + else + { + newRect.x = rect.x; + newRect.y = rect.y; + newRect.width = rect.width; + newRect.height = rect.height; + } + return newRect; +} + void WindowBaseEcoreWl2::SetInputRegion(const Rect& inputRegion) { - ecore_wl2_window_input_region_set(mEcoreWindow, inputRegion.x, inputRegion.y, inputRegion.width, inputRegion.height); + Rect convertRegion = RecalculateInputRect(inputRegion); + + Eina_Rectangle rect; + rect.x = convertRegion.x; + rect.y = convertRegion.y; + rect.w = convertRegion.width; + rect.h = convertRegion.height; + + DALI_LOG_RELEASE_INFO("%p, Set input rect (%d, %d, %d x %d)\n", mEcoreWindow, rect.x, rect.y, rect.w, rect.h); + START_DURATION_CHECK(); + ecore_wl2_window_input_rect_set(mEcoreWindow, &rect); + FINISH_DURATION_CHECK("ecore_wl2_window_input_rect_set"); + ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE); } void WindowBaseEcoreWl2::SetType(Dali::WindowType type) @@ -2056,7 +2293,10 @@ void WindowBaseEcoreWl2::SetType(Dali::WindowType type) break; } } + + START_DURATION_CHECK(); ecore_wl2_window_type_set(mEcoreWindow, windowType); + FINISH_DURATION_CHECK("ecore_wl2_window_type_set"); } } @@ -2067,6 +2307,7 @@ Dali::WindowType WindowBaseEcoreWl2::GetType() const Dali::WindowOperationResult WindowBaseEcoreWl2::SetNotificationLevel(Dali::WindowNotificationLevel level) { + START_DURATION_CHECK(); while(!mTizenPolicy) { wl_display_dispatch_queue(mDisplay, mEventQueue); @@ -2122,6 +2363,7 @@ Dali::WindowOperationResult WindowBaseEcoreWl2::SetNotificationLevel(Dali::Windo wl_display_dispatch_queue(mDisplay, mEventQueue); count++; } + FINISH_DURATION_CHECK("ecore_wl2 & wl_display"); if(!mNotificationLevelChangeDone) { @@ -2311,6 +2553,7 @@ WindowScreenOffMode WindowBaseEcoreWl2::GetScreenOffMode() const Dali::WindowOperationResult WindowBaseEcoreWl2::SetBrightness(int brightness) { + START_DURATION_CHECK(); while(!mTizenDisplayPolicy) { wl_display_dispatch_queue(mDisplay, mEventQueue); @@ -2329,6 +2572,7 @@ Dali::WindowOperationResult WindowBaseEcoreWl2::SetBrightness(int brightness) wl_display_dispatch_queue(mDisplay, mEventQueue); count++; } + FINISH_DURATION_CHECK("ecore_wl2_display_flush"); if(!mBrightnessChangeDone) { @@ -2348,6 +2592,7 @@ Dali::WindowOperationResult WindowBaseEcoreWl2::SetBrightness(int brightness) int WindowBaseEcoreWl2::GetBrightness() const { + START_DURATION_CHECK(); while(!mTizenDisplayPolicy) { wl_display_dispatch_queue(mDisplay, mEventQueue); @@ -2361,6 +2606,7 @@ int WindowBaseEcoreWl2::GetBrightness() const wl_display_dispatch_queue(mDisplay, mEventQueue); count++; } + FINISH_DURATION_CHECK("ecore_wl2_display_flush"); if(!mBrightnessChangeDone) { @@ -2464,7 +2710,9 @@ bool WindowBaseEcoreWl2::GrabKeyList(const Dali::Vector& key, const D keyList = eina_list_append(keyList, &info); } + START_DURATION_CHECK(); Eina_List* grabList = ecore_wl2_window_keygrab_list_set(mEcoreWindow, keyList); + FINISH_DURATION_CHECK("ecore_wl2_window_keygrab_list_set"); result.Resize(keyCount, true); @@ -2522,7 +2770,9 @@ bool WindowBaseEcoreWl2::UngrabKeyList(const Dali::Vector& key, Dali: keyList = eina_list_append(keyList, &info); } + START_DURATION_CHECK(); Eina_List* ungrabList = ecore_wl2_window_keygrab_list_unset(mEcoreWindow, keyList); + FINISH_DURATION_CHECK("ecore_wl2_window_keygrab_list_unset"); result.Resize(keyCount, true); @@ -2609,12 +2859,16 @@ void WindowBaseEcoreWl2::SetWindowRotationAngle(int degree) void WindowBaseEcoreWl2::WindowRotationCompleted(int degree, int width, int height) { + START_DURATION_CHECK(); ecore_wl2_window_rotation_change_done_send(mEcoreWindow, degree, width, height); + FINISH_DURATION_CHECK("ecore_wl2_window_rotation_change_done_send"); } void WindowBaseEcoreWl2::SetTransparency(bool transparent) { + START_DURATION_CHECK(); ecore_wl2_window_alpha_set(mEcoreWindow, transparent); + FINISH_DURATION_CHECK("ecore_wl2_window_alpha_set"); } void WindowBaseEcoreWl2::CreateWindow(PositionSize positionSize) @@ -2625,6 +2879,7 @@ void WindowBaseEcoreWl2::CreateWindow(PositionSize positionSize) DALI_ASSERT_ALWAYS(0 && "Failed to get display"); } + START_DURATION_CHECK(); ecore_wl2_display_sync(display); mEcoreWindow = ecore_wl2_window_new(display, NULL, positionSize.x, positionSize.y, positionSize.width, positionSize.height); @@ -2636,9 +2891,7 @@ void WindowBaseEcoreWl2::CreateWindow(PositionSize positionSize) // Set default type ecore_wl2_window_type_set(mEcoreWindow, ECORE_WL2_WINDOW_TYPE_TOPLEVEL); - - // Get Screen width, height - ecore_wl2_display_screen_size_get(display, &mScreenWidth, &mScreenHeight); + FINISH_DURATION_CHECK("ecore_wl2 functions"); } void WindowBaseEcoreWl2::SetParent(WindowBase* parentWinBase, bool belowParent) @@ -2649,7 +2902,10 @@ void WindowBaseEcoreWl2::SetParent(WindowBase* parentWinBase, bool belowParent) WindowBaseEcoreWl2* winBaseEcore2 = static_cast(parentWinBase); ecoreParent = winBaseEcore2->mEcoreWindow; } + + START_DURATION_CHECK(); ecore_wl2_window_transient_parent_set(mEcoreWindow, ecoreParent, belowParent); + FINISH_DURATION_CHECK("ecore_wl2_window_transient_parent_set"); } int WindowBaseEcoreWl2::CreateFrameRenderedSyncFence() @@ -2665,7 +2921,9 @@ int WindowBaseEcoreWl2::CreateFramePresentedSyncFence() void WindowBaseEcoreWl2::SetPositionSizeWithAngle(PositionSize positionSize, int angle) { DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::SetPositionSizeWithAngle, angle: %d, x: %d, y: %d, w: %d, h: %d\n", angle, positionSize.x, positionSize.y, positionSize.width, positionSize.height); + START_DURATION_CHECK(); ecore_wl2_window_rotation_geometry_set(mEcoreWindow, angle, positionSize.x, positionSize.y, positionSize.width, positionSize.height); + FINISH_DURATION_CHECK("ecore_wl2_window_rotation_geometry_set"); } void WindowBaseEcoreWl2::InitializeIme() @@ -2695,6 +2953,7 @@ void WindowBaseEcoreWl2::InitializeIme() return; } + START_DURATION_CHECK(); EINA_ITERATOR_FOREACH(globals, global) { #ifdef OVER_TIZEN_VERSION_7 @@ -2740,6 +2999,7 @@ void WindowBaseEcoreWl2::InitializeIme() #else wl_input_panel_surface_set_toplevel(mWlInputPanelSurface, mWlOutput, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM); #endif + FINISH_DURATION_CHECK("zwp_input_panel_surface_v1_set_toplevel"); } void WindowBaseEcoreWl2::ImeWindowReadyToRender() @@ -2749,11 +3009,14 @@ void WindowBaseEcoreWl2::ImeWindowReadyToRender() DALI_LOG_ERROR("WindowBaseEcoreWl2::ImeWindowReadyToRender(), wayland input panel surface is null\n"); return; } + + START_DURATION_CHECK(); #ifdef OVER_TIZEN_VERSION_7 zwp_input_panel_surface_v1_set_ready(mWlInputPanelSurface, 1); #else wl_input_panel_surface_set_ready(mWlInputPanelSurface, 1); #endif + FINISH_DURATION_CHECK("zwp_input_panel_surface_v1_set_ready"); } void WindowBaseEcoreWl2::RequestMoveToServer() @@ -2772,7 +3035,9 @@ void WindowBaseEcoreWl2::RequestMoveToServer() return; } + START_DURATION_CHECK(); ecore_wl2_window_move(mEcoreWindow, input); + FINISH_DURATION_CHECK("ecore_wl2_window_move"); DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::RequestMoveToServer, starts the window[%p] is moved by server\n", mEcoreWindow); } @@ -2792,63 +3057,18 @@ void WindowBaseEcoreWl2::RequestResizeToServer(WindowResizeDirection direction) return; } - int location = 0; - switch(direction) - { - case WindowResizeDirection::TOP_LEFT: - { - location = 5; - break; - } - case WindowResizeDirection::TOP: - { - location = 1; - break; - } - case WindowResizeDirection::TOP_RIGHT: - { - location = 9; - break; - } - case WindowResizeDirection::LEFT: - { - location = 4; - break; - } - case WindowResizeDirection::RIGHT: - { - location = 8; - break; - } - case WindowResizeDirection::BOTTOM_LEFT: - { - location = 6; - break; - } - case WindowResizeDirection::BOTTOM: - { - location = 2; - break; - } - case WindowResizeDirection::BOTTOM_RIGHT: - { - location = 10; - break; - } - default: - { - location = 0; - break; - } - } + ResizeLocation location = RecalculateLocationToCurrentOrientation(direction, mWindowRotationAngle); - ecore_wl2_window_resize(mEcoreWindow, input, location); - DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::RequestResizeToServer, starts the window[%p] is resized by server, mode:%d\n", mEcoreWindow, location); + START_DURATION_CHECK(); + ecore_wl2_window_resize(mEcoreWindow, input, static_cast(location)); + FINISH_DURATION_CHECK("ecore_wl2_window_resize"); + DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::RequestResizeToServer, starts the window[%p] is resized by server, direction:%d oriention:%d mode:%d\n", mEcoreWindow, direction, mWindowRotationAngle, location); } void WindowBaseEcoreWl2::EnableFloatingMode(bool enable) { DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::EnableFloatingMode, floating mode flag: [%p], enable [%d]\n", mEcoreWindow, enable); + START_DURATION_CHECK(); if(enable == true) { ecore_wl2_window_floating_mode_set(mEcoreWindow, EINA_TRUE); @@ -2857,6 +3077,7 @@ void WindowBaseEcoreWl2::EnableFloatingMode(bool enable) { ecore_wl2_window_floating_mode_set(mEcoreWindow, EINA_FALSE); } + FINISH_DURATION_CHECK("ecore_wl2_window_floating_mode_set"); } bool WindowBaseEcoreWl2::IsFloatingModeEnabled() const @@ -2866,25 +3087,35 @@ bool WindowBaseEcoreWl2::IsFloatingModeEnabled() const void WindowBaseEcoreWl2::IncludeInputRegion(const Rect& inputRegion) { + Rect convertRegion = RecalculateInputRect(inputRegion); Eina_Rectangle rect; - rect.x = inputRegion.x; - rect.y = inputRegion.y; - rect.w = inputRegion.width; - rect.h = inputRegion.height; + rect.x = convertRegion.x; + rect.y = convertRegion.y; + rect.w = convertRegion.width; + rect.h = convertRegion.height; + + DALI_LOG_RELEASE_INFO("%p, Add input_rect(%d, %d, %d x %d)\n", mEcoreWindow, rect.x, rect.y, rect.w, rect.h); + START_DURATION_CHECK(); ecore_wl2_window_input_rect_add(mEcoreWindow, &rect); + FINISH_DURATION_CHECK("ecore_wl2_window_input_rect_add"); ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE); } void WindowBaseEcoreWl2::ExcludeInputRegion(const Rect& inputRegion) { + Rect convertRegion = RecalculateInputRect(inputRegion); Eina_Rectangle rect; - rect.x = inputRegion.x; - rect.y = inputRegion.y; - rect.w = inputRegion.width; - rect.h = inputRegion.height; + rect.x = convertRegion.x; + rect.y = convertRegion.y; + rect.w = convertRegion.width; + rect.h = convertRegion.height; + + DALI_LOG_RELEASE_INFO("%p, Subtract input_rect(%d, %d, %d x %d)\n", mEcoreWindow, rect.x, rect.y, rect.w, rect.h); + START_DURATION_CHECK(); ecore_wl2_window_input_rect_subtract(mEcoreWindow, &rect); + FINISH_DURATION_CHECK("ecore_wl2_window_input_rect_subtract"); ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE); }