X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fadaptor-impl.cpp;h=868345d9d9e57da039c0b137f5503d148c0b0c20;hb=573600ba751204639c5ee68a528f2b72acf8385c;hp=daeb943eb2d6f9608b1dd2a03d198dc2cebcdc93;hpb=e8e185f7d90010214890c2cb78bdd52c732f63ba;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index daeb943..868345d 100755 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -29,9 +29,13 @@ #include #include #include +#include #include +#include #include +#include + // INTERNAL INCLUDES #include #include @@ -46,14 +50,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -65,9 +67,12 @@ #include #include +#include using Dali::TextAbstraction::FontClient; +extern std::string GetSystemCachePath(); + namespace Dali { @@ -82,11 +87,10 @@ namespace thread_local Adaptor* gThreadLocalAdaptor = NULL; // raw thread specific pointer to allow Adaptor::Get } // unnamed namespace - -Dali::Adaptor* Adaptor::New( Any nativeWindow, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) { Dali::Adaptor* adaptor = new Dali::Adaptor; - Adaptor* impl = new Adaptor( nativeWindow, *adaptor, surface, environmentOptions ); + Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions ); adaptor->mImpl = impl; Dali::Internal::Adaptor::AdaptorBuilder* mAdaptorBuilder = new AdaptorBuilder(); @@ -98,20 +102,18 @@ Dali::Adaptor* Adaptor::New( Any nativeWindow, Dali::RenderSurfaceInterface *sur return adaptor; } -Dali::Adaptor* Adaptor::New( Dali::Window window, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) { - Any winId = window.GetNativeHandle(); - - Window& windowImpl = Dali::GetImplementation( window ); - Dali::Adaptor* adaptor = New( winId, windowImpl.GetSurface(), configuration, environmentOptions ); + Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( window ); + Dali::Adaptor* adaptor = New( window, windowImpl.GetSurface(), configuration, environmentOptions ); windowImpl.SetAdaptor( *adaptor ); return adaptor; } -Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Any nativeWindow, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) { Dali::Adaptor* adaptor = new Dali::Adaptor; // Public adaptor - Adaptor* impl = new Adaptor( nativeWindow, *adaptor, surface, environmentOptions ); // Impl adaptor + Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions ); // Impl adaptor adaptor->mImpl = impl; impl->Initialize( graphicsFactory, configuration ); @@ -119,12 +121,10 @@ Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Any nativeWindow, return adaptor; } // Called second -Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Window window, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) { - Any winId = window.GetNativeHandle(); - - Window& windowImpl = Dali::GetImplementation( window ); - Dali::Adaptor* adaptor = New( graphicsFactory, winId, windowImpl.GetSurface(), configuration, environmentOptions ); + Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( window ); + Dali::Adaptor* adaptor = New( graphicsFactory, window, windowImpl.GetSurface(), configuration, environmentOptions ); windowImpl.SetAdaptor( *adaptor ); return adaptor; } // Called first @@ -160,15 +160,9 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration: mCallbackManager = CallbackManager::New(); - WindowPane defaultWindow = mWindowFrame.front(); - - DALI_ASSERT_DEBUG( defaultWindow.surface && "Surface not initialized" ); + Dali::Internal::Adaptor::SceneHolder* defaultWindow = mWindows.front(); - PositionSize size = defaultWindow.surface->GetPositionSize(); - - defaultWindow.surface->SetAdaptor(*this); - - mGestureManager = new GestureManager(*this, Vector2(size.width, size.height), mCallbackManager, *mEnvironmentOptions); + DALI_ASSERT_DEBUG( defaultWindow->GetSurface() && "Surface not initialized" ); mGraphics = &( graphicsFactory.Create() ); mGraphics->Initialize( mEnvironmentOptions ); @@ -180,17 +174,26 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration: GlImplementation& mGLES = eglGraphics->GetGlesInterface(); EglSyncImplementation& eglSyncImpl = eglGraphics->GetSyncImplementation(); + EglContextHelperImplementation& eglContextHelperImpl = eglGraphics->GetContextHelperImplementation(); mCore = Integration::Core::New( *this, *mPlatformAbstraction, mGLES, eglSyncImpl, - *mGestureManager, + eglContextHelperImpl, dataRetentionPolicy , ( 0u != mEnvironmentOptions->GetRenderToFboInterval() ) ? Integration::RenderToFrameBuffer::TRUE : Integration::RenderToFrameBuffer::FALSE, mGraphics->GetDepthBufferRequired(), mGraphics->GetStencilBufferRequired() ); + defaultWindow->SetAdaptor( Get() ); + + Dali::Window window( dynamic_cast( defaultWindow ) ); + if ( window ) + { + mWindowCreatedSignal.Emit( window ); + } + const unsigned int timeInterval = mEnvironmentOptions->GetObjectProfilerInterval(); if( 0u < timeInterval ) { @@ -199,9 +202,7 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration: mNotificationTrigger = mTriggerEventFactory.CreateTriggerEvent( MakeCallback( this, &Adaptor::ProcessCoreEvents ), TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER); - mVSyncMonitor = new VSyncMonitor; - - mDisplayConnection = Dali::DisplayConnection::New( *mGraphics, defaultWindow.surface->GetSurfaceType() ); + mDisplayConnection = Dali::DisplayConnection::New( *mGraphics, defaultWindow->GetSurface()->GetSurfaceType() ); mThreadController = new ThreadController( *this, *mEnvironmentOptions ); @@ -270,12 +271,58 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration: { Integration::SetPanGestureMultitapSmoothingRange( mEnvironmentOptions->GetPanGestureMultitapSmoothingRange() ); } + if( mEnvironmentOptions->GetMinimumPanDistance() >= 0 ) + { + Integration::SetPanGestureMinimumDistance( mEnvironmentOptions->GetMinimumPanDistance() ); + } + if( mEnvironmentOptions->GetMinimumPanEvents() >= 0 ) + { + Integration::SetPanGestureMinimumPanEvents( mEnvironmentOptions->GetMinimumPanEvents() ); + } + if( mEnvironmentOptions->GetMinimumPinchDistance() >= 0 ) + { + Integration::SetPinchGestureMinimumDistance( mEnvironmentOptions->GetMinimumPinchDistance() ); + } // Set max texture size if( mEnvironmentOptions->GetMaxTextureSize() > 0 ) { Dali::TizenPlatform::ImageLoader::SetMaxTextureSize( mEnvironmentOptions->GetMaxTextureSize() ); } + + std::string systemCachePath = GetSystemCachePath(); + if ( systemCachePath.c_str() != NULL ) + { + Dali::FileStream fileStream( systemCachePath + "gpu-environment.conf", Dali::FileStream::READ | Dali::FileStream::TEXT ); + std::fstream& stream = dynamic_cast( fileStream.GetStream() ); + if( stream.is_open() ) + { + std::string line; + while( std::getline( stream, line ) ) + { + line.erase( line.find_last_not_of( " \t\r\n" ) + 1 ); + line.erase( 0, line.find_first_not_of( " \t\r\n" ) ); + if( '#' == *( line.cbegin() ) || line == "" ) + { + continue; + } + + std::istringstream stream( line ); + std::string environmentVariableName, environmentVariableValue; + std::getline(stream, environmentVariableName, ' '); + if( environmentVariableName == "DALI_ENV_MAX_TEXTURE_SIZE" && mEnvironmentOptions->GetMaxTextureSize() == 0 ) + { + std::getline(stream, environmentVariableValue); + setenv( environmentVariableName.c_str() , environmentVariableValue.c_str(), 1 ); + Dali::TizenPlatform::ImageLoader::SetMaxTextureSize( std::atoi( environmentVariableValue.c_str() ) ); + } + } + } + else + { + DALI_LOG_ERROR( "Fail to open file : %s\n", ( systemCachePath + "gpu-environment.conf" ).c_str() ); + } + } } Adaptor::~Adaptor() @@ -291,14 +338,14 @@ Adaptor::~Adaptor() (*iter)->OnDestroy(); } + // Clear out all the handles to Windows + mWindows.clear(); + delete mThreadController; // this will shutdown render thread, which will call Core::ContextDestroyed before exit - delete mVSyncMonitor; - delete mEventHandler; delete mObjectProfiler; delete mCore; - delete mGestureManager; delete mDisplayConnection; delete mPlatformAbstraction; delete mCallbackManager; @@ -331,32 +378,45 @@ void Adaptor::Start() // Start the callback manager mCallbackManager->Start(); - WindowPane defaultWindow = mWindowFrame.front(); - - // Create event handler - mEventHandler = new EventHandler( defaultWindow.surface, *this, *mGestureManager, *this, mDragAndDropDetector ); - - if( mDeferredRotationObserver != NULL ) - { - mEventHandler->SetRotationObserver(mDeferredRotationObserver); - mDeferredRotationObserver = NULL; - } + Dali::Internal::Adaptor::SceneHolder* defaultWindow = mWindows.front(); unsigned int dpiHor, dpiVer; dpiHor = dpiVer = 0; - defaultWindow.surface->GetDpi( dpiHor, dpiVer ); + defaultWindow->GetSurface()->GetDpi( dpiHor, dpiVer ); // set the DPI value for font rendering FontClient fontClient = FontClient::Get(); fontClient.SetDpi( dpiHor, dpiVer ); - // Tell the core the size of the surface just before we start the render-thread - mCore->SurfaceResized( defaultWindow.surface ); - // Initialize the thread controller mThreadController->Initialize(); + if( !Dali::TizenPlatform::ImageLoader::MaxTextureSizeUpdated() ) + { + auto eglGraphics = static_cast( mGraphics ); + GlImplementation& mGLES = eglGraphics->GetGlesInterface(); + Dali::TizenPlatform::ImageLoader::SetMaxTextureSize( mGLES.GetMaxTextureSize() ); + + std::string systemCachePath = GetSystemCachePath(); + if( systemCachePath.c_str() != NULL ) + { + const int dir_err = system( std::string( "mkdir " + systemCachePath ).c_str() ); + if (-1 == dir_err) + { + printf("Error creating directory!n"); + exit(1); + } + + Dali::FileStream fileStream( systemCachePath + "gpu-environment.conf", Dali::FileStream::WRITE | Dali::FileStream::TEXT ); + std::fstream& configFile = dynamic_cast( fileStream.GetStream() ); + if( configFile.is_open() ) + { + configFile << "DALI_ENV_MAX_TEXTURE_SIZE " << mGLES.GetMaxTextureSize() << std::endl; + } + } + } + ProcessCoreEvents(); // Ensure any startup messages are processed. // Initialize the image loader plugin @@ -380,10 +440,10 @@ void Adaptor::Pause() (*iter)->OnPause(); } - // Reset the event handler when adaptor paused - if( mEventHandler ) + // Pause all windows event handlers when adaptor paused + for( auto window : mWindows ) { - mEventHandler->Pause(); + window->Pause(); } mThreadController->Pause(); @@ -391,6 +451,12 @@ void Adaptor::Pause() // Ensure any messages queued during pause callbacks are processed by doing another update. RequestUpdateOnce(); + + DALI_LOG_RELEASE_INFO( "Adaptor::Pause: Paused\n" ); + } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::Pause: Not paused [%d]\n", mState ); } } @@ -402,10 +468,10 @@ void Adaptor::Resume() { mState = RUNNING; - // Reset the event handler when adaptor resumed - if( mEventHandler ) + // Reset the event handlers when adaptor resumed + for( auto window : mWindows ) { - mEventHandler->Resume(); + window->Resume(); } // Inform observers that we have resumed. @@ -419,6 +485,12 @@ void Adaptor::Resume() // Do at end to ensure our first update/render after resumption includes the processed messages as well mThreadController->Resume(); + + DALI_LOG_RELEASE_INFO( "Adaptor::Resume: Resumed\n"); + } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::Resume: Not resumed [%d]\n", mState ); } } @@ -435,13 +507,10 @@ void Adaptor::Stop() mThreadController->Stop(); - // Clear out all the handles to Windows - mWindowFrame.clear(); - // Delete the TTS player - for(int i =0; i < Dali::TtsPlayer::MODE_NUM; i++) + for( int i =0; i < Dali::TtsPlayer::MODE_NUM; i++ ) { - if(mTtsPlayers[i]) + if( mTtsPlayers[i] ) { mTtsPlayers[i].Reset(); } @@ -450,15 +519,14 @@ void Adaptor::Stop() // Destroy the image loader plugin Internal::Adaptor::ImageLoaderPluginProxy::Destroy(); - delete mEventHandler; - mEventHandler = NULL; - delete mNotificationTrigger; mNotificationTrigger = NULL; mCallbackManager->Stop(); mState = STOPPED; + + DALI_LOG_RELEASE_INFO( "Adaptor::Stop\n" ); } } @@ -477,64 +545,67 @@ void Adaptor::ContextRegained() void Adaptor::FeedTouchPoint( TouchPoint& point, int timeStamp ) { - mEventHandler->FeedTouchPoint( point, timeStamp ); + Integration::Point convertedPoint( point ); + mWindows.front()->FeedTouchPoint( convertedPoint, timeStamp ); } void Adaptor::FeedWheelEvent( WheelEvent& wheelEvent ) { - mEventHandler->FeedWheelEvent( wheelEvent ); + Integration::WheelEvent event( static_cast< Integration::WheelEvent::Type >(wheelEvent.type), wheelEvent.direction, wheelEvent.modifiers, wheelEvent.point, wheelEvent.z, wheelEvent.timeStamp ); + mWindows.front()->FeedWheelEvent( event ); } void Adaptor::FeedKeyEvent( KeyEvent& keyEvent ) { - mEventHandler->FeedKeyEvent( keyEvent ); + Integration::KeyEvent convertedEvent( keyEvent ); + mWindows.front()->FeedKeyEvent( convertedEvent ); } -void Adaptor::ReplaceSurface( Any nativeWindow, Dali::RenderSurfaceInterface& newSurface ) +void Adaptor::ReplaceSurface( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface& newSurface ) { - // Let the core know the surface size has changed - mCore->SurfaceResized( &newSurface ); - - mResizedSignal.Emit( mAdaptor ); + Internal::Adaptor::SceneHolder* windowImpl = &Dali::GetImplementation( window ); + for( auto windowPtr : mWindows ) + { + if( windowPtr == windowImpl ) // the window is not deleted + { + mResizedSignal.Emit( mAdaptor ); - WindowPane newDefaultWindow; - newDefaultWindow.nativeWindow = nativeWindow; - newDefaultWindow.surface = &newSurface; - newDefaultWindow.surface->SetAdaptor(*this); + windowImpl->SetSurface( &newSurface ); - WindowPane oldDefaultWindow = mWindowFrame.front(); + // Flush the event queue to give the update-render thread chance + // to start processing messages for new camera setup etc as soon as possible + ProcessCoreEvents(); - // Update WindowFrame - std::vector::iterator iter = mWindowFrame.begin(); - iter = mWindowFrame.insert( iter, newDefaultWindow ); + // This method blocks until the render thread has completed the replace. + mThreadController->ReplaceSurface( &newSurface ); + break; + } + } +} +void Adaptor::DeleteSurface( Dali::RenderSurfaceInterface& surface ) +{ // Flush the event queue to give the update-render thread chance // to start processing messages for new camera setup etc as soon as possible ProcessCoreEvents(); - // This method blocks until the render thread has completed the replace. - mThreadController->ReplaceSurface( newDefaultWindow.surface ); - - // Must delete the old Window only after the render thread has completed the replace - oldDefaultWindow.surface->DestroySurface(); - oldDefaultWindow.surface = nullptr; + // This method blocks until the render thread has finished rendering the current surface. + mThreadController->DeleteSurface( &surface ); } Dali::RenderSurfaceInterface& Adaptor::GetSurface() const { - WindowPane defaultWindow = mWindowFrame.front(); - return *(defaultWindow.surface); + return *mWindows.front()->GetSurface(); } void Adaptor::ReleaseSurfaceLock() { - WindowPane defaultWindow = mWindowFrame.front(); - defaultWindow.surface->ReleaseLock(); + mWindows.front()->GetSurface()->ReleaseLock(); } Dali::TtsPlayer Adaptor::GetTtsPlayer(Dali::TtsPlayer::Mode mode) { - if(!mTtsPlayers[mode]) + if( !mTtsPlayers[mode] ) { // Create the TTS player when it needed, because it can reduce launching time. mTtsPlayers[mode] = TtsPlayer::New(mode); @@ -566,33 +637,31 @@ void Adaptor::SetPreRenderCallback( CallbackBase* callback ) mThreadController->SetPreRenderCallback( callback ); } -bool Adaptor::AddWindow( Dali::Window* childWindow, const std::string& childWindowName, const std::string& childWindowClassName, const bool& childWindowMode ) +bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow, const std::string& childWindowName, const std::string& childWindowClassName, bool childWindowMode ) { - Window& windowImpl = Dali::GetImplementation( *childWindow ); + Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( childWindow ); windowImpl.SetAdaptor( Get() ); - // This is any Window that is not the main (default) one - WindowPane additionalWindow; - additionalWindow.instance = childWindow; - additionalWindow.window_name = childWindowName; - additionalWindow.class_name = childWindowClassName; - additionalWindow.window_mode = childWindowMode; - additionalWindow.surface = windowImpl.GetSurface(); - additionalWindow.id = windowImpl.GetId(); + // Add the new Window to the container - the order is not important + mWindows.push_back( &windowImpl ); - // Add the new Window to the Frame - the order is not important - mWindowFrame.push_back( additionalWindow ); + Dali::Window window( dynamic_cast( &windowImpl ) ); + if ( window ) + { + mWindowCreatedSignal.Emit( window ); + } return true; } -bool Adaptor::RemoveWindow( Dali::Window* childWindow ) +bool Adaptor::RemoveWindow( Dali::Integration::SceneHolder* childWindow ) { - for ( WindowFrames::iterator iter = mWindowFrame.begin(); iter != mWindowFrame.end(); ++iter ) + Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( *childWindow ); + for ( WindowContainer::iterator iter = mWindows.begin(); iter != mWindows.end(); ++iter ) { - if( iter->instance == childWindow ) + if( *iter == &windowImpl ) { - mWindowFrame.erase( iter ); + mWindows.erase( iter ); return true; } } @@ -602,11 +671,11 @@ bool Adaptor::RemoveWindow( Dali::Window* childWindow ) bool Adaptor::RemoveWindow( std::string childWindowName ) { - for ( WindowFrames::iterator iter = mWindowFrame.begin(); iter != mWindowFrame.end(); ++iter ) + for ( WindowContainer::iterator iter = mWindows.begin(); iter != mWindows.end(); ++iter ) { - if( iter->window_name == childWindowName ) + if( ( *iter )->GetName() == childWindowName ) { - mWindowFrame.erase( iter ); + mWindows.erase( iter ); return true; } } @@ -614,13 +683,13 @@ bool Adaptor::RemoveWindow( std::string childWindowName ) return false; } -bool Adaptor::RemoveWindow( Window* childWindow ) +bool Adaptor::RemoveWindow( Internal::Adaptor::SceneHolder* childWindow ) { - for ( WindowFrames::iterator iter = mWindowFrame.begin(); iter != mWindowFrame.end(); ++iter ) + for ( WindowContainer::iterator iter = mWindows.begin(); iter != mWindows.end(); ++iter ) { - if( iter->id == childWindow->GetId() ) + if( ( *iter )->GetId() == childWindow->GetId() ) { - mWindowFrame.erase( iter ); + mWindows.erase( iter ); return true; } } @@ -654,11 +723,6 @@ void Adaptor::SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender ) mThreadController->SetRenderRefreshRate( numberOfVSyncsPerRender ); } -void Adaptor::SetUseHardwareVSync( bool useHardware ) -{ - mVSyncMonitor->SetUseHardwareVSync( useHardware ); -} - Dali::DisplayConnection& Adaptor::GetDisplayConnectionInterface() { DALI_ASSERT_DEBUG( mDisplayConnection && "Display connection not created" ); @@ -693,20 +757,12 @@ SocketFactoryInterface& Adaptor::GetSocketFactoryInterface() Dali::RenderSurfaceInterface* Adaptor::GetRenderSurfaceInterface() { - if( !mWindowFrame.empty()) + if( !mWindows.empty() ) { - WindowPane defaultWindow = mWindowFrame.front(); - return defaultWindow.surface; + return mWindows.front()->GetSurface(); } - else - { - return nullptr; - } -} -VSyncMonitorInterface* Adaptor::GetVSyncMonitorInterface() -{ - return mVSyncMonitor; + return nullptr; } TraceInterface& Adaptor::GetKernelTraceInterface() @@ -730,49 +786,35 @@ Integration::PlatformAbstraction& Adaptor::GetPlatformAbstraction() const return *mPlatformAbstraction; } -void Adaptor::SetDragAndDropDetector( DragAndDropDetectorPtr detector ) +void Adaptor::DestroyTtsPlayer(Dali::TtsPlayer::Mode mode) { - mDragAndDropDetector = detector; - - if ( mEventHandler ) + if( mTtsPlayers[mode] ) { - mEventHandler->SetDragAndDropDetector( detector ); + mTtsPlayers[mode].Reset(); } } -void Adaptor::SetRotationObserver( RotationObserver* observer ) +Any Adaptor::GetNativeWindowHandle() { - if( mEventHandler ) - { - mEventHandler->SetRotationObserver( observer ); - } - else if( mState == READY ) - { - // Set once event handler exists - mDeferredRotationObserver = observer; - } + return mWindows.front()->GetNativeHandle(); } -void Adaptor::DestroyTtsPlayer(Dali::TtsPlayer::Mode mode) +Any Adaptor::GetNativeWindowHandle( Dali::Actor actor ) { - if(mTtsPlayers[mode]) - { - mTtsPlayers[mode].Reset(); - } -} + Any nativeWindowHandle; -void Adaptor::SetMinimumPinchDistance(float distance) -{ - if( mGestureManager ) + Dali::Integration::Scene scene = Dali::Integration::Scene::Get( actor ); + + for( auto sceneHolder : mWindows ) { - mGestureManager->SetMinimumPinchDistance(distance); + if ( scene == sceneHolder->GetScene() ) + { + nativeWindowHandle = sceneHolder->GetNativeHandle(); + break; + } } -} -Any Adaptor::GetNativeWindowHandle() -{ - WindowPane defaultWindow = mWindowFrame.front(); - return defaultWindow.nativeWindow; + return nativeWindowHandle; } Any Adaptor::GetGraphicsDisplay() @@ -881,7 +923,7 @@ void Adaptor::RequestProcessEventsOnIdle( bool forceProcess ) void Adaptor::OnWindowShown() { - if ( PAUSED_WHILE_HIDDEN == mState ) + if( PAUSED_WHILE_HIDDEN == mState ) { // Adaptor can now be resumed mState = PAUSED; @@ -891,16 +933,58 @@ void Adaptor::OnWindowShown() // Force a render task RequestUpdateOnce(); } + else if( RUNNING == mState ) + { + // Force a render task + RequestUpdateOnce(); + + DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowShown: Update requested.\n" ); + } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowShown: Adaptor is not paused state.[%d]\n", mState ); + } } void Adaptor::OnWindowHidden() { - if ( RUNNING == mState ) + if( RUNNING == mState || READY == mState ) { - Pause(); + bool allWindowsHidden = true; - // Adaptor cannot be resumed until the window is shown - mState = PAUSED_WHILE_HIDDEN; + for( auto window : mWindows ) + { + if ( window->IsVisible() ) + { + allWindowsHidden = false; + break; + } + } + + // Only pause the adaptor when all the windows are hidden + if( allWindowsHidden ) + { + if( mState == RUNNING ) + { + Pause(); + + // Adaptor cannot be resumed until any window is shown + mState = PAUSED_WHILE_HIDDEN; + } + else // mState is READY + { + // Pause the adaptor after the state gets RUNNING + mState = PAUSED_WHILE_INITIALIZING; + } + } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowHidden: Some windows are shown. Don't pause adaptor.\n" ); + } + } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowHidden: Adaptor is not running state.[%d]\n", mState ); } } @@ -913,9 +997,6 @@ void Adaptor::OnDamaged( const DamageArea& area ) void Adaptor::SurfaceResizePrepare( Dali::RenderSurfaceInterface* surface, SurfaceSize surfaceSize ) { - // Let the core know the surface size has changed - mCore->SurfaceResized( surface ); - mResizedSignal.Emit( mAdaptor ); } @@ -932,13 +1013,32 @@ void Adaptor::NotifySceneCreated() { GetCore().SceneCreated(); + // Flush the event queue to give the update-render thread chance + // to start processing messages for new camera setup etc as soon as possible + ProcessCoreEvents(); + // Start thread controller after the scene has been created mThreadController->Start(); // Process after surface is created (registering to remote surface provider if required) SurfaceInitialized(); - mState = RUNNING; + if( mState != PAUSED_WHILE_INITIALIZING ) + { + mState = RUNNING; + + DALI_LOG_RELEASE_INFO( "Adaptor::NotifySceneCreated: Adaptor is running\n" ); + } + else + { + mState = RUNNING; + + Pause(); + + mState = PAUSED_WHILE_HIDDEN; + + DALI_LOG_RELEASE_INFO( "Adaptor::NotifySceneCreated: Adaptor is paused\n" ); + } } void Adaptor::NotifyLanguageChanged() @@ -984,29 +1084,57 @@ bool Adaptor::ProcessCoreEventsFromIdle() return false; } -Adaptor::Adaptor(Any nativeWindow, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions) +Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow( Dali::Actor& actor ) +{ + Dali::Integration::Scene scene = Dali::Integration::Scene::Get( actor ); + + for( auto window : mWindows ) + { + if ( scene == window->GetScene() ) + { + return window; + } + } + + return nullptr; +} + +Dali::WindowContainer Adaptor::GetWindows() const +{ + Dali::WindowContainer windows; + + for ( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter ) + { + // Downcast to Dali::Window + Dali::Window window( dynamic_cast( *iter ) ); + if ( window ) + { + windows.push_back( window ); + } + } + + return windows; +} + +Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions) : mResizedSignal(), mLanguageChangedSignal(), + mWindowCreatedSignal(), mAdaptor( adaptor ), mState( READY ), mCore( nullptr ), mThreadController( nullptr ), - mVSyncMonitor( nullptr ), mGraphics( nullptr ), mDisplayConnection( nullptr ), - mWindowFrame(), + mWindows(), mPlatformAbstraction( nullptr ), - mEventHandler( nullptr ), mCallbackManager( nullptr ), mNotificationOnIdleInstalled( false ), mNotificationTrigger( nullptr ), - mGestureManager( nullptr ), mDaliFeedbackPlugin(), mFeedbackController( nullptr ), mTtsPlayers(), mObservers(), - mDragAndDropDetector(), - mDeferredRotationObserver( nullptr ), mEnvironmentOptions( environmentOptions ? environmentOptions : new EnvironmentOptions /* Create the options if not provided */), mPerformanceInterface( nullptr ), mKernelTracer(), @@ -1018,14 +1146,7 @@ Adaptor::Adaptor(Any nativeWindow, Dali::Adaptor& adaptor, Dali::RenderSurfaceIn mUseRemoteSurface( false ) { DALI_ASSERT_ALWAYS( !IsAvailable() && "Cannot create more than one Adaptor per thread" ); - - WindowPane defaultWindow; - defaultWindow.nativeWindow = nativeWindow; - defaultWindow.surface = surface; - defaultWindow.id = 0; - - std::vector::iterator iter = mWindowFrame.begin(); - iter = mWindowFrame.insert( iter, defaultWindow ); + mWindows.insert( mWindows.begin(), &Dali::GetImplementation( window ) ); gThreadLocalAdaptor = this; }