X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fcommon%2Fapplication-impl.cpp;h=bd885e6f09956d781be4e84b9a301a66aae7df18;hb=66f6b93f1a7b09f6023e8278bed7cafc2a0e877c;hp=a925de5290fc5257ceeb473f2803f8b8288fa23b;hpb=c432d327b0bd173c6fee439624aab6889dab6b95;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index a925de5..bd885e6 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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,19 +20,20 @@ // EXTERNAL INCLUDES #include -#include // INTERNAL INCLUDES +#include #include #include #include +#include namespace Dali { -namespace SlpPlatform +namespace TizenPlatform { -class SlpPlatformAbstraction; +class TizenPlatformAbstraction; } namespace Integration @@ -46,93 +47,98 @@ namespace Internal namespace Adaptor { -namespace -{ -// Defaults taken from H2 device -const unsigned int DEFAULT_WINDOW_WIDTH = 480; -const unsigned int DEFAULT_WINDOW_HEIGHT = 800; -const float DEFAULT_HORIZONTAL_DPI = 220; -const float DEFAULT_VERTICAL_DPI = 217; -} - ApplicationPtr Application::New( int* argc, char **argv[], - const std::string& name, - const DeviceLayout& baseLayout, - Dali::Application::WINDOW_MODE windowMode) + const std::string& stylesheet, + Dali::Application::WINDOW_MODE windowMode, + Framework::Type applicationType) { - ApplicationPtr application ( new Application (argc, argv, name, baseLayout, windowMode ) ); + ApplicationPtr application ( new Application (argc, argv, stylesheet, windowMode, applicationType ) ); return application; } -Application::Application( int* argc, char** argv[], const std::string& name, const DeviceLayout& baseLayout, Dali::Application::WINDOW_MODE windowMode) -: mInitSignalV2(), - mTerminateSignalV2(), - mPauseSignalV2(), - mResumeSignalV2(), - mResetSignalV2(), - mResizeSignalV2(), - mLanguageChangedSignalV2(), +Application::Application( int* argc, char** argv[], const std::string& stylesheet, + Dali::Application::WINDOW_MODE windowMode, Framework::Type applicationType ) +: mInitSignal(), + mTerminateSignal(), + mPauseSignal(), + mResumeSignal(), + mResetSignal(), + mResizeSignal(), + mAppControlSignal(), + mLanguageChangedSignal(), + mRegionChangedSignal(), + mBatteryLowSignal(), + mMemoryLowSignal(), mEventLoop( NULL ), mFramework( NULL ), + mContextLossConfiguration( Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ), mCommandLineOptions( NULL ), mSingletonService( SingletonService::New() ), mAdaptor( NULL ), mWindow(), mWindowMode( windowMode ), - mName( name ), - mInitialized( false ), - mBaseLayout( baseLayout ), + mName(), + mStylesheet( stylesheet ), + mEnvironmentOptions(), mSlotDelegate( this ) { - mCommandLineOptions = new CommandLineOptions(argc, argv); + // Get mName from environment options + mName = mEnvironmentOptions.GetWindowName(); + if( mName.empty() && argc && ( *argc > 0 ) ) + { + // Set mName from command-line args if environment option not set + mName = (*argv)[0]; + } - mFramework = new Framework(*this, argc, argv, name); + mCommandLineOptions = new CommandLineOptions(argc, argv); + mFramework = new Framework( *this, argc, argv, applicationType ); + mUseRemoteSurface = (applicationType == Framework::WATCH); } Application::~Application() { + mSingletonService.UnregisterAll(); + delete mFramework; delete mCommandLineOptions; delete mAdaptor; + mWindow.Reset(); } void Application::CreateWindow() { -#ifndef __arm__ - PositionSize windowPosition(0, 0, DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT); -#else - PositionSize windowPosition(0, 0, 0, 0); // this will use full screen -#endif - if (mCommandLineOptions->stageWidth > 0 && mCommandLineOptions->stageHeight > 0) + PositionSize windowPosition(0, 0, 0, 0); // this will use full screen + + if( mCommandLineOptions->stageWidth > 0 && mCommandLineOptions->stageHeight > 0 ) + { + // Command line options override environment options and full screen + windowPosition = PositionSize( 0, 0, mCommandLineOptions->stageWidth, mCommandLineOptions->stageHeight ); + } + else if( mEnvironmentOptions.GetWindowWidth() && mEnvironmentOptions.GetWindowHeight() ) { - // let the command line options over ride - windowPosition = PositionSize(0,0,mCommandLineOptions->stageWidth,mCommandLineOptions->stageHeight); + // Environment options override full screen functionality if command line arguments not provided + windowPosition = PositionSize( 0, 0, mEnvironmentOptions.GetWindowWidth(), mEnvironmentOptions.GetWindowHeight() ); } - mWindow = Dali::Window::New( windowPosition, mName, mWindowMode == Dali::Application::TRANSPARENT ); + const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName(); + mWindow = Dali::Window::New( windowPosition, mName, windowClassName, mWindowMode == Dali::Application::TRANSPARENT ); + + // Quit the application when the window is closed + GetImplementation( mWindow ).DeleteRequestSignal().Connect( mSlotDelegate, &Application::Quit ); } void Application::CreateAdaptor() { DALI_ASSERT_ALWAYS( mWindow && "Window required to create adaptor" ); - mAdaptor = &Dali::Adaptor::New( mWindow, mBaseLayout, mContextLossConfiguration ); - - // Allow DPI to be overridden from command line. - unsigned int hDPI=DEFAULT_HORIZONTAL_DPI; - unsigned int vDPI=DEFAULT_VERTICAL_DPI; - - std::string dpiStr = mCommandLineOptions->stageDPI; - if(!dpiStr.empty()) - { - sscanf(dpiStr.c_str(), "%ux%u", &hDPI, &vDPI); - } - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetDpi(hDPI, vDPI); + mAdaptor = Dali::Internal::Adaptor::Adaptor::New( mWindow, mContextLossConfiguration, &mEnvironmentOptions ); mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize ); + + Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface ); } void Application::MainLoop(Dali::Configuration::ContextLoss configuration) @@ -152,29 +158,25 @@ void Application::Lower() void Application::Quit() { // Actually quit the application. - AddIdle(boost::bind(&Application::QuitFromMainLoop, this)); + AddIdle( MakeCallback( this, &Application::QuitFromMainLoop ) ); } void Application::QuitFromMainLoop() { mAdaptor->Stop(); - Dali::Application application(this); - mTerminateSignalV2.Emit( application ); - mFramework->Quit(); // This will trigger OnTerminate(), below, after the main loop has completed. - mInitialized = false; } void Application::OnInit() { - mFramework->AddAbortCallback(boost::bind(&Application::QuitFromMainLoop, this)); + mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) ); CreateWindow(); - CreateAdaptor(); - // Run the adaptor + // Start the adaptor + CreateAdaptor(); mAdaptor->Start(); // Check if user requires no vsyncing and set on X11 Adaptor @@ -194,13 +196,26 @@ void Application::OnInit() Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetViewMode( viewMode ); } - mInitialized = true; + if( ! mStylesheet.empty() ) + { + Dali::StyleMonitor::Get().SetTheme( mStylesheet ); + } + + // Wire up the LifecycleController + Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get(); - // in default, auto hide indicator mode - mWindow.ShowIndicator(Dali::Window::AUTO); + InitSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnInit ); + TerminateSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnTerminate ); + PauseSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnPause ); + ResumeSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnResume ); + ResetSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnReset ); + ResizeSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnResize ); + LanguageChangedSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnLanguageChanged ); Dali::Application application(this); - mInitSignalV2.Emit( application ); + mInitSignal.Emit( application ); + + mAdaptor->NotifySceneCreated(); } void Application::OnTerminate() @@ -208,22 +223,36 @@ void Application::OnTerminate() // we've been told to quit by AppCore, ecore_x_destroy has been called, need to quit synchronously // delete the window as ecore_x has been destroyed by AppCore + Dali::Application application(this); + mTerminateSignal.Emit( application ); + + if( mAdaptor ) + { + // Ensure that the render-thread is not using the surface(window) after we delete it + mAdaptor->Stop(); + } + mWindow.Reset(); - mInitialized = false; } void Application::OnPause() { - mAdaptor->Pause(); + // A DALi app should handle Pause/Resume events. + // DALi just delivers the framework Pause event to the application, but not actually pause DALi core + // Pausing DALi core only occurs on the Window Hidden framework event Dali::Application application(this); - mPauseSignalV2.Emit( application ); + mPauseSignal.Emit( application ); } void Application::OnResume() { - mAdaptor->Resume(); + // Emit the signal first so the application can queue any messages before we do an update/render + // This ensures we do not just redraw the last frame before pausing if that's not required Dali::Application application(this); - mResumeSignalV2.Emit( application ); + mResumeSignal.Emit( application ); + + // DALi just delivers the framework Resume event to the application. + // Resuming DALi core only occurs on the Window Show framework event } void Application::OnReset() @@ -233,45 +262,59 @@ void Application::OnReset() * because Application class already handled initialization in OnInit(), OnReset do nothing. */ Dali::Application application(this); - mResetSignalV2.Emit( application ); + mResetSignal.Emit( application ); +} - mWindow.Raise(); +void Application::OnAppControl(void *data) +{ + Dali::Application application(this); + mAppControlSignal.Emit( application , data ); } void Application::OnLanguageChanged() { mAdaptor->NotifyLanguageChanged(); + Dali::Application application(this); + mLanguageChangedSignal.Emit( application ); } -void Application::OnResize(Dali::Adaptor& adaptor) +void Application::OnRegionChanged() { Dali::Application application(this); - mResizeSignalV2.Emit( application ); + mRegionChangedSignal.Emit( application ); } -bool Application::AddIdle(boost::function callBack) +void Application::OnBatteryLow() { - return mAdaptor->AddIdle(callBack); + Dali::Application application(this); + mBatteryLowSignal.Emit( application ); } -Dali::Adaptor& Application::GetAdaptor() +void Application::OnMemoryLow() { - return *mAdaptor; + Dali::Application application(this); + mMemoryLowSignal.Emit( application ); } -Dali::Window Application::GetWindow() +void Application::OnResize(Dali::Adaptor& adaptor) { - return mWindow; + Dali::Application application(this); + mResizeSignal.Emit( application ); } -const std::string& Application::GetTheme() +bool Application::AddIdle( CallbackBase* callback ) { - return Dali::StyleMonitor::Get().GetTheme(); + return mAdaptor->AddIdle( callback ); } -void Application::SetTheme(const std::string& themeFilePath) +Dali::Adaptor& Application::GetAdaptor() { - return Dali::StyleMonitor::Get().SetTheme(themeFilePath); + return *mAdaptor; +} + +Dali::Window Application::GetWindow() +{ + return mWindow; } // Stereoscopy @@ -304,7 +347,10 @@ void Application::ReplaceWindow(PositionSize windowPosition, const std::string& windowImpl.SetAdaptor(*mAdaptor); newWindow.ShowIndicator(Dali::Window::INVISIBLE); Dali::RenderSurface* renderSurface = windowImpl.GetSurface(); - Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).ReplaceSurface(*renderSurface); + + Any nativeWindow = newWindow.GetNativeHandle(); + Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SurfaceSizeChanged( windowPosition ); + Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).ReplaceSurface(nativeWindow, *renderSurface); mWindow = newWindow; }