X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fadaptor-impl.cpp;h=e6ae520a9f3589428b78445231e6d20bdbb09ab9;hb=556055cba279f756420711d8b53b0b55ea4f83a7;hp=e111bdb7334ae05c50c7b5bbf28679c5ec3c9066;hpb=0bd8ccbb0013ba5d51fd1744522f432b6d420fac;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 old mode 100644 new mode 100755 index e111bdb..e6ae520 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -95,7 +96,7 @@ thread_local Adaptor* gThreadLocalAdaptor = NULL; // raw thread specific pointer } // unnamed namespace -Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, EnvironmentOptions* environmentOptions ) { Dali::Adaptor* adaptor = new Dali::Adaptor; Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions ); @@ -104,40 +105,40 @@ Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::Render Dali::Internal::Adaptor::AdaptorBuilder* mAdaptorBuilder = new AdaptorBuilder(); auto graphicsFactory = mAdaptorBuilder->GetGraphicsFactory(); - impl->Initialize( graphicsFactory, configuration ); + impl->Initialize( graphicsFactory ); delete mAdaptorBuilder; // Not needed anymore as the graphics interface has now been created return adaptor; } -Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( Dali::Integration::SceneHolder window, EnvironmentOptions* environmentOptions ) { Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( window ); - Dali::Adaptor* adaptor = New( window, windowImpl.GetSurface(), configuration, environmentOptions ); + Dali::Adaptor* adaptor = New( window, windowImpl.GetSurface(), environmentOptions ); windowImpl.SetAdaptor( *adaptor ); return adaptor; } -Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface *surface, EnvironmentOptions* environmentOptions ) { Dali::Adaptor* adaptor = new Dali::Adaptor; // Public adaptor Adaptor* impl = new Adaptor( window, *adaptor, surface, environmentOptions ); // Impl adaptor adaptor->mImpl = impl; - impl->Initialize( graphicsFactory, configuration ); + impl->Initialize( graphicsFactory ); return adaptor; } // Called second -Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ) +Dali::Adaptor* Adaptor::New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, EnvironmentOptions* environmentOptions ) { Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( window ); - Dali::Adaptor* adaptor = New( graphicsFactory, window, windowImpl.GetSurface(), configuration, environmentOptions ); + Dali::Adaptor* adaptor = New( graphicsFactory, window, windowImpl.GetSurface(), environmentOptions ); windowImpl.SetAdaptor( *adaptor ); return adaptor; } // Called first -void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration::ContextLoss configuration ) +void Adaptor::Initialize( GraphicsFactory& graphicsFactory ) { // all threads here (event, update, and render) will send their logs to TIZEN Platform's LogMessage handler. Dali::Integration::Log::LogFunction logFunction( Dali::TizenPlatform::LogMessage ); @@ -409,7 +410,10 @@ void Adaptor::Start() (*iter)->OnStart(); } - mAddOnManager->Start(); + if (mAddOnManager) + { + mAddOnManager->Start(); + } } // Dali::Internal::Adaptor::Adaptor::Pause @@ -425,7 +429,10 @@ void Adaptor::Pause() } // Extensions - mAddOnManager->Pause(); + if (mAddOnManager) + { + mAddOnManager->Pause(); + } // Pause all windows event handlers when adaptor paused for( auto window : mWindows ) @@ -462,7 +469,10 @@ void Adaptor::Resume() } // Resume AddOnManager - mAddOnManager->Resume(); + if (mAddOnManager) + { + mAddOnManager->Resume(); + } // Inform observers that we have resumed. for( ObserverContainer::iterator iter = mObservers.begin(), endIter = mObservers.end(); iter != endIter; ++iter ) @@ -495,7 +505,10 @@ void Adaptor::Stop() (*iter)->OnStop(); } - mAddOnManager->Stop(); + if (mAddOnManager) + { + mAddOnManager->Stop(); + } mThreadController->Stop(); @@ -541,15 +554,15 @@ void Adaptor::FeedTouchPoint( TouchPoint& point, int timeStamp ) mWindows.front()->FeedTouchPoint( convertedPoint, timeStamp ); } -void Adaptor::FeedWheelEvent( WheelEvent& wheelEvent ) +void Adaptor::FeedWheelEvent( Dali::WheelEvent& wheelEvent ) { - Integration::WheelEvent event( static_cast< Integration::WheelEvent::Type >(wheelEvent.type), wheelEvent.direction, wheelEvent.modifiers, wheelEvent.point, wheelEvent.z, wheelEvent.timeStamp ); + Integration::WheelEvent event( static_cast< Integration::WheelEvent::Type >( wheelEvent.GetType() ), wheelEvent.GetDirection(), wheelEvent.GetModifiers(), wheelEvent.GetPoint(), wheelEvent.GetDelta(), wheelEvent.GetTime() ); mWindows.front()->FeedWheelEvent( event ); } -void Adaptor::FeedKeyEvent( KeyEvent& keyEvent ) +void Adaptor::FeedKeyEvent( Dali::KeyEvent& keyEvent ) { - Integration::KeyEvent convertedEvent( keyEvent ); + Integration::KeyEvent convertedEvent( keyEvent.GetKeyName(), keyEvent.GetLogicalKey(), keyEvent.GetKeyString(), keyEvent.GetKeyCode(), keyEvent.GetKeyModifier(), keyEvent.GetTime(), static_cast< Integration::KeyEvent::State >( keyEvent.GetState() ), keyEvent.GetCompose(), keyEvent.GetDeviceName(), keyEvent.GetDeviceClass(), keyEvent.GetDeviceSubclass() ); mWindows.front()->FeedKeyEvent( convertedEvent ); } @@ -635,11 +648,14 @@ void Adaptor::SetPreRenderCallback( CallbackBase* callback ) mThreadController->SetPreRenderCallback( callback ); } -bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow, const std::string& childWindowName, const std::string& childWindowClassName, bool childWindowMode ) +bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow ) { Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( childWindow ); windowImpl.SetAdaptor( Get() ); + // ChildWindow is set to the layout direction of the default window. + windowImpl.GetRootLayer().SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, mRootLayoutDirection ); + // Add the new Window to the container - the order is not important mWindows.push_back( &windowImpl ); @@ -938,6 +954,11 @@ void Adaptor::OnWindowShown() DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowShown: Update requested.\n" ); } + else if( PAUSED_WHILE_INITIALIZING == mState ) + { + // Change the state to READY again. It will be changed to RUNNING after the adaptor is started. + mState = READY; + } else { DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowShown: Adaptor is not paused state.[%d]\n", mState ); @@ -1184,7 +1205,8 @@ Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, mSocketFactory(), mThreadMode( ThreadMode::NORMAL ), mEnvironmentOptionsOwned( environmentOptions ? false : true /* If not provided then we own the object */ ), - mUseRemoteSurface( false ) + mUseRemoteSurface( false ), + mRootLayoutDirection( Dali::LayoutDirection::LEFT_TO_RIGHT ) { DALI_ASSERT_ALWAYS( !IsAvailable() && "Cannot create more than one Adaptor per thread" ); mWindows.insert( mWindows.begin(), &Dali::GetImplementation( window ) ); @@ -1194,11 +1216,11 @@ Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, void Adaptor::SetRootLayoutDirection( std::string locale ) { + mRootLayoutDirection = static_cast< LayoutDirection::Type >( Internal::Adaptor::Locale::GetDirection( std::string( locale ) ) ); for ( auto& window : mWindows ) { Dali::Actor root = window->GetRootLayer(); - root.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, - static_cast< LayoutDirection::Type >( Internal::Adaptor::Locale::GetDirection( std::string( locale ) ) ) ); + root.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, mRootLayoutDirection ); } } @@ -1212,6 +1234,12 @@ bool Adaptor::AddIdleEnterer( CallbackBase* callback, bool forceAdd ) idleAdded = mCallbackManager->AddIdleEntererCallback( callback ); } + if( !idleAdded ) + { + // Delete callback + delete callback; + } + return idleAdded; }