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=1c6a63b3997c8d3300ca2de0dfbd7ce4d09a0582;hb=0baa433fd9d187e555e0d281e36119993aae132f;hp=c95ba100330b2e041d73c3fa521b9334d06c4771;hpb=3b0387df2e30a60ba820bd77f2fc89a2a8bc579d;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 c95ba10..1c6a63b 100755 --- 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) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -180,7 +180,6 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl deviceSubclass = Device::Subclass::TRACKBALL; break; } -#ifdef OVER_TIZEN_VERSION_4 case ECORE_DEVICE_SUBCLASS_REMOCON: { deviceSubclass = Device::Subclass::REMOCON; @@ -191,7 +190,6 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl deviceSubclass = Device::Subclass::VIRTUAL_KEYBOARD; break; } -#endif default: { deviceSubclass = Device::Subclass::NONE; @@ -277,6 +275,19 @@ static Eina_Bool EcoreEventRotate( void* data, int type, void* event ) return ECORE_CALLBACK_PASS_ON; } +/** + * Called when configure event is recevied. + */ +static Eina_Bool EcoreEventConfigure( void* data, int type, void* event ) +{ + WindowBaseEcoreWl2* windowBase = static_cast< WindowBaseEcoreWl2* >( data ); + if( windowBase ) + { + windowBase->OnConfiguration( data, type, event ); + } + return ECORE_CALLBACK_PASS_ON; +} + ///////////////////////////////////////////////////////////////////////////////////////////////// // Touch Callbacks ///////////////////////////////////////////////////////////////////////////////////////////////// @@ -421,25 +432,6 @@ static Eina_Bool EcoreEventDataReceive( void* data, int type, void* event ) } ///////////////////////////////////////////////////////////////////////////////////////////////// -// Indicator Callbacks -///////////////////////////////////////////////////////////////////////////////////////////////// - -#if defined (DALI_PROFILE_MOBILE) - /** - * Called when the Ecore indicator event is received. - */ - static Eina_Bool EcoreEventIndicator( void* data, int type, void* event ) - { - WindowBaseEcoreWl2* windowBase = static_cast< WindowBaseEcoreWl2* >( data ); - if( windowBase ) - { - windowBase->OnIndicatorFlicked( data, type, event ); - } - return ECORE_CALLBACK_PASS_ON; - } -#endif // DALI_PROFILE_MOBILE - -///////////////////////////////////////////////////////////////////////////////////////////////// // Font Callbacks ///////////////////////////////////////////////////////////////////////////////////////////////// @@ -609,7 +601,10 @@ WindowBaseEcoreWl2::WindowBaseEcoreWl2( Dali::PositionSize positionSize, Any sur mBrightnessChangeDone( true ), mOwnSurface( false ), mMoveResizeSerial( 0 ), - mLastSubmittedMoveResizeSerial( 0 ) + mLastSubmittedMoveResizeSerial( 0 ), + mWindowRotationAngle( 0 ), + mScreenRotationAngle( 0 ), + mSupportedPreProtation( 0 ) #ifdef DALI_ELDBUS_AVAILABLE , mSystemConnection( NULL ) #endif @@ -689,6 +684,9 @@ void WindowBaseEcoreWl2::Initialize( PositionSize positionSize, Any surface, boo // Register Rotate event mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_WINDOW_ROTATE, EcoreEventRotate, this ) ); + // Register Configure event + mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_WINDOW_CONFIGURE, EcoreEventConfigure, this ) ); + // Register Touch events mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_MOUSE_BUTTON_DOWN, EcoreEventMouseButtonDown, this ) ); mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_EVENT_MOUSE_BUTTON_UP, EcoreEventMouseButtonUp, this ) ); @@ -709,11 +707,6 @@ void WindowBaseEcoreWl2::Initialize( PositionSize positionSize, Any surface, boo mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_DATA_SOURCE_SEND, EcoreEventDataSend, this ) ); mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_SELECTION_DATA_READY, EcoreEventDataReceive, this ) ); -#if defined (DALI_PROFILE_MOBILE) - // Register indicator event - mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_INDICATOR_FLICK, EcoreEventIndicator, this ) ); -#endif - // 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 ); @@ -840,7 +833,7 @@ void WindowBaseEcoreWl2::OnRotation( void* data, int type, void* event ) if( ev->win == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) ) { - DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::OnRotation\n" ); + DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl2::OnRotation\n" ); RotationEvent rotationEvent; rotationEvent.angle = ev->angle; @@ -861,6 +854,18 @@ void WindowBaseEcoreWl2::OnRotation( void* data, int type, void* event ) } } +void WindowBaseEcoreWl2::OnConfiguration( void* data, int type, void* event ) +{ + Ecore_Wl2_Event_Window_Configure* ev( static_cast< Ecore_Wl2_Event_Window_Configure* >( event ) ); + + if( ev->win == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) ) + { + // Note: To comply with the wayland protocol, Dali should make an ack_configure + // by calling ecore_wl2_window_commit + ecore_wl2_window_commit(mEcoreWindow, EINA_FALSE); + } +} + void WindowBaseEcoreWl2::OnMouseButtonDown( void* data, int type, void* event ) { Ecore_Event_Mouse_Button* touchEvent = static_cast< Ecore_Event_Mouse_Button* >( event ); @@ -967,7 +972,7 @@ void WindowBaseEcoreWl2::OnMouseButtonCancel( void* data, int type, void* event mTouchEventSignal.Emit( point, touchEvent->timestamp ); - DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseButtonCancel\n" ); + DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnMouseButtonCancel\n" ); } } @@ -977,7 +982,7 @@ void WindowBaseEcoreWl2::OnMouseWheel( void* data, int type, void* event ) if( mouseWheelEvent->window == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) ) { - DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseWheel: direction: %d, modifiers: %d, x: %d, y: %d, z: %d\n", mouseWheelEvent->direction, mouseWheelEvent->modifiers, mouseWheelEvent->x, mouseWheelEvent->y, mouseWheelEvent->z ); + 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 ); WheelEvent wheelEvent( WheelEvent::MOUSE_WHEEL, mouseWheelEvent->direction, mouseWheelEvent->modifiers, Vector2( mouseWheelEvent->x, mouseWheelEvent->y ), mouseWheelEvent->z, mouseWheelEvent->timestamp ); @@ -989,7 +994,7 @@ void WindowBaseEcoreWl2::OnDetentRotation( void* data, int type, void* event ) { Ecore_Event_Detent_Rotate* detentEvent = static_cast< Ecore_Event_Detent_Rotate* >( event ); - DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::OnDetentRotation\n" ); + DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl2::OnDetentRotation\n" ); int direction = ( detentEvent->direction == ECORE_DETENT_DIRECTION_CLOCKWISE ) ? 1 : -1; int timeStamp = detentEvent->timestamp; @@ -1005,9 +1010,10 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event ) if( keyEvent->window == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) ) { - DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" ); + DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnKeyDown\n" ); std::string keyName( keyEvent->keyname ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -1017,6 +1023,12 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event ) compose = keyEvent->compose; } + // Ensure key symbol is not NULL as keys like SHIFT have a null string. + if( keyEvent->key ) + { + logicalKey = keyEvent->key; + } + int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname ); keyCode = ( keyCode == -1 ) ? 0 : keyCode; int modifier( keyEvent->modifiers ); @@ -1040,7 +1052,7 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event ) GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass ); GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass ); - Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass ); mKeyEventSignal.Emit( keyEvent ); } @@ -1052,9 +1064,10 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event ) if( keyEvent->window == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) ) { - DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" ); + DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnKeyUp\n" ); std::string keyName( keyEvent->keyname ); + std::string logicalKey( "" ); std::string keyString( "" ); std::string compose( "" ); @@ -1064,6 +1077,12 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event ) compose = keyEvent->compose; } + // Ensure key symbol is not NULL as keys like SHIFT have a null string. + if( keyEvent->key ) + { + logicalKey = keyEvent->key; + } + int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname ); keyCode = ( keyCode == -1 ) ? 0 : keyCode; int modifier( keyEvent->modifiers ); @@ -1087,7 +1106,7 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event ) GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass ); GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass ); - Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass ); + Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass ); mKeyEventSignal.Emit( keyEvent ); } @@ -1103,11 +1122,6 @@ void WindowBaseEcoreWl2::OnDataReceive( void* data, int type, void* event ) mSelectionDataReceivedSignal.Emit( event ); } -void WindowBaseEcoreWl2::OnIndicatorFlicked( void* data, int type, void* event ) -{ - mIndicatorFlickedSignal.Emit(); -} - void WindowBaseEcoreWl2::OnFontNameChanged() { mStyleChangedSignal.Emit( StyleChange::DEFAULT_FONT_CHANGE ); @@ -1226,38 +1240,38 @@ void WindowBaseEcoreWl2::DestroyEglWindow() void WindowBaseEcoreWl2::SetEglWindowRotation( int angle ) { - wl_egl_window_rotation rotation; + wl_egl_window_tizen_rotation rotation; switch( angle ) { case 0: { - rotation = ROTATION_0; + rotation = WL_EGL_WINDOW_TIZEN_ROTATION_0 ; break; } case 90: { - rotation = ROTATION_270; + rotation = WL_EGL_WINDOW_TIZEN_ROTATION_90; break; } case 180: { - rotation = ROTATION_180; + rotation = WL_EGL_WINDOW_TIZEN_ROTATION_180; break; } case 270: { - rotation = ROTATION_90; + rotation = WL_EGL_WINDOW_TIZEN_ROTATION_90; break; } default: { - rotation = ROTATION_0; + rotation = WL_EGL_WINDOW_TIZEN_ROTATION_0 ; break; } } - wl_egl_window_set_rotation( mEglWindow, rotation ); + wl_egl_window_tizen_set_rotation( mEglWindow, rotation ); } void WindowBaseEcoreWl2::SetEglWindowBufferTransform( int angle ) @@ -1293,7 +1307,7 @@ void WindowBaseEcoreWl2::SetEglWindowBufferTransform( int angle ) } } - wl_egl_window_set_buffer_transform( mEglWindow, bufferTransform ); + wl_egl_window_tizen_set_buffer_transform( mEglWindow, bufferTransform ); } void WindowBaseEcoreWl2::SetEglWindowTransform( int angle ) @@ -1329,7 +1343,7 @@ void WindowBaseEcoreWl2::SetEglWindowTransform( int angle ) } } - wl_egl_window_set_window_transform( mEglWindow, windowTransform ); + wl_egl_window_tizen_set_window_transform( mEglWindow, windowTransform ); } void WindowBaseEcoreWl2::ResizeEglWindow( PositionSize positionSize ) @@ -1347,12 +1361,13 @@ void WindowBaseEcoreWl2::ResizeEglWindow( PositionSize positionSize ) bool WindowBaseEcoreWl2::IsEglWindowRotationSupported() { // Check capability - wl_egl_window_capability capability = static_cast< wl_egl_window_capability >( wl_egl_window_get_capabilities( mEglWindow ) ); - if( capability == WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED ) + wl_egl_window_tizen_capability capability = static_cast< wl_egl_window_tizen_capability >( wl_egl_window_tizen_get_capabilities( mEglWindow ) ); + if( capability == WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_SUPPORTED ) { + mSupportedPreProtation = true; return true; } - + mSupportedPreProtation = false; return false; } @@ -1371,69 +1386,6 @@ void WindowBaseEcoreWl2::MoveResize( PositionSize positionSize ) ecore_wl2_window_sync_geometry_set( mEcoreWindow, ++mMoveResizeSerial, positionSize.x, positionSize.y, positionSize.width, positionSize.height ); } -void WindowBaseEcoreWl2::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode, Dali::Window::IndicatorBgOpacity opacityMode ) -{ - DALI_LOG_TRACE_METHOD_FMT( gWindowBaseLogFilter, "visible : %d\n", visibleMode ); - - if( visibleMode == Dali::Window::VISIBLE ) - { - // when the indicator is visible, set proper mode for indicator server according to bg mode - if( opacityMode == Dali::Window::OPAQUE ) - { - ecore_wl2_window_indicator_opacity_set( mEcoreWindow, ECORE_WL2_INDICATOR_OPAQUE ); - } - else if( opacityMode == Dali::Window::TRANSLUCENT ) - { - ecore_wl2_window_indicator_opacity_set( mEcoreWindow, ECORE_WL2_INDICATOR_TRANSLUCENT ); - } - else if( opacityMode == Dali::Window::TRANSPARENT ) - { - ecore_wl2_window_indicator_opacity_set( mEcoreWindow, ECORE_WL2_INDICATOR_OPAQUE ); - } - } - else - { - // when the indicator is not visible, set TRANSPARENT mode for indicator server - ecore_wl2_window_indicator_opacity_set( mEcoreWindow, ECORE_WL2_INDICATOR_TRANSPARENT); // it means hidden indicator - } -} - -void WindowBaseEcoreWl2::SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientation lastOrientation ) -{ - if( isShow ) - { - ecore_wl2_window_indicator_state_set( mEcoreWindow, ECORE_WL2_INDICATOR_STATE_ON ); - } - else - { - ecore_wl2_window_indicator_state_set( mEcoreWindow, ECORE_WL2_INDICATOR_STATE_OFF ); - } -} - -void WindowBaseEcoreWl2::IndicatorTypeChanged( IndicatorInterface::Type type ) -{ -#if defined(DALI_PROFILE_MOBILE) - switch( type ) - { - case IndicatorInterface::INDICATOR_TYPE_1: - { - ecore_wl2_indicator_visible_type_set( mEcoreWindow, ECORE_WL2_INDICATOR_VISIBLE_TYPE_SHOWN ); - break; - } - case IndicatorInterface::INDICATOR_TYPE_2: - { - ecore_wl2_indicator_visible_type_set( mEcoreWindow, ECORE_WL2_INDICATOR_VISIBLE_TYPE_HIDDEN ); - break; - } - case IndicatorInterface::INDICATOR_TYPE_UNKNOWN: - default: - { - break; - } - } -#endif //MOBILE -} - void WindowBaseEcoreWl2::SetClass( const std::string& name, const std::string& className ) { ecore_wl2_window_title_set( mEcoreWindow, name.c_str() ); @@ -2157,8 +2109,14 @@ void WindowBaseEcoreWl2::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiV dpiVertical = int( yres + 0.5f ); } -void WindowBaseEcoreWl2::SetViewMode( ViewMode viewMode ) +int WindowBaseEcoreWl2::GetOrientation() const { + int orientation = (mScreenRotationAngle + mWindowRotationAngle) % 360; + if( mSupportedPreProtation ) + { + orientation = 0; + } + return orientation; } int WindowBaseEcoreWl2::GetScreenRotationAngle() @@ -2173,15 +2131,21 @@ int WindowBaseEcoreWl2::GetScreenRotationAngle() { transform = ecore_wl2_output_transform_get( ecore_wl2_window_output_find( mEcoreWindow ) ); } - - return transform * 90; + mScreenRotationAngle = transform * 90; + return mScreenRotationAngle; } void WindowBaseEcoreWl2::SetWindowRotationAngle( int degree ) { + mWindowRotationAngle = degree; ecore_wl2_window_rotation_set( mEcoreWindow, degree ); } +int WindowBaseEcoreWl2::GetWindowRotationAngle() +{ + return mWindowRotationAngle; +} + void WindowBaseEcoreWl2::WindowRotationCompleted( int degree, int width, int height ) { ecore_wl2_window_rotation_change_done_send( mEcoreWindow, degree, width, height ); @@ -2243,6 +2207,37 @@ void WindowBaseEcoreWl2::CreateWindow( PositionSize positionSize ) ecore_wl2_window_type_set( mEcoreWindow, ECORE_WL2_WINDOW_TYPE_TOPLEVEL ); } +void WindowBaseEcoreWl2::SetParent( Any parent ) +{ + Ecore_Wl2_Window* mEcoreParent; + if( parent.Empty() == false ) + { + // check we have a valid type + DALI_ASSERT_ALWAYS( ( parent.GetType() == typeid (Ecore_Wl2_Window *) ) && "Parent's surface type is invalid" ); + mEcoreParent = AnyCast< Ecore_Wl2_Window* >( parent ); + } + else + { + mEcoreParent = NULL; + } + ecore_wl2_window_parent_set( mEcoreWindow, mEcoreParent ); +} + +bool WindowBaseEcoreWl2::IsMatchedWindow( Any window ) +{ + bool ret = false; + if ( window.Empty() == false ) + { + // check we have a valid type + DALI_ASSERT_ALWAYS( ( window.GetType() == typeid (Ecore_Wl2_Window *) ) && "Window's surface type is invalid" ); + if ( AnyCast< Ecore_Wl2_Window*>( window ) == mEcoreWindow ) + { + ret = true; + } + } + return ret; +} + } // namespace Adaptor } // namespace Internal