X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fapplication-impl.cpp;h=28ac1a38991932c5534b4a0f8643a9d0b04cca2c;hb=9b4a4c99a96f770fbed93a3fd03583c780ee641f;hp=47c42d5aec45d9e1f4210cf8ea3720a903f7799e;hpb=0bece20220da82e12fd76f7bd27984fe189ae870;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp old mode 100644 new mode 100755 index 47c42d5..28ac1a3 --- a/dali/internal/adaptor/common/application-impl.cpp +++ b/dali/internal/adaptor/common/application-impl.cpp @@ -20,14 +20,21 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include +#include +#include #include #include -#include #include +#include #include +#include + +// To disable a macro with the same name from one of OpenGL headers +#undef Status namespace Dali { @@ -48,6 +55,13 @@ namespace Internal namespace Adaptor { +namespace +{ + +const float DEFAULT_STEREO_BASE( 65.0f ); + +} // unnamed namespace + ApplicationPtr Application::gPreInitializedApplication( NULL ); ApplicationPtr Application::New( @@ -67,9 +81,7 @@ void Application::PreInitialize( int* argc, char** argv[] ) if( !gPreInitializedApplication ) { gPreInitializedApplication = new Application ( argc, argv, "", Dali::Application::OPAQUE, PositionSize(), Framework::NORMAL ); - gPreInitializedApplication->CreateWindow(); // Only create window - gPreInitializedApplication->mLaunchpadState = Launchpad::PRE_INITIALIZED; } } @@ -91,17 +103,19 @@ Application::Application( int* argc, char** argv[], const std::string& styleshee mFramework( nullptr ), mContextLossConfiguration( Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ), mCommandLineOptions( nullptr ), - mSingletonService( SingletonService::New() ), mAdaptorBuilder( nullptr ), mAdaptor( nullptr ), mMainWindow(), mMainWindowMode( windowMode ), mMainWindowName(), + mMainWindowReplaced( false ), mStylesheet( stylesheet ), mEnvironmentOptions(), mWindowPositionSize( positionSize ), mLaunchpadState( Launchpad::NONE ), - mSlotDelegate( this ) + mSlotDelegate( this ), + mViewMode( MONO ), + mStereoBase( DEFAULT_STEREO_BASE ) { // Get mName from environment options mMainWindowName = mEnvironmentOptions.GetWindowName(); @@ -118,7 +132,12 @@ Application::Application( int* argc, char** argv[], const std::string& styleshee Application::~Application() { - mSingletonService.UnregisterAll(); + SingletonService service = SingletonService::Get(); + // Note this can be false i.e. if Application has never created a Core instance + if( service ) + { + service.UnregisterAll(); + } mMainWindow.Reset(); delete mAdaptor; @@ -146,13 +165,9 @@ void Application::CreateWindow() } const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName(); - mMainWindow = Dali::Window::New( mWindowPositionSize, mMainWindowName, windowClassName, mMainWindowMode == Dali::Application::TRANSPARENT ); - int indicatorVisibleMode = mEnvironmentOptions.GetIndicatorVisibleMode(); - if( indicatorVisibleMode >= Dali::Window::INVISIBLE && indicatorVisibleMode <= Dali::Window::AUTO ) - { - GetImplementation( mMainWindow ).SetIndicatorVisibleMode( static_cast< Dali::Window::IndicatorVisibleMode >( indicatorVisibleMode ) ); - } + Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( mWindowPositionSize, mMainWindowName, windowClassName, mMainWindowMode == Dali::Application::TRANSPARENT ); + mMainWindow = Dali::Window( window ); // Quit the application when the window is closed GetImplementation( mMainWindow ).DeleteRequestSignal().Connect( mSlotDelegate, &Application::Quit ); @@ -164,11 +179,13 @@ void Application::CreateAdaptor() auto graphicsFactory = mAdaptorBuilder->GetGraphicsFactory(); - mAdaptor = Dali::Internal::Adaptor::Adaptor::New( graphicsFactory, mMainWindow, mContextLossConfiguration, &mEnvironmentOptions ); + Integration::SceneHolder sceneHolder = Integration::SceneHolder( &Dali::GetImplementation( mMainWindow ) ); + + mAdaptor = Adaptor::New( graphicsFactory, sceneHolder, mContextLossConfiguration, &mEnvironmentOptions ); mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize ); - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface ); + Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface ); } void Application::CreateAdaptorBuilder() @@ -205,10 +222,11 @@ void Application::QuitFromMainLoop() // This will trigger OnTerminate(), below, after the main loop has completed. } -void Application::DoInit() +void Application::OnInit() { - CreateAdaptorBuilder(); + mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) ); + CreateAdaptorBuilder(); // If an application was pre-initialized, a window was made in advance if( mLaunchpadState == Launchpad::NONE ) { @@ -220,65 +238,10 @@ void Application::DoInit() // Run the adaptor mAdaptor->Start(); - // Check if user requires no vsyncing and set Adaptor - if (mCommandLineOptions->noVSyncOnRender) - { - mAdaptor->SetUseHardwareVSync(false); - } - - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetStereoBase( mCommandLineOptions->stereoBase ); - if( mCommandLineOptions->viewMode != 0 ) - { - ViewMode viewMode = MONO; - if( mCommandLineOptions->viewMode <= STEREO_INTERLACED ) - { - viewMode = static_cast( mCommandLineOptions->viewMode ); - } - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetViewMode( viewMode ); - } - if( ! mStylesheet.empty() ) { Dali::StyleMonitor::Get().SetTheme( mStylesheet ); } -} - -void Application::DoStart() -{ - mAdaptor->NotifySceneCreated(); -} - -void Application::DoTerminate() -{ - if( mAdaptor ) - { - // Ensure that the render-thread is not using the surface(window) after we delete it - mAdaptor->Stop(); - } - - mMainWindow.Reset(); // This only resets (clears) the default Window -} - -void Application::DoPause() -{ - mAdaptor->Pause(); -} - -void Application::DoResume() -{ - mAdaptor->Resume(); -} - -void Application::DoLanguageChange() -{ - mAdaptor->NotifyLanguageChanged(); -} - -void Application::OnInit() -{ - mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) ); - - DoInit(); // Wire up the LifecycleController Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get(); @@ -294,7 +257,7 @@ void Application::OnInit() Dali::Application application(this); mInitSignal.Emit( application ); - DoStart(); + mAdaptor->NotifySceneCreated(); } void Application::OnTerminate() @@ -305,7 +268,13 @@ void Application::OnTerminate() Dali::Application application(this); mTerminateSignal.Emit( application ); - DoTerminate(); + if( mAdaptor ) + { + // Ensure that the render-thread is not using the surface(window) after we delete it + mAdaptor->Stop(); + } + + mMainWindow.Reset(); // This only resets (clears) the default Window } void Application::OnPause() @@ -350,7 +319,7 @@ void Application::OnAppControl(void *data) void Application::OnLanguageChanged() { - DoLanguageChange(); + mAdaptor->NotifyLanguageChanged(); Dali::Application application(this); mLanguageChangedSignal.Emit( application ); } @@ -376,6 +345,31 @@ void Application::OnMemoryLow( Dali::DeviceStatus::Memory::Status status ) mLowMemorySignal.Emit( status ); } + +void Application::OnSurfaceCreated( Any newSurface ) +{ + void* newWindow = AnyCast< void* >( newSurface ); + void* oldWindow = AnyCast< void* >( mMainWindow.GetNativeHandle() ); + if( oldWindow != newWindow ) + { + auto renderSurfaceFactory = Dali::Internal::Adaptor::GetRenderSurfaceFactory(); + std::unique_ptr< WindowRenderSurface > newSurfacePtr + = renderSurfaceFactory->CreateWindowRenderSurface( PositionSize(), newSurface, true ); + + mAdaptor->ReplaceSurface( mMainWindow, *newSurfacePtr.release() ); + } +} + +void Application::OnSurfaceDestroyed( Any surface ) +{ + void* windowToDelete = AnyCast< void* >( surface ); + void* oldWindow = AnyCast< void* >( mMainWindow.GetNativeHandle() ); + if( oldWindow == windowToDelete ) + { + mAdaptor->DeleteSurface( mAdaptor->GetSurface() ); + } +} + void Application::OnResize(Dali::Adaptor& adaptor) { Dali::Application application(this); @@ -404,49 +398,47 @@ Dali::Adaptor& Application::GetAdaptor() Dali::Window Application::GetWindow() { - return mMainWindow; + // Changed to return a different window handle after ReplaceWindow is called + // just for backward compatibility to make the test case pass + if ( mMainWindowReplaced ) + { + Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( PositionSize(), "ReplacedWindow", "", false ); + return Dali::Window( window ); + } + else + { + return mMainWindow; + } } // Stereoscopy void Application::SetViewMode( ViewMode viewMode ) { - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetViewMode( viewMode ); + mViewMode = viewMode; } ViewMode Application::GetViewMode() const { - return Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).GetViewMode(); + return mViewMode; } void Application::SetStereoBase( float stereoBase ) { - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetStereoBase( stereoBase ); + mStereoBase = stereoBase; } float Application::GetStereoBase() const { - return Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).GetStereoBase(); + return mStereoBase; } void Application::ReplaceWindow( const PositionSize& positionSize, const std::string& name ) { - Dali::Window newWindow = Dali::Window::New( positionSize, name, mMainWindowMode == Dali::Application::TRANSPARENT ); - Window& windowImpl = GetImplementation(newWindow); - windowImpl.SetAdaptor(*mAdaptor); + // This API is kept just for backward compatibility to make the test case pass. - int indicatorVisibleMode = mEnvironmentOptions.GetIndicatorVisibleMode(); - if( indicatorVisibleMode >= Dali::Window::INVISIBLE && indicatorVisibleMode <= Dali::Window::AUTO ) - { - GetImplementation( newWindow ).SetIndicatorVisibleMode( static_cast< Dali::Window::IndicatorVisibleMode >( indicatorVisibleMode ) ); - } - - Dali::RenderSurface* renderSurface = windowImpl.GetSurface(); - - Any nativeWindow = newWindow.GetNativeHandle(); - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).ReplaceSurface(nativeWindow, *renderSurface); - mMainWindow = newWindow; - mWindowPositionSize = positionSize; + mMainWindowReplaced = true; + OnResize( *mAdaptor ); } std::string Application::GetResourcePath() @@ -454,11 +446,25 @@ std::string Application::GetResourcePath() return Internal::Adaptor::Framework::GetResourcePath(); } +std::string Application::GetDataPath() +{ + return Internal::Adaptor::Framework::GetDataPath(); +} + void Application::SetStyleSheet( const std::string& stylesheet ) { mStylesheet = stylesheet; } +void Application::SetCommandLineOptions( int* argc, char **argv[] ) +{ + delete mCommandLineOptions; + + mCommandLineOptions = new CommandLineOptions( argc, argv ); + + mFramework->SetCommandLineOptions( argc, argv ); +} + ApplicationPtr Application::GetPreInitializedApplication() { return gPreInitializedApplication;