X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fcommon%2Fwindow-impl.cpp;h=948316470aca1634d14f47d60b4b289d09d9ee34;hb=91206d4971cc0c9b486b4b29b7f3157326bbd7aa;hp=4678b93b272e5e95629923e2568493c1f6780a6f;hpb=2cfd6a0b3d2661317a51c984ed9c4122bd0fbad4;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index 4678b93..9483164 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.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. @@ -20,20 +20,29 @@ // EXTERNAL HEADERS #include -#include +#include +#include #include #include #include +#include #include +#include + +#ifdef DALI_ADAPTOR_COMPILATION +#include +#else +#include +#endif // INTERNAL HEADERS -#include -#include +#include #include #include #include #include #include +#include namespace Dali { @@ -60,18 +69,18 @@ Window* Window::New( const PositionSize& positionSize, const std::string& name, } Window::Window() -: mSurface( NULL ), +: mWindowSurface( nullptr ), mWindowBase(), - mStarted( false ), mIsTransparent( false ), mIsFocusAcceptable( true ), - mVisible( true ), mIconified( false ), mOpaqueState( false ), mResizeEnabled( false ), - mAdaptor( NULL ), mType( Dali::Window::NORMAL ), mPreferredOrientation( Dali::Window::PORTRAIT ), + mRotationAngle( 0 ), + mWindowWidth( 0 ), + mWindowHeight( 0 ), mFocusChangedSignal(), mResizedSignal(), mDeleteRequestSignal() @@ -80,14 +89,10 @@ Window::Window() Window::~Window() { - if ( mAdaptor ) + if ( mEventHandler ) { - mAdaptor->RemoveObserver( *this ); - mAdaptor->SetDragAndDropDetector( NULL ); - mAdaptor = NULL; + mEventHandler->RemoveObserver( *this ); } - - delete mSurface; } void Window::Initialize(const PositionSize& positionSize, const std::string& name, const std::string& className) @@ -95,18 +100,18 @@ void Window::Initialize(const PositionSize& positionSize, const std::string& nam // Create a window render surface Any surface; auto renderSurfaceFactory = Dali::Internal::Adaptor::GetRenderSurfaceFactory(); - auto windowRenderSurface = renderSurfaceFactory->CreateWindowRenderSurface( positionSize, surface, mIsTransparent ); - mSurface = windowRenderSurface.release(); + mSurface = renderSurfaceFactory->CreateWindowRenderSurface( positionSize, surface, mIsTransparent ); + mWindowSurface = static_cast( mSurface.get() ); // Get a window base - mWindowBase = mSurface->GetWindowBase(); + mWindowBase = mWindowSurface->GetWindowBase(); // Connect signals mWindowBase->IconifyChangedSignal().Connect( this, &Window::OnIconifyChanged ); mWindowBase->FocusChangedSignal().Connect( this, &Window::OnFocusChanged ); mWindowBase->DeleteRequestSignal().Connect( this, &Window::OnDeleteRequest ); - mSurface->OutputTransformedSignal().Connect( this, &Window::OnOutputTransformed ); + mWindowSurface->OutputTransformedSignal().Connect( this, &Window::OnOutputTransformed ); if( !positionSize.IsEmpty() ) { @@ -116,34 +121,20 @@ void Window::Initialize(const PositionSize& positionSize, const std::string& nam SetClass( name, className ); - mSurface->Map(); + mWindowSurface->Map(); mOrientation = Orientation::New( this ); } -void Window::SetAdaptor(Dali::Adaptor& adaptor) +void Window::OnAdaptorSet(Dali::Adaptor& adaptor) { - DALI_ASSERT_ALWAYS( !mStarted && "Adaptor already started" ); - mStarted = true; - - // Create one overlay for the main window only - Internal::Adaptor::Adaptor& adaptorImpl = Internal::Adaptor::Adaptor::GetImplementation(adaptor); - mAdaptor = &adaptorImpl; - mAdaptor->AddObserver( *this ); - - // Can only create the detector when we know the Core has been instantiated. - mDragAndDropDetector = DragAndDropDetector::New(); - mAdaptor->SetDragAndDropDetector( &GetImplementation( mDragAndDropDetector ) ); - - if( mOrientation ) - { - mOrientation->SetAdaptor(adaptor); - } + mEventHandler = EventHandlerPtr(new EventHandler( mWindowSurface, *mAdaptor ) ); + mEventHandler->AddObserver( *this ); } -WindowRenderSurface* Window::GetSurface() +void Window::OnSurfaceSet( Dali::RenderSurfaceInterface* surface ) { - return mSurface; + mWindowSurface = static_cast( surface ); } void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode ) @@ -160,22 +151,47 @@ void Window::RotateIndicator( Dali::Window::WindowOrientation orientation ) void Window::SetClass( std::string name, std::string className ) { + mName = name; + mClassName = className; mWindowBase->SetClass( name, className ); } +std::string Window::GetClassName() const +{ + return mClassName; +} + void Window::Raise() { mWindowBase->Raise(); + DALI_LOG_RELEASE_INFO( "Window (%p) Raise() \n", this ); } void Window::Lower() { mWindowBase->Lower(); + DALI_LOG_RELEASE_INFO( "Window (%p) Lower() \n", this ); } void Window::Activate() { mWindowBase->Activate(); + DALI_LOG_RELEASE_INFO( "Window (%p) Activate() \n", this ); +} + +uint32_t Window::GetLayerCount() const +{ + return mScene.GetLayerCount(); +} + +Dali::Layer Window::GetLayer( uint32_t depth ) const +{ + return mScene.GetLayer( depth ); +} + +Dali::RenderTaskList Window::GetRenderTaskList() const +{ + return mScene.GetRenderTaskList(); } void Window::AddAvailableOrientation( Dali::Window::WindowOrientation orientation ) @@ -245,14 +261,9 @@ Dali::Window::WindowOrientation Window::GetPreferredOrientation() return mPreferredOrientation; } -Dali::DragAndDropDetector Window::GetDragAndDropDetector() const -{ - return mDragAndDropDetector; -} - Dali::Any Window::GetNativeHandle() const { - return mSurface->GetNativeWindow(); + return mWindowSurface->GetNativeWindow(); } void Window::SetAcceptFocus( bool accept ) @@ -299,7 +310,7 @@ void Window::Hide() bool Window::IsVisible() const { - return mVisible; + return mVisible && !mIconified; } unsigned int Window::GetSupportedAuxiliaryHintCount() const @@ -431,7 +442,7 @@ void Window::SetSize( Dali::Window::WindowSize size ) PositionSize oldRect = mSurface->GetPositionSize(); - mSurface->MoveResize( PositionSize( oldRect.x, oldRect.y, size.GetWidth(), size.GetHeight() ) ); + mWindowSurface->MoveResize( PositionSize( oldRect.x, oldRect.y, size.GetWidth(), size.GetHeight() ) ); PositionSize newRect = mSurface->GetPositionSize(); @@ -440,11 +451,13 @@ void Window::SetSize( Dali::Window::WindowSize size ) { Uint16Pair newSize( newRect.width, newRect.height ); - mAdaptor->SurfaceResizePrepare( newSize ); + SurfaceResized(); + + mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize ); mResizedSignal.Emit( newSize ); - mAdaptor->SurfaceResizeComplete( newSize ); + mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize ); } } @@ -465,7 +478,7 @@ void Window::SetPosition( Dali::Window::WindowPosition position ) PositionSize oldRect = mSurface->GetPositionSize(); - mSurface->MoveResize( PositionSize( position.GetX(), position.GetY(), oldRect.width, oldRect.height ) ); + mWindowSurface->MoveResize( PositionSize( position.GetX(), position.GetY(), oldRect.width, oldRect.height ) ); } Dali::Window::WindowPosition Window::GetPosition() const @@ -485,7 +498,7 @@ void Window::SetPositionSize( PositionSize positionSize ) PositionSize oldRect = mSurface->GetPositionSize(); - mSurface->MoveResize( positionSize ); + mWindowSurface->MoveResize( positionSize ); PositionSize newRect = mSurface->GetPositionSize(); @@ -494,17 +507,24 @@ void Window::SetPositionSize( PositionSize positionSize ) { Uint16Pair newSize( newRect.width, newRect.height ); - mAdaptor->SurfaceResizePrepare( newSize ); + SurfaceResized(); + + mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize ); mResizedSignal.Emit( newSize ); - mAdaptor->SurfaceResizeComplete( newSize ); + mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize ); } } +Dali::Layer Window::GetRootLayer() const +{ + return mScene.GetRootLayer(); +} + void Window::SetTransparency( bool transparent ) { - mSurface->SetTransparency( transparent ); + mWindowSurface->SetTransparency( transparent ); } bool Window::GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) @@ -527,18 +547,6 @@ bool Window::UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< return mWindowBase->UngrabKeyList( key, result ); } -void Window::RotationDone( int orientation, int width, int height ) -{ - mSurface->RequestRotation( orientation, width, height ); - - mAdaptor->SurfaceResizePrepare( Adaptor::SurfaceSize( width, height ) ); - - // Emit signal - mResizedSignal.Emit( Dali::Window::WindowSize( width, height ) ); - - mAdaptor->SurfaceResizeComplete( Adaptor::SurfaceSize( width, height ) ); -} - void Window::OnIconifyChanged( bool iconified ) { if( iconified ) @@ -575,8 +583,9 @@ void Window::OnFocusChanged( bool focusIn ) void Window::OnOutputTransformed() { PositionSize positionSize = mSurface->GetPositionSize(); - mAdaptor->SurfaceResizePrepare( Adaptor::SurfaceSize( positionSize.width, positionSize.height ) ); - mAdaptor->SurfaceResizeComplete( Adaptor::SurfaceSize( positionSize.width, positionSize.height ) ); + SurfaceResized(); + mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) ); + mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) ); } void Window::OnDeleteRequest() @@ -584,25 +593,104 @@ void Window::OnDeleteRequest() mDeleteRequestSignal.Emit(); } -void Window::OnStart() +void Window::OnTouchPoint( Dali::Integration::Point& point, int timeStamp ) { + FeedTouchPoint( point, timeStamp ); +} + +void Window::OnWheelEvent( Dali::Integration::WheelEvent& wheelEvent ) +{ + FeedWheelEvent( wheelEvent ); +} + +void Window::OnKeyEvent( Dali::Integration::KeyEvent& keyEvent ) +{ + FeedKeyEvent( keyEvent ); +} + +void Window::OnRotation( const RotationEvent& rotation ) +{ + mRotationAngle = rotation.angle; + mWindowWidth = rotation.width; + mWindowHeight = rotation.height; + + // Notify that the orientation is changed + mOrientation->OnOrientationChange( rotation ); + + mWindowSurface->RequestRotation( mRotationAngle, mWindowWidth, mWindowHeight ); + + SurfaceResized(); + + mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( mRotationAngle, mWindowHeight ) ); + + // Emit signal + mResizedSignal.Emit( Dali::Window::WindowSize( mRotationAngle, mWindowHeight ) ); + + mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( mRotationAngle, mWindowHeight ) ); } void Window::OnPause() { + if( mEventHandler ) + { + mEventHandler->Pause(); + } } void Window::OnResume() { + if( mEventHandler ) + { + mEventHandler->Resume(); + } } -void Window::OnStop() +void Window::RecalculateTouchPosition( Integration::Point& point ) { + Vector2 position = point.GetScreenPosition(); + Vector2 convertedPosition; + + switch( mRotationAngle ) + { + case 90: + { + convertedPosition.x = static_cast( mWindowWidth ) - position.y; + convertedPosition.y = position.x; + break; + } + case 180: + { + convertedPosition.x = static_cast( mWindowWidth ) - position.x; + convertedPosition.y = static_cast( mWindowHeight ) - position.y; + break; + } + case 270: + { + convertedPosition.x = position.y; + convertedPosition.y = static_cast( mWindowHeight ) - position.x; + break; + } + default: + { + convertedPosition = position; + break; + } + } + + point.SetScreenPosition( convertedPosition ); } -void Window::OnDestroy() +Dali::Window Window::Get( Dali::Actor actor ) { - mAdaptor = NULL; + Internal::Adaptor::Window* windowImpl = nullptr; + + if ( Internal::Adaptor::Adaptor::IsAvailable() ) + { + Dali::Internal::Adaptor::Adaptor& adaptor = Internal::Adaptor::Adaptor::GetImplementation( Internal::Adaptor::Adaptor::Get() ); + windowImpl = static_cast( adaptor.GetWindow( actor ) ); + } + + return Dali::Window( windowImpl ); } } // Adaptor