Merge "Use existing callback ID for recurring callbacks" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / application-impl.cpp

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 8e38ca5..9ad4c54
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -19,12 +19,14 @@
 #include <dali/internal/adaptor/common/application-impl.h>
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/object/object-registry.h>
 #include <dali/integration-api/debug.h>
 #include <dali/devel-api/common/singleton-service.h>
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/devel-api/adaptor-framework/accessibility-impl.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/system/common/command-line-options.h>
 #include <dali/internal/adaptor/common/framework.h>
@@ -55,13 +57,6 @@ namespace Internal
 namespace Adaptor
 {
 
-namespace
-{
-
-const float DEFAULT_STEREO_BASE( 65.0f );
-
-} // unnamed namespace
-
 ApplicationPtr Application::gPreInitializedApplication( NULL );
 
 ApplicationPtr Application::New(
@@ -80,6 +75,8 @@ void Application::PreInitialize( int* argc, char** argv[] )
 {
   if( !gPreInitializedApplication )
   {
+    Dali::TextAbstraction::FontClientPreInitialize();
+
     gPreInitializedApplication = new Application ( argc, argv, "", Dali::Application::OPAQUE, PositionSize(), Framework::NORMAL );
     gPreInitializedApplication->CreateWindow();    // Only create window
     gPreInitializedApplication->mLaunchpadState = Launchpad::PRE_INITIALIZED;
@@ -93,29 +90,22 @@ Application::Application( int* argc, char** argv[], const std::string& styleshee
   mPauseSignal(),
   mResumeSignal(),
   mResetSignal(),
-  mResizeSignal(),
   mAppControlSignal(),
   mLanguageChangedSignal(),
   mRegionChangedSignal(),
-  mBatteryLowSignal(),
-  mMemoryLowSignal(),
   mEventLoop( nullptr ),
   mFramework( nullptr ),
-  mContextLossConfiguration( Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ),
   mCommandLineOptions( nullptr ),
   mAdaptorBuilder( nullptr ),
   mAdaptor( nullptr ),
   mMainWindow(),
   mMainWindowMode( windowMode ),
   mMainWindowName(),
-  mMainWindowReplaced( false ),
   mStylesheet( stylesheet ),
   mEnvironmentOptions(),
   mWindowPositionSize( positionSize ),
   mLaunchpadState( Launchpad::NONE ),
-  mSlotDelegate( this ),
-  mViewMode( MONO ),
-  mStereoBase( DEFAULT_STEREO_BASE )
+  mSlotDelegate( this )
 {
   // Get mName from environment options
   mMainWindowName = mEnvironmentOptions.GetWindowName();
@@ -166,7 +156,7 @@ void Application::CreateWindow()
 
   const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName();
 
-  Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( mWindowPositionSize, mMainWindowName, windowClassName, mMainWindowMode == Dali::Application::TRANSPARENT );
+  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
@@ -181,9 +171,7 @@ void Application::CreateAdaptor()
 
   Integration::SceneHolder sceneHolder = Integration::SceneHolder( &Dali::GetImplementation( mMainWindow ) );
 
-  mAdaptor = Adaptor::New( graphicsFactory, sceneHolder, mContextLossConfiguration, &mEnvironmentOptions );
-
-  mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize );
+  mAdaptor = Adaptor::New( graphicsFactory, sceneHolder, &mEnvironmentOptions );
 
   Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface );
 }
@@ -193,10 +181,8 @@ void Application::CreateAdaptorBuilder()
   mAdaptorBuilder = new AdaptorBuilder();
 }
 
-void Application::MainLoop(Dali::Configuration::ContextLoss configuration)
+void Application::MainLoop()
 {
-  mContextLossConfiguration = configuration;
-
   // Run the application
   mFramework->Run();
 }
@@ -216,6 +202,8 @@ void Application::Quit()
 
 void Application::QuitFromMainLoop()
 {
+  Accessibility::Bridge::GetCurrentBridge()->Terminate();
+
   mAdaptor->Stop();
 
   mFramework->Quit();
@@ -237,6 +225,7 @@ void Application::OnInit()
 
   // Run the adaptor
   mAdaptor->Start();
+  Accessibility::Accessible::SetObjectRegistry(mAdaptor->GetObjectRegistry());
 
   if( ! mStylesheet.empty() )
   {
@@ -251,7 +240,6 @@ void Application::OnInit()
   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);
@@ -333,16 +321,12 @@ void Application::OnRegionChanged()
 void Application::OnBatteryLow( Dali::DeviceStatus::Battery::Status status )
 {
   Dali::Application application(this);
-  mBatteryLowSignal.Emit( application );
-
   mLowBatterySignal.Emit( status );
 }
 
 void Application::OnMemoryLow( Dali::DeviceStatus::Memory::Status status )
 {
   Dali::Application application(this);
-  mMemoryLowSignal.Emit( application );
-
   mLowMemorySignal.Emit( status );
 }
 
@@ -364,12 +348,6 @@ void Application::OnSurfaceDestroyed( Any surface )
 {
 }
 
-void Application::OnResize(Dali::Adaptor& adaptor)
-{
-  Dali::Application application(this);
-  mResizeSignal.Emit( application );
-}
-
 bool Application::AddIdle( CallbackBase* callback, bool hasReturnValue )
 {
   return mAdaptor->AddIdle( callback, hasReturnValue );
@@ -385,54 +363,24 @@ std::string Application::GetLanguage() const
   return mFramework->GetLanguage();
 }
 
-Dali::Adaptor& Application::GetAdaptor()
+Dali::ObjectRegistry Application::GetObjectRegistry() const
 {
-  return *mAdaptor;
-}
-
-Dali::Window Application::GetWindow()
-{
-  // 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
+  Dali::ObjectRegistry objectRegistry;
+  if( mAdaptor )
   {
-    return mMainWindow;
+    objectRegistry = mAdaptor->GetObjectRegistry();
   }
+  return objectRegistry;
 }
 
-// Stereoscopy
-
-void Application::SetViewMode( ViewMode viewMode )
-{
-  mViewMode = viewMode;
-}
-
-ViewMode Application::GetViewMode() const
-{
-  return mViewMode;
-}
-
-void Application::SetStereoBase( float stereoBase )
-{
-  mStereoBase = stereoBase;
-}
-
-float Application::GetStereoBase() const
+Dali::Adaptor& Application::GetAdaptor()
 {
-  return mStereoBase;
+  return *mAdaptor;
 }
 
-void Application::ReplaceWindow( const PositionSize& positionSize, const std::string& name )
+Dali::Window Application::GetWindow()
 {
-  // This API is kept just for backward compatibility to make the test case pass.
-
-  mMainWindowReplaced = true;
-  OnResize( *mAdaptor );
+  return mMainWindow;
 }
 
 std::string Application::GetResourcePath()