Change "SLP" to "Tizen"

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

diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
index 159e109..dfb9f12 100644 (file)
--- a/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@ -20,9 +20,9 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <style-monitor.h>
 
 // INTERNAL INCLUDES
+#include <style-monitor.h>
 #include <command-line-options.h>
 #include <common/adaptor-impl.h>
 #include <singleton-service-impl.h>
@@ -31,9 +31,9 @@
 namespace Dali
 {
 
-namespace SlpPlatform
+namespace TizenPlatform
 {
-class SlpPlatformAbstraction;
+class TizenPlatformAbstraction;
 }
 
 namespace Integration
@@ -47,15 +47,6 @@ 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[],
@@ -68,13 +59,17 @@ ApplicationPtr Application::New(
 }
 
 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(),
+: mInitSignal(),
+  mTerminateSignal(),
+  mPauseSignal(),
+  mResumeSignal(),
+  mResetSignal(),
+  mResizeSignal(),
+  mAppControlSignal(),
+  mLanguageChangedSignal(),
+  mRegionChangedSignal(),
+  mBatteryLowSignal(),
+  mMemoryLowSignal(),
   mEventLoop( NULL ),
   mFramework( NULL ),
   mCommandLineOptions( NULL ),
@@ -104,15 +99,12 @@ Application::~Application()
 
 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 )
   {
     // let the command line options over ride
-    windowPosition = PositionSize(0,0,mCommandLineOptions->stageWidth,mCommandLineOptions->stageHeight);
+    windowPosition = PositionSize( 0, 0, mCommandLineOptions->stageWidth, mCommandLineOptions->stageHeight );
   }
 
   mWindow = Dali::Window::New( windowPosition, mName, mWindowMode == Dali::Application::TRANSPARENT );
@@ -124,16 +116,17 @@ void Application::CreateAdaptor()
 
   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())
   {
+    // Use DPI from command line.
+    unsigned int hDPI = 0;
+    unsigned int vDPI = 0;
+
     sscanf(dpiStr.c_str(), "%ux%u", &hDPI, &vDPI);
+
+    Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetDpi(hDPI, vDPI);
   }
-  Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetDpi(hDPI, vDPI);
 
   mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize );
 }
@@ -155,7 +148,7 @@ void Application::Lower()
 void Application::Quit()
 {
   // Actually quit the application.
-  AddIdle(boost::bind(&Application::QuitFromMainLoop, this));
+  AddIdle( MakeCallback( this, &Application::QuitFromMainLoop ) );
 }
 
 void Application::QuitFromMainLoop()
@@ -163,7 +156,7 @@ void Application::QuitFromMainLoop()
   mAdaptor->Stop();
 
   Dali::Application application(this);
-  mTerminateSignalV2.Emit( application );
+  mTerminateSignal.Emit( application );
 
   mFramework->Quit();
   // This will trigger OnTerminate(), below, after the main loop has completed.
@@ -172,7 +165,7 @@ void Application::QuitFromMainLoop()
 
 void Application::OnInit()
 {
-  mFramework->AddAbortCallback(boost::bind(&Application::QuitFromMainLoop, this));
+  mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) );
 
   CreateWindow();
   CreateAdaptor();
@@ -211,7 +204,7 @@ void Application::OnInit()
   LanguageChangedSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnLanguageChanged );
 
   Dali::Application application(this);
-  mInitSignalV2.Emit( application );
+  mInitSignal.Emit( application );
 
   Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).GetCore().SceneCreated();
 }
@@ -229,14 +222,14 @@ void Application::OnPause()
 {
   mAdaptor->Pause();
   Dali::Application application(this);
-  mPauseSignalV2.Emit( application );
+  mPauseSignal.Emit( application );
 }
 
 void Application::OnResume()
 {
   mAdaptor->Resume();
   Dali::Application application(this);
-  mResumeSignalV2.Emit( application );
+  mResumeSignal.Emit( application );
 }
 
 void Application::OnReset()
@@ -246,25 +239,49 @@ 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();
 }
 
+void Application::OnRegionChanged()
+{
+  Dali::Application application(this);
+  mRegionChangedSignal.Emit( application );
+}
+
+void Application::OnBatteryLow()
+{
+  Dali::Application application(this);
+  mBatteryLowSignal.Emit( application );
+}
+
+void Application::OnMemoryLow()
+{
+  Dali::Application application(this);
+  mMemoryLowSignal.Emit( application );
+}
+
 void Application::OnResize(Dali::Adaptor& adaptor)
 {
   Dali::Application application(this);
-  mResizeSignalV2.Emit( application );
+  mResizeSignal.Emit( application );
 }
 
-bool Application::AddIdle(boost::function<void(void)> callBack)
+bool Application::AddIdle( CallbackBase* callback )
 {
-  return mAdaptor->AddIdle(callBack);
+  return mAdaptor->AddIdle( callback );
 }
 
 Dali::Adaptor& Application::GetAdaptor()