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=3594c91c160da471c8e9ae760bec58806b0a44c6;hb=53e595b8a02e5f7e7ab572c3ac15e94bee013306;hp=4fe0a30d99ca7a256b2866ea7adbd339751fae78;hpb=fc524f3d9be18228bb044fcfd2a8dc75c5ebbaf1;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 4fe0a30..3594c91 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) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -31,11 +31,16 @@ // EXTERNAL_HEADERS #include #include +#include #include #include #include + +#if defined(VCONF_ENABLED) #include #include +#endif + #include namespace Dali @@ -50,15 +55,14 @@ namespace Debug::Filter* gWindowBaseLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_WINDOW_BASE"); #endif +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; +#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. - -// DBUS accessibility -const char* BUS = "org.enlightenment.wm-screen-reader"; -const char* INTERFACE = "org.tizen.GestureNavigation"; -const char* PATH = "/org/tizen/GestureNavigation"; +#endif struct KeyCodeMap { @@ -447,9 +451,9 @@ static Eina_Bool EcoreEventDataSend(void* data, int type, void* event) } /** -* Called when the source window sends us about the selected content. -* For example, when item is selected in the clipboard. -*/ + * Called when the source window sends us about the selected content. + * For example, when item is selected in the clipboard. + */ static Eina_Bool EcoreEventDataReceive(void* data, int type, void* event) { WindowBaseEcoreWl2* windowBase = static_cast(data); @@ -506,9 +510,8 @@ static Eina_Bool EcoreEventEffectEnd(void* data, int type, void* event) static Eina_Bool EcoreEventSeatKeyboardRepeatChanged(void* data, int type, void* event) { - Ecore_Wl2_Event_Seat_Keyboard_Repeat_Changed* keyboardRepeat = static_cast(event); - WindowBaseEcoreWl2* windowBase = static_cast(data); - DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::EcoreEventSeatKeyboardRepeatChanged, id[ %d ]\n", keyboardRepeat->id); + WindowBaseEcoreWl2* windowBase = static_cast(data); + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::EcoreEventSeatKeyboardRepeatChanged, id[ %d ]\n", static_cast(event)->id); if(windowBase) { windowBase->OnKeyboardRepeatSettingsChanged(); @@ -536,6 +539,7 @@ static Eina_Bool EcoreEventSeatKeymapChanged(void* data, int type, void* event) // Font Callbacks ///////////////////////////////////////////////////////////////////////////////////////////////// +#if defined(VCONF_ENABLED) /** * Called when a font name is changed. */ @@ -559,6 +563,7 @@ static void VconfNotifyFontSizeChanged(keynode_t* node, void* data) windowBase->OnFontSizeChanged(); } } +#endif ///////////////////////////////////////////////////////////////////////////////////////////////// // Window Redraw Request Event Callbacks @@ -566,9 +571,8 @@ static void VconfNotifyFontSizeChanged(keynode_t* node, void* data) static Eina_Bool EcoreEventWindowRedrawRequest(void* data, int type, void* event) { - Ecore_Wl2_Event_Window_Redraw_Request* windowRedrawRequest = static_cast(event); - WindowBaseEcoreWl2* windowBase = static_cast(data); - DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::EcoreEventWindowRedrawRequest, window[ %d ]\n", windowRedrawRequest->win); + WindowBaseEcoreWl2* windowBase = static_cast(data); + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::EcoreEventWindowRedrawRequest, window[ %d ]\n", static_cast(event)->win); if(windowBase) { windowBase->OnEcoreEventWindowRedrawRequest(); @@ -578,20 +582,17 @@ static Eina_Bool EcoreEventWindowRedrawRequest(void* data, int type, void* event } ///////////////////////////////////////////////////////////////////////////////////////////////// -// ElDBus Accessibility Callbacks +// Window Auxiliary Message Callbacks ///////////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef DALI_ELDBUS_AVAILABLE -// Callback for Ecore ElDBus accessibility events. -static void EcoreElDBusAccessibilityNotification(void* context, const Eldbus_Message* message) +static Eina_Bool EcoreEventWindowAuxiliaryMessage(void* data, int type, void* event) { - WindowBaseEcoreWl2* windowBase = static_cast(context); + WindowBaseEcoreWl2* windowBase = static_cast(data); if(windowBase) { - windowBase->OnEcoreElDBusAccessibilityNotification(context, message); + windowBase->OnEcoreEventWindowAuxiliaryMessage(event); } + return ECORE_CALLBACK_RENEW; } -#endif // DALI_ELDBUS_AVAILABLE static void RegistryGlobalCallback(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version) { @@ -698,6 +699,9 @@ WindowBaseEcoreWl2::WindowBaseEcoreWl2(Dali::PositionSize positionSize, Any surf : mEcoreEventHandler(), mEcoreWindow(nullptr), mWlSurface(nullptr), + mWlInputPanel(nullptr), + mWlOutput(nullptr), + mWlInputPanelSurface(nullptr), mEglWindow(nullptr), mDisplay(nullptr), mEventQueue(nullptr), @@ -705,44 +709,37 @@ WindowBaseEcoreWl2::WindowBaseEcoreWl2(Dali::PositionSize positionSize, Any surf mTizenDisplayPolicy(nullptr), mKeyMap(nullptr), mSupportedAuxiliaryHints(), + mWindowPositionSize(positionSize), mAuxiliaryHints(), + mType(WindowType::NORMAL), mNotificationLevel(-1), - mNotificationChangeState(0), - mNotificationLevelChangeDone(true), mScreenOffMode(0), - mScreenOffModeChangeState(0), - mScreenOffModeChangeDone(true), mBrightness(0), + mWindowRotationAngle(0), + mScreenRotationAngle(0), + mSupportedPreProtation(0), + mScreenWidth(0), + mScreenHeight(0), + mNotificationChangeState(0), + mScreenOffModeChangeState(0), mBrightnessChangeState(0), - mBrightnessChangeDone(true), + mLastSubmittedMoveResizeSerial(0), + mMoveResizeSerial(0), + mNotificationLevelChangeDone(true), + mScreenOffModeChangeDone(true), mVisible(true), - mWindowPositionSize(positionSize), mOwnSurface(false), - mMoveResizeSerial(0), - mLastSubmittedMoveResizeSerial(0), - mWindowRotationAngle(0), - mScreenRotationAngle(0), - mSupportedPreProtation(0) -#ifdef DALI_ELDBUS_AVAILABLE - , - mSystemConnection(NULL) -#endif + mBrightnessChangeDone(true) { Initialize(positionSize, surface, isTransparent); } WindowBaseEcoreWl2::~WindowBaseEcoreWl2() { -#ifdef DALI_ELDBUS_AVAILABLE - // Close down ElDBus connections. - if(mSystemConnection) - { - eldbus_connection_unref(mSystemConnection); - } -#endif // DALI_ELDBUS_AVAILABLE - +#if defined(VCONF_ENABLED) vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged); vconf_ignore_key_changed(DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged); +#endif for(Dali::Vector::Iterator iter = mEcoreEventHandler.Begin(), endIter = mEcoreEventHandler.End(); iter != endIter; ++iter) { @@ -836,11 +833,14 @@ void WindowBaseEcoreWl2::Initialize(PositionSize positionSize, Any surface, bool // Register Window redraw request event mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_REDRAW_REQUEST, EcoreEventWindowRedrawRequest, this)); - // Register Vconf notify - font name and size - vconf_notify_key_changed(DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, this); - vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, this); + // Register Window auxiliary event + mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL2_EVENT_AUX_MESSAGE, EcoreEventWindowAuxiliaryMessage, this)); - InitializeEcoreElDBus(); +#if defined(VCONF_ENABLED) + // Register Vconf notify - font name and size + vconf_notify_key_changed_for_ui_thread(DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, this); + vconf_notify_key_changed_for_ui_thread(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, this); +#endif Ecore_Wl2_Display* display = ecore_wl2_connected_display_get(NULL); mDisplay = ecore_wl2_display_get(display); @@ -980,21 +980,26 @@ void WindowBaseEcoreWl2::OnRotation(void* data, int type, void* event) RotationEvent rotationEvent; rotationEvent.angle = ev->angle; rotationEvent.winResize = 0; - mWindowRotationAngle = ev->angle; - if(ev->angle == 0 || ev->angle == 180) - { - rotationEvent.width = ev->w; - rotationEvent.height = ev->h; - } - else + if(ev->w == 0 || ev->h == 0) { - rotationEvent.width = ev->h; - rotationEvent.height = ev->w; + // When rotation event does not have the window width or height, + // previous DALi side window's size are used. + ev->w = mWindowPositionSize.width; + ev->h = mWindowPositionSize.height; } - mWindowPositionSize.width = rotationEvent.width; - mWindowPositionSize.height = rotationEvent.height; + mWindowRotationAngle = ev->angle; + + mWindowPositionSize.width = ev->w; + mWindowPositionSize.height = ev->h; + + PositionSize newPositionSize = RecalculatePositionSizeToCurrentOrientation(mWindowPositionSize); + + rotationEvent.x = newPositionSize.x; + rotationEvent.y = newPositionSize.y; + rotationEvent.width = newPositionSize.width; + rotationEvent.height = newPositionSize.height; mRotationSignal.Emit(rotationEvent); } @@ -1034,7 +1039,16 @@ void WindowBaseEcoreWl2::OnConfiguration(void* data, int type, void* event) if(windowMoved || windowResized) { - Dali::PositionSize newPositionSize(ev->x, ev->y, newWidth, newHeight); + mWindowPositionSize.x = ev->x; + mWindowPositionSize.y = ev->y; + mWindowPositionSize.width = newWidth; + mWindowPositionSize.height = newHeight; + DALI_LOG_RELEASE_INFO("Update position & resize signal by server, current angle [%d] x[%d] y[%d] w[%d] h[%d]\n", mWindowRotationAngle, mWindowPositionSize.x, mWindowPositionSize.y, mWindowPositionSize.width, mWindowPositionSize.height); + + ecore_wl2_window_geometry_set(mEcoreWindow, mWindowPositionSize.x, mWindowPositionSize.y, mWindowPositionSize.width, mWindowPositionSize.height); + + Dali::PositionSize newPositionSize = RecalculatePositionSizeToCurrentOrientation(mWindowPositionSize); + DALI_LOG_RELEASE_INFO("emit signal to update window's position and size, x[%d] y[%d] w[%d] h[%d]\n", newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); mUpdatePositionSizeSignal.Emit(newPositionSize); } @@ -1172,10 +1186,9 @@ void WindowBaseEcoreWl2::OnDetentRotation(void* data, int type, void* event) DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl2::OnDetentRotation\n"); - int direction = (detentEvent->direction == ECORE_DETENT_DIRECTION_CLOCKWISE) ? 1 : -1; - int timeStamp = detentEvent->timestamp; + int32_t clockwise = (detentEvent->direction == ECORE_DETENT_DIRECTION_CLOCKWISE) ? 1 : -1; - Integration::WheelEvent wheelEvent(Integration::WheelEvent::CUSTOM_WHEEL, direction, 0, Vector2(0.0f, 0.0f), 0, timeStamp); + Integration::WheelEvent wheelEvent(Integration::WheelEvent::CUSTOM_WHEEL, detentEvent->direction, 0, Vector2(0.0f, 0.0f), clockwise, detentEvent->timestamp); mWheelEventSignal.Emit(wheelEvent); } @@ -1186,13 +1199,20 @@ void WindowBaseEcoreWl2::OnKeyDown(void* data, int type, void* event) if(keyEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { - DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnKeyDown\n"); - std::string keyName(keyEvent->keyname); std::string logicalKey(""); std::string keyString(""); std::string compose(""); +#ifdef TRACE_ENABLED + std::ostringstream stream; + if(gTraceFilter->IsTraceEnabled()) + { + stream << "DALI_ON_KEY_DOWN [" << keyName << "]\n"; + DALI_TRACE_BEGIN(gTraceFilter, stream.str().c_str()); + } +#endif + // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string. if(keyEvent->compose) { @@ -1239,6 +1259,13 @@ 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 } } @@ -1248,8 +1275,6 @@ void WindowBaseEcoreWl2::OnKeyUp(void* data, int type, void* event) if(keyEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { - DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnKeyUp\n"); - #if defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR) && (ECORE_VERSION_MINOR >= 23) // Cancel processing flag is sent because this key event will combine with the previous key. So, the event should not actually perform anything. if(keyEvent->event_flags & ECORE_EVENT_FLAG_CANCEL) @@ -1264,6 +1289,15 @@ 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 + // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string. if(keyEvent->compose) { @@ -1310,6 +1344,13 @@ 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 } } @@ -1333,21 +1374,6 @@ void WindowBaseEcoreWl2::OnFontSizeChanged() mStyleChangedSignal.Emit(StyleChange::DEFAULT_FONT_SIZE_CHANGE); } -void WindowBaseEcoreWl2::OnEcoreElDBusAccessibilityNotification(void* context, const Eldbus_Message* message) -{ -#ifdef DALI_ELDBUS_AVAILABLE - AccessibilityInfo info; - - // The string defines the arg-list's respective types. - if(!eldbus_message_arguments_get(message, "iiiiiiu", &info.gestureValue, &info.startX, &info.startY, &info.endX, &info.endY, &info.state, &info.eventTime)) - { - DALI_LOG_ERROR("OnEcoreElDBusAccessibilityNotification: Error getting arguments\n"); - } - - mAccessibilitySignal.Emit(info); -#endif -} - void WindowBaseEcoreWl2::OnTransitionEffectEvent(WindowEffectState state, WindowEffectType type) { mTransitionEffectEventSignal.Emit(state, type); @@ -1363,6 +1389,32 @@ void WindowBaseEcoreWl2::OnEcoreEventWindowRedrawRequest() mWindowRedrawRequestSignal.Emit(); } +void WindowBaseEcoreWl2::OnEcoreEventWindowAuxiliaryMessage(void* event) +{ + Ecore_Wl2_Event_Aux_Message* message = static_cast(event); + if(message) + { + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnEcoreEventWindowAuxiliaryMessage, key:%s, value:%s \n", message->key, message->val); + std::string key(message->key); + std::string value(message->val); + Dali::Property::Array options; + + if(message->options) + { + Eina_List* l; + void* data; + EINA_LIST_FOREACH(message->options, l, data) + { + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnEcoreEventWindowAuxiliaryMessage, option: %s\n", (char*)data); + std::string option(static_cast(data)); + options.Add(option); + } + } + + mAuxiliaryMessageSignal.Emit(key, value, options); + } +} + void WindowBaseEcoreWl2::KeymapChanged(void* data, int type, void* event) { Ecore_Wl2_Event_Seat_Keymap_Changed* changed = static_cast(event); @@ -1467,6 +1519,15 @@ int WindowBaseEcoreWl2::GetNativeWindowId() return ecore_wl2_window_id_get(mEcoreWindow); } +std::string WindowBaseEcoreWl2::GetNativeWindowResourceId() +{ +#ifdef OVER_TIZEN_VERSION_7 + return std::to_string(ecore_wl2_window_resource_id_get(mEcoreWindow)); +#else + return std::string(); +#endif +} + EGLNativeWindowType WindowBaseEcoreWl2::CreateEglWindow(int width, int height) { int totalAngle = (mWindowRotationAngle + mScreenRotationAngle) % 360; @@ -1624,22 +1685,109 @@ bool WindowBaseEcoreWl2::IsEglWindowRotationSupported() return false; } +PositionSize WindowBaseEcoreWl2::RecalculatePositionSizeToSystem(PositionSize positionSize) +{ + PositionSize newPositionSize; + + if(mWindowRotationAngle == 90) + { + newPositionSize.x = positionSize.y; + newPositionSize.y = mScreenHeight - (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.width = positionSize.width; + newPositionSize.height = positionSize.height; + } + else if(mWindowRotationAngle == 270) + { + newPositionSize.x = mScreenWidth - (positionSize.y + positionSize.height); + newPositionSize.y = positionSize.x; + newPositionSize.width = positionSize.height; + newPositionSize.height = positionSize.width; + } + else + { + newPositionSize.x = positionSize.x; + newPositionSize.y = positionSize.y; + newPositionSize.width = positionSize.width; + newPositionSize.height = positionSize.height; + } + + DALI_LOG_RELEASE_INFO("input coord x[%d], y[%d], w{%d], h[%d], screen w[%d], h[%d]\n", positionSize.x, positionSize.y, positionSize.width, positionSize.height, mScreenWidth, mScreenHeight); + DALI_LOG_RELEASE_INFO("recalc coord x[%d], y[%d], w{%d], h[%d]\n", newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); + + return newPositionSize; +} + +PositionSize WindowBaseEcoreWl2::RecalculatePositionSizeToCurrentOrientation(PositionSize positionSize) +{ + PositionSize newPositionSize; + + if(mWindowRotationAngle == 90) + { + newPositionSize.x = mScreenHeight - (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.width = positionSize.width; + newPositionSize.height = positionSize.height; + } + else if(mWindowRotationAngle == 270) + { + newPositionSize.x = positionSize.y; + newPositionSize.y = mScreenWidth - (positionSize.x + positionSize.width); + newPositionSize.width = positionSize.height; + newPositionSize.height = positionSize.width; + } + else + { + newPositionSize.x = positionSize.x; + newPositionSize.y = positionSize.y; + newPositionSize.width = positionSize.width; + newPositionSize.height = positionSize.height; + } + + DALI_LOG_RELEASE_INFO("input coord x[%d], y[%d], w{%d], h[%d], screen w[%d], h[%d]\n", positionSize.x, positionSize.y, positionSize.width, positionSize.height, mScreenWidth, mScreenHeight); + DALI_LOG_RELEASE_INFO("recalc by current orientation coord x[%d], y[%d], w{%d], h[%d]\n", newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); + + return newPositionSize; +} + void WindowBaseEcoreWl2::Move(PositionSize positionSize) { - mWindowPositionSize = positionSize; - ecore_wl2_window_position_set(mEcoreWindow, positionSize.x, positionSize.y); + PositionSize newPositionSize = RecalculatePositionSizeToSystem(positionSize); + + mWindowPositionSize = newPositionSize; + DALI_LOG_RELEASE_INFO("ecore_wl2_window_position_set x[%d], y[%d]\n", newPositionSize.x, newPositionSize.y); + ecore_wl2_window_position_set(mEcoreWindow, newPositionSize.x, newPositionSize.y); } void WindowBaseEcoreWl2::Resize(PositionSize positionSize) { - mWindowPositionSize = positionSize; - ecore_wl2_window_geometry_set(mEcoreWindow, positionSize.x, positionSize.y, positionSize.width, positionSize.height); + PositionSize newPositionSize = RecalculatePositionSizeToSystem(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); + ecore_wl2_window_sync_geometry_set(mEcoreWindow, ++mMoveResizeSerial, newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); } void WindowBaseEcoreWl2::MoveResize(PositionSize positionSize) { - mWindowPositionSize = positionSize; - ecore_wl2_window_sync_geometry_set(mEcoreWindow, ++mMoveResizeSerial, positionSize.x, positionSize.y, positionSize.width, positionSize.height); + PositionSize newPositionSize = RecalculatePositionSizeToSystem(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); + ecore_wl2_window_sync_geometry_set(mEcoreWindow, ++mMoveResizeSerial, newPositionSize.x, newPositionSize.y, newPositionSize.width, newPositionSize.height); } void WindowBaseEcoreWl2::SetClass(const std::string& name, const std::string& className) @@ -1664,6 +1812,38 @@ void WindowBaseEcoreWl2::Activate() ecore_wl2_window_activate(mEcoreWindow); } +void WindowBaseEcoreWl2::Maximize(bool maximize) +{ + ecore_wl2_window_maximized_set(mEcoreWindow, maximize); +} + +bool WindowBaseEcoreWl2::IsMaximized() const +{ + return ecore_wl2_window_maximized_get(mEcoreWindow); +} + +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()); + ecore_wl2_window_maximum_size_set(mEcoreWindow, size.GetWidth(), size.GetHeight()); +} + +void WindowBaseEcoreWl2::Minimize(bool minimize) +{ + ecore_wl2_window_iconified_set(mEcoreWindow, minimize); +} + +bool WindowBaseEcoreWl2::IsMinimized() const +{ + return ecore_wl2_window_iconified_get(mEcoreWindow); +} + +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()); + ecore_wl2_window_minimum_size_set(mEcoreWindow, size.GetWidth(), size.GetHeight()); +} + void WindowBaseEcoreWl2::SetAvailableAnlges(const std::vector& angles) { int rotations[4] = {0}; @@ -1671,7 +1851,7 @@ void WindowBaseEcoreWl2::SetAvailableAnlges(const std::vector& angles) for(std::size_t i = 0; i < angles.size(); ++i) { rotations[i] = static_cast(angles[i]); - DALI_LOG_RELEASE_INFO("%d ", rotations[i]); + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "%d ", rotations[i]); } ecore_wl2_window_available_rotations_set(mEcoreWindow, rotations, angles.size()); } @@ -1691,17 +1871,7 @@ void WindowBaseEcoreWl2::Show() { if(!mVisible) { - // Ecore-wl2 has the original window size - // and he always sends the window rotation event with the swapped size. - // So, to restore, dali should set the reswapped size(original window size) to ecore-wl2 for restoring. - if(mWindowRotationAngle == 0 || mWindowRotationAngle == 180) - { - ecore_wl2_window_geometry_set(mEcoreWindow, mWindowPositionSize.x, mWindowPositionSize.y, mWindowPositionSize.width, mWindowPositionSize.height); - } - else - { - ecore_wl2_window_geometry_set(mEcoreWindow, mWindowPositionSize.x, mWindowPositionSize.y, mWindowPositionSize.height, mWindowPositionSize.width); - } + ecore_wl2_window_geometry_set(mEcoreWindow, mWindowPositionSize.x, mWindowPositionSize.y, mWindowPositionSize.width, mWindowPositionSize.height); } mVisible = true; @@ -1845,38 +2015,51 @@ void WindowBaseEcoreWl2::SetInputRegion(const Rect& inputRegion) void WindowBaseEcoreWl2::SetType(Dali::WindowType type) { - Ecore_Wl2_Window_Type windowType; - - switch(type) + if(mType != type) { - case Dali::WindowType::NORMAL: - { - windowType = ECORE_WL2_WINDOW_TYPE_TOPLEVEL; - break; - } - case Dali::WindowType::NOTIFICATION: - { - windowType = ECORE_WL2_WINDOW_TYPE_NOTIFICATION; - break; - } - case Dali::WindowType::UTILITY: - { - windowType = ECORE_WL2_WINDOW_TYPE_UTILITY; - break; - } - case Dali::WindowType::DIALOG: - { - windowType = ECORE_WL2_WINDOW_TYPE_DIALOG; - break; - } - default: + mType = type; + Ecore_Wl2_Window_Type windowType; + + switch(type) { - windowType = ECORE_WL2_WINDOW_TYPE_TOPLEVEL; - break; + case Dali::WindowType::NORMAL: + { + windowType = ECORE_WL2_WINDOW_TYPE_TOPLEVEL; + break; + } + case Dali::WindowType::NOTIFICATION: + { + windowType = ECORE_WL2_WINDOW_TYPE_NOTIFICATION; + break; + } + case Dali::WindowType::UTILITY: + { + windowType = ECORE_WL2_WINDOW_TYPE_UTILITY; + break; + } + case Dali::WindowType::DIALOG: + { + windowType = ECORE_WL2_WINDOW_TYPE_DIALOG; + break; + } + case Dali::WindowType::IME: + { + windowType = ECORE_WL2_WINDOW_TYPE_NONE; + break; + } + default: + { + windowType = ECORE_WL2_WINDOW_TYPE_TOPLEVEL; + break; + } } + ecore_wl2_window_type_set(mEcoreWindow, windowType); } +} - ecore_wl2_window_type_set(mEcoreWindow, windowType); +Dali::WindowType WindowBaseEcoreWl2::GetType() const +{ + return mType; } Dali::WindowOperationResult WindowBaseEcoreWl2::SetNotificationLevel(Dali::WindowNotificationLevel level) @@ -1940,7 +2123,7 @@ Dali::WindowOperationResult WindowBaseEcoreWl2::SetNotificationLevel(Dali::Windo if(!mNotificationLevelChangeDone) { DALI_LOG_INFO(gWindowBaseLogFilter, Debug::Verbose, "WindowBaseEcoreWl2::SetNotificationLevel: Level change is failed [%d, %d]\n", level, mNotificationChangeState); - Dali::WindowOperationResult::UNKNOWN_ERROR; + return Dali::WindowOperationResult::UNKNOWN_ERROR; } else if(mNotificationChangeState == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED) { @@ -2427,78 +2610,275 @@ void WindowBaseEcoreWl2::SetTransparency(bool transparent) ecore_wl2_window_alpha_set(mEcoreWindow, transparent); } -void WindowBaseEcoreWl2::InitializeEcoreElDBus() +void WindowBaseEcoreWl2::CreateWindow(PositionSize positionSize) +{ + Ecore_Wl2_Display* display = ecore_wl2_display_connect(NULL); + if(!display) + { + DALI_ASSERT_ALWAYS(0 && "Failed to get display"); + } + + ecore_wl2_display_sync(display); + + mEcoreWindow = ecore_wl2_window_new(display, NULL, positionSize.x, positionSize.y, positionSize.width, positionSize.height); + + if(mEcoreWindow == 0) + { + DALI_ASSERT_ALWAYS(0 && "Failed to create Wayland window"); + } + + // 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); +} + +void WindowBaseEcoreWl2::SetParent(WindowBase* parentWinBase, bool belowParent) { -#ifdef DALI_ELDBUS_AVAILABLE - Eldbus_Object* object; - Eldbus_Proxy* manager; + Ecore_Wl2_Window* ecoreParent = NULL; + if(parentWinBase) + { + WindowBaseEcoreWl2* winBaseEcore2 = static_cast(parentWinBase); + ecoreParent = winBaseEcore2->mEcoreWindow; + } + ecore_wl2_window_transient_parent_set(mEcoreWindow, ecoreParent, belowParent); +} - if(!(mSystemConnection = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM))) +int WindowBaseEcoreWl2::CreateFrameRenderedSyncFence() +{ + return wl_egl_window_tizen_create_commit_sync_fd(mEglWindow); +} + +int WindowBaseEcoreWl2::CreateFramePresentedSyncFence() +{ + return wl_egl_window_tizen_create_presentation_sync_fd(mEglWindow); +} + +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); + ecore_wl2_window_rotation_geometry_set(mEcoreWindow, angle, positionSize.x, positionSize.y, positionSize.width, positionSize.height); +} + +void WindowBaseEcoreWl2::InitializeIme() +{ + Eina_Iterator* globals; + struct wl_registry* registry; + Ecore_Wl2_Global* global; + Ecore_Wl2_Display* ecoreWl2Display; + + if(!(ecoreWl2Display = ecore_wl2_connected_display_get(NULL))) + { + DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get ecore_wl2 connected display\n"); + return; + } + + DALI_LOG_RELEASE_INFO("InitializeIme: Ecore_Wl2_Display: %p, ecore wl window: %p\n", ecoreWl2Display, mEcoreWindow); + + if(!(registry = ecore_wl2_display_registry_get(ecoreWl2Display))) { - DALI_LOG_ERROR("Unable to get system bus\n"); + DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get ecore_wl2 display registry\n"); + return; } - object = eldbus_object_get(mSystemConnection, BUS, PATH); - if(!object) + if(!(globals = ecore_wl2_display_globals_get(ecoreWl2Display))) { - DALI_LOG_ERROR("Getting object failed\n"); + DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get ecore_wl2 globals\n"); return; } - manager = eldbus_proxy_get(object, INTERFACE); - if(!manager) + EINA_ITERATOR_FOREACH(globals, global) + { +#ifdef OVER_TIZEN_VERSION_7 + if(strcmp(global->interface, "zwp_input_panel_v1") == 0) + { + mWlInputPanel = (zwp_input_panel_v1*)wl_registry_bind(registry, global->id, &zwp_input_panel_v1_interface, 1); + } +#else + if(strcmp(global->interface, "wl_input_panel") == 0) + { + mWlInputPanel = (wl_input_panel*)wl_registry_bind(registry, global->id, &wl_input_panel_interface, 1); + } +#endif + else if(strcmp(global->interface, "wl_output") == 0) + { + mWlOutput = (wl_output*)wl_registry_bind(registry, global->id, &wl_output_interface, 1); + } + } + + if(!mWlInputPanel) { - DALI_LOG_ERROR("Getting proxy failed\n"); + DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get wayland input panel interface\n"); return; } - if(!eldbus_proxy_signal_handler_add(manager, "GestureDetected", EcoreElDBusAccessibilityNotification, this)) + if(!mWlOutput) { - DALI_LOG_ERROR("No signal handler returned\n"); + DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get wayland output panel interface\n"); + return; } +#ifdef OVER_TIZEN_VERSION_7 + mWlInputPanelSurface = zwp_input_panel_v1_get_input_panel_surface(mWlInputPanel, mWlSurface); +#else + mWlInputPanelSurface = wl_input_panel_get_input_panel_surface(mWlInputPanel, mWlSurface); +#endif + if(!mWlInputPanelSurface) + { + DALI_LOG_ERROR("WindowBaseEcoreWl2::InitializeIme(), fail to get wayland input panel surface\n"); + return; + } +#ifdef OVER_TIZEN_VERSION_7 + zwp_input_panel_surface_v1_set_toplevel(mWlInputPanelSurface, mWlOutput, ZWP_INPUT_PANEL_SURFACE_V1_POSITION_CENTER_BOTTOM); +#else + wl_input_panel_surface_set_toplevel(mWlInputPanelSurface, mWlOutput, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM); #endif } -void WindowBaseEcoreWl2::CreateWindow(PositionSize positionSize) +void WindowBaseEcoreWl2::ImeWindowReadyToRender() { - Ecore_Wl2_Display* display = ecore_wl2_display_connect(NULL); + if(!mWlInputPanelSurface) + { + DALI_LOG_ERROR("WindowBaseEcoreWl2::ImeWindowReadyToRender(), wayland input panel surface is null\n"); + return; + } +#ifdef OVER_TIZEN_VERSION_7 + zwp_input_panel_surface_v1_set_ready(mWlInputPanelSurface, 1); +#else + wl_input_panel_surface_set_ready(mWlInputPanelSurface, 1); +#endif +} + +void WindowBaseEcoreWl2::RequestMoveToServer() +{ + Ecore_Wl2_Display* display = ecore_wl2_connected_display_get(NULL); if(!display) { - DALI_ASSERT_ALWAYS(0 && "Failed to get display"); + DALI_LOG_ERROR("WindowBaseEcoreWl2::RequestMoveToServer, Fail to get ecore_wl2_display\n"); + return; } - ecore_wl2_display_sync(display); + Ecore_Wl2_Input* input = ecore_wl2_input_default_input_get(display); + if(!input) + { + DALI_LOG_ERROR("WindowBaseEcoreWl2::RequestMoveToServer, Fail to get default Ecore_Wl2_Input\n"); + return; + } - mEcoreWindow = ecore_wl2_window_new(display, NULL, positionSize.x, positionSize.y, positionSize.width, positionSize.height); + ecore_wl2_window_move(mEcoreWindow, input); + DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::RequestMoveToServer, starts the window[%p] is moved by server\n", mEcoreWindow); +} - if(mEcoreWindow == 0) +void WindowBaseEcoreWl2::RequestResizeToServer(WindowResizeDirection direction) +{ + Ecore_Wl2_Display* display = ecore_wl2_connected_display_get(NULL); + if(!display) { - DALI_ASSERT_ALWAYS(0 && "Failed to create Wayland window"); + DALI_LOG_ERROR("WindowBaseEcoreWl2::RequestResizeToServer, Fail to get ecore_wl2_display\n"); + return; } - // Set default type - ecore_wl2_window_type_set(mEcoreWindow, ECORE_WL2_WINDOW_TYPE_TOPLEVEL); + Ecore_Wl2_Input* input = ecore_wl2_input_default_input_get(display); + if(!input) + { + DALI_LOG_ERROR("WindowBaseEcoreWl2::RequestResizeToServer, Fail to get default Ecore_Wl2_Input\n"); + 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; + } + } + + 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); } -void WindowBaseEcoreWl2::SetParent(WindowBase* parentWinBase) +void WindowBaseEcoreWl2::EnableFloatingMode(bool enable) { - Ecore_Wl2_Window* ecoreParent = NULL; - if(parentWinBase) + DALI_LOG_RELEASE_INFO("WindowBaseEcoreWl2::EnableFloatingMode, floating mode flag: [%p], enable [%d]\n", mEcoreWindow, enable); + if(enable == true) { - WindowBaseEcoreWl2* winBaseEcore2 = static_cast(parentWinBase); - ecoreParent = winBaseEcore2->mEcoreWindow; + ecore_wl2_window_floating_mode_set(mEcoreWindow, EINA_TRUE); + } + else + { + ecore_wl2_window_floating_mode_set(mEcoreWindow, EINA_FALSE); } - ecore_wl2_window_parent_set(mEcoreWindow, ecoreParent); } -int WindowBaseEcoreWl2::CreateFrameRenderedSyncFence() +bool WindowBaseEcoreWl2::IsFloatingModeEnabled() const { - return wl_egl_window_tizen_create_commit_sync_fd(mEglWindow); + return ecore_wl2_window_floating_mode_get(mEcoreWindow); } -int WindowBaseEcoreWl2::CreateFramePresentedSyncFence() +void WindowBaseEcoreWl2::IncludeInputRegion(const Rect& inputRegion) { - return wl_egl_window_tizen_create_presentation_sync_fd(mEglWindow); + Eina_Rectangle rect; + rect.x = inputRegion.x; + rect.y = inputRegion.y; + rect.w = inputRegion.width; + rect.h = inputRegion.height; + + ecore_wl2_window_input_rect_add(mEcoreWindow, &rect); + ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE); +} + +void WindowBaseEcoreWl2::ExcludeInputRegion(const Rect& inputRegion) +{ + Eina_Rectangle rect; + rect.x = inputRegion.x; + rect.y = inputRegion.y; + rect.w = inputRegion.width; + rect.h = inputRegion.height; + + ecore_wl2_window_input_rect_subtract(mEcoreWindow, &rect); + ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE); } } // namespace Adaptor