X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fcommon%2Fwindow-impl.h;h=0d4a4e10e689b38e97d2a13e9575ee1837ee074c;hb=6e77f2f2c059b23e19ee8387397192431a88232a;hp=fff44b760962de440e694ae7598761da537aeb01;hpb=61a5411f6c21e2b1002fc88d59dbaff961905805;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index fff44b7..0d4a4e1 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_WINDOWSYSTEM_COMMON_WINDOW_IMPL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -21,23 +21,23 @@ // EXTERNAL INCLUDES #include #include +#include +#include +#include // INTERNAL INCLUDES -#include -#include -#include #include #include -#include +#include +#include +#include +#include namespace Dali { class Adaptor; - -namespace Integration -{ -class SystemOverlay; -} +class Actor; +class RenderSurfaceInterface; namespace Internal { @@ -48,22 +48,27 @@ class WindowRenderSurface; class WindowBase; class Window; -typedef IntrusivePtr WindowPtr; -typedef IntrusivePtr OrientationPtr; +using WindowPtr = IntrusivePtr< Window >; +using OrientationPtr = IntrusivePtr< Orientation >; +using EventHandlerPtr = IntrusivePtr< EventHandler >; /** * Window provides a surface to render onto with orientation & indicator properties. */ -class Window : public Dali::BaseObject, public IndicatorInterface::Observer, public LifeCycleObserver, public ConnectionTracker +class Window : public Dali::Internal::Adaptor::SceneHolder, public EventHandler::Observer, public ConnectionTracker { public: typedef Dali::Window::IndicatorSignalType IndicatorSignalType; typedef Dali::Window::FocusSignalType FocusSignalType; typedef Dali::Window::ResizedSignalType ResizedSignalType; + typedef Dali::Window::FocusChangeSignalType FocusChangeSignalType; + typedef Dali::Window::ResizeSignalType ResizeSignalType; + typedef Dali::DevelWindow::VisibilityChangedSignalType VisibilityChangedSignalType; + typedef Dali::DevelWindow::TransitionEffectEventSignalType TransitionEffectEventSignalType; typedef Signal< void () > SignalType; /** - * Create a new Window. This should only be called once by the Application class + * @brief Create a new Window. This should only be called once by the Application class * @param[in] positionSize The position and size of the window * @param[in] name The window title * @param[in] className The window class name @@ -73,16 +78,15 @@ public: static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false); /** - * Pass the adaptor back to the overlay. This allows the window to access Core's overlay. - * @param[in] adaptor An initialized adaptor - */ - void SetAdaptor(Dali::Adaptor& adaptor); - - /** - * Get the window surface - * @return The render surface + * @brief Create a new Window. This should only be called once by the Application class + * @param[in] surface The surface used to render on. + * @param[in] positionSize The position and size of the window + * @param[in] name The window title + * @param[in] className The window class name + * @param[in] isTransparent Whether window is transparent + * @return A newly allocated Window */ - WindowRenderSurface* GetSurface(); + static Window* New(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false); /** * @copydoc Dali::Window::ShowIndicator() @@ -95,11 +99,6 @@ public: void SetIndicatorBgOpacity( Dali::Window::IndicatorBgOpacity opacity ); /** - * Set the indicator visible mode - */ - void SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode ); - - /** * @copydoc Dali::Window::RotateIndicator() */ void RotateIndicator( Dali::Window::WindowOrientation orientation ); @@ -110,6 +109,12 @@ public: void SetClass( std::string name, std::string className ); /** + * @brief Gets the window class name. + * @return The class of the window + */ + std::string GetClassName() const; + + /** * @copydoc Dali::Window::Raise() */ void Raise(); @@ -125,24 +130,29 @@ public: void Activate(); /** - * @copydoc Dali::Window::AddAvailableOrientation() + * @copydoc Dali::Window::GetLayerCount() */ - void AddAvailableOrientation(Dali::Window::WindowOrientation orientation); + uint32_t GetLayerCount() const; /** - * @copydoc Dali::Window::RemoveAvailableOrientation() + * @copydoc Dali::Window::GetLayer() */ - void RemoveAvailableOrientation(Dali::Window::WindowOrientation orientation); + Dali::Layer GetLayer( uint32_t depth ) const; + + /** + * @copydoc Dali::DevelWindow::GetRenderTaskList() + */ + Dali::RenderTaskList GetRenderTaskList() const; /** - * @copydoc Dali::Window::SetAvailableOrientations() + * @copydoc Dali::Window::AddAvailableOrientation() */ - void SetAvailableOrientations(const std::vector& orientations); + void AddAvailableOrientation(Dali::Window::WindowOrientation orientation); /** - * @copydoc Dali::Window::GetAvailableOrientations() + * @copydoc Dali::Window::RemoveAvailableOrientation() */ - const std::vector& GetAvailableOrientations(); + void RemoveAvailableOrientation(Dali::Window::WindowOrientation orientation); /** * @copydoc Dali::Window::SetPreferredOrientation() @@ -155,16 +165,6 @@ public: Dali::Window::WindowOrientation GetPreferredOrientation(); /** - * @copydoc Dali::Window::GetDragAndDropDetector() const - */ - Dali::DragAndDropDetector GetDragAndDropDetector() const; - - /** - * @copydoc Dali::Window::GetNativeHandle() const - */ - Dali::Any GetNativeHandle() const; - - /** * @copydoc Dali::Window::SetAcceptFocus() */ void SetAcceptFocus( bool accept ); @@ -185,11 +185,6 @@ public: void Hide(); /** - * @copydoc Dali::Window::IsVisible() const - */ - bool IsVisible() const; - - /** * @copydoc Dali::Window::GetSupportedAuxiliaryHintCount() */ unsigned int GetSupportedAuxiliaryHintCount() const; @@ -305,6 +300,11 @@ public: void SetPositionSize( PositionSize positionSize ); /** + * @copydoc Dali::Window::GetRootLayer() + */ + Dali::Layer GetRootLayer() const; + + /** * @copydoc Dali::Window::SetTransparency() */ void SetTransparency( bool transparent ); @@ -330,49 +330,76 @@ public: bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ); /** - * Called from Orientation after the Change signal has been sent + * @copydoc Dali::DevelWindow::Get() */ - void RotationDone( int orientation, int width, int height ); + static Dali::Window Get( Dali::Actor actor ); -private: + /** + * @copydoc Dali::DevelWindow::SetParent() + */ + void SetParent( Dali::Window& parent ); /** - * Private constructor. - * @sa Window::New() + * @copydoc Dali::DevelWindow::Unparent() */ - Window(); + void Unparent(); /** - * Destructor + * @copydoc Dali::DevelWindow::GetParent() */ - virtual ~Window(); + Dali::Window GetParent(); /** - * Second stage initialization + * @copydoc Dali::DevelWindow::GetCurrentOrientation() */ - void Initialize(const PositionSize& positionSize, const std::string& name, const std::string& className); + Dali::Window::WindowOrientation GetCurrentOrientation() const; /** - * Shows / hides the indicator bar. - * Handles close/open if rotation changes whilst hidden + * @copydoc Dali::DevelWindow::SetAvailableOrientations() */ - void DoShowIndicator( Dali::Window::WindowOrientation lastOrientation ); + void SetAvailableOrientations( const Dali::Vector& orientations ); + +public: // Dali::Internal::Adaptor::SceneHolder /** - * Close current indicator and open a connection onto the new indicator service. - * Effect may not be synchronous if waiting for an indicator update on existing connection. + * @copydoc Dali::Internal::Adaptor::SceneHolder::GetNativeHandle */ - void DoRotateIndicator( Dali::Window::WindowOrientation orientation ); + Dali::Any GetNativeHandle() const override; /** - * Change the indicator actor's rotation to match the current orientation + * @copydoc Dali::Internal::Adaptor::SceneHolder::IsVisible */ - void SetIndicatorActorRotation(); + bool IsVisible() const override; + +private: + + /** + * @brief Enumeration for orietation mode. + * The Orientation Mode is related to screen size. + * If screen width is longer than height, the Orientation Mode will have LANDSCAPE. + * Otherwise screen width is shorter than height or same, the Orientation Mode will have PORTRAIT. + */ + enum class OrientationMode + { + PORTRAIT = 0, + LANDSCAPE + }; + + /** + * Private constructor. + * @sa Window::New() + */ + Window(); + + /** + * Destructor + */ + virtual ~Window(); /** - * Set the indicator properties on the window + * Second stage initialization */ - void SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientation lastOrientation ); + void Initialize(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className); /** * Called when the window becomes iconified or deiconified. @@ -395,53 +422,78 @@ private: void OnDeleteRequest(); /** - * Called when the Ecore indicator event is received. + * Called when the window receives a Transition effect-start/end event. */ - void OnIndicatorFlicked(); + void OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type ); -private: // IndicatorInterface::Observer interface + /** + * @brief Set available orientation to window base. + */ + void SetAvailableAnlges( const std::vector< int >& angles ); /** - * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorTypeChanged() + * @brief Convert from window orientation to angle using OrientationMode. */ - virtual void IndicatorTypeChanged( IndicatorInterface::Type type ); + int ConvertToAngle( Dali::Window::WindowOrientation orientation ); /** - * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorClosed() + * @brief Convert from angle to window orientation using OrientationMode. */ - virtual void IndicatorClosed( IndicatorInterface* indicator); + Dali::Window::WindowOrientation ConvertToOrientation( int angle ) const; /** - * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorVisibilityChanged() + * @brief Check available window orientation for Available orientation. */ - virtual void IndicatorVisibilityChanged( bool isVisible ); + bool IsOrientationAvailable( Dali::Window::WindowOrientation orientation ) const; -private: // Adaptor::Observer interface +private: // Dali::Internal::Adaptor::SceneHolder /** - * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnStart() + * @copydoc Dali::Internal::Adaptor::SceneHolder::OnAdaptorSet */ - virtual void OnStart(); + void OnAdaptorSet( Dali::Adaptor& adaptor ) override; /** - * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnPause() + * @copydoc Dali::Internal::Adaptor::SceneHolder::OnSurfaceSet */ - virtual void OnPause(); + void OnSurfaceSet( Dali::RenderSurfaceInterface* surface ) override; /** - * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnResume() + * @copydoc Dali::Internal::Adaptor::SceneHolder::OnPause */ - virtual void OnResume(); + void OnPause() override; + + /** + * @copydoc Dali::Internal::Adaptor::SceneHolder::OnResume + */ + void OnResume() override; + + /** + * @copydoc Dali::Internal::Adaptor::SceneHolder::RecalculateTouchPosition + */ + void RecalculateTouchPosition( Integration::Point& point ) override; + +private: // Dali::Internal::Adaptor::EventHandler::Observer /** - * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnStop() + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnTouchPoint */ - virtual void OnStop(); + void OnTouchPoint( Dali::Integration::Point& point, int timeStamp ) override; /** - * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnDestroy() + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnWheelEvent */ - virtual void OnDestroy(); + void OnWheelEvent( Dali::Integration::WheelEvent& wheelEvent ) override; + + /** + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnKeyEvent + */ + void OnKeyEvent( Dali::Integration::KeyEvent& keyEvent ) override; + + /** + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnRotation + */ + void OnRotation( const RotationEvent& rotation ) override; public: // Signals @@ -456,47 +508,76 @@ public: // Signals FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; } /** + * @copydoc Dali::Window::WindowFocusChangedSignal() + */ + FocusChangeSignalType& FocusChangeSignal() { return mFocusChangeSignal; } + /** * @copydoc Dali::Window::ResizedSignal() */ ResizedSignalType& ResizedSignal() { return mResizedSignal; } /** + * @copydoc Dali::Window::ResizedSignal() + */ + ResizeSignalType& ResizeSignal() { return mResizeSignal; } + + /** * This signal is emitted when the window is requesting to be deleted */ SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; } + /** + * @copydoc Dali::DevelWindow::VisibilityChangedSignal() + */ + VisibilityChangedSignalType& VisibilityChangedSignal() { return mVisibilityChangedSignal; } + + /** + * @copydoc Dali::Window::SignalEventProcessingFinished() + */ + Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); } + + /** + * @copydoc Dali::DevelWindow::TransitionEffectEventSignal() + */ + TransitionEffectEventSignalType& TransitionEffectEventSignal() { return mTransitionEffectEventSignal; } + private: - WindowRenderSurface* mSurface; + WindowRenderSurface* mWindowSurface; ///< The window rendering surface WindowBase* mWindowBase; - Dali::Window::IndicatorVisibleMode mIndicatorVisible; ///< public state - bool mIndicatorIsShown:1; ///< private state - bool mShowRotatedIndicatorOnClose:1; - bool mStarted:1; + std::string mName; + std::string mClassName; bool mIsTransparent:1; bool mIsFocusAcceptable:1; - bool mVisible:1; bool mIconified:1; bool mOpaqueState:1; bool mResizeEnabled:1; - std::unique_ptr< IndicatorInterface > mIndicator; - Dali::Window::WindowOrientation mIndicatorOrientation; - Dali::Window::WindowOrientation mNextIndicatorOrientation; - Dali::Window::IndicatorBgOpacity mIndicatorOpacityMode; - Integration::SystemOverlay* mOverlay; - Adaptor* mAdaptor; - Dali::DragAndDropDetector mDragAndDropDetector; Dali::Window::Type mType; + Dali::Window mParentWindow; + + OrientationPtr mOrientation; + std::vector< int > mAvailableAngles; + int mPreferredAngle; + + int mRotationAngle; ///< The angle of the rotation + int mWindowWidth; ///< The width of the window + int mWindowHeight; ///< The height of the window + + EventHandlerPtr mEventHandler; ///< The window events handler + + OrientationMode mOrientationMode; - OrientationPtr mOrientation; - std::vector mAvailableOrientations; - Dali::Window::WindowOrientation mPreferredOrientation; + int mNativeWindowId; ///< The Native Window Id // Signals - IndicatorSignalType mIndicatorVisibilityChangedSignal; - FocusSignalType mFocusChangedSignal; - ResizedSignalType mResizedSignal; - SignalType mDeleteRequestSignal; + IndicatorSignalType mIndicatorVisibilityChangedSignal; + FocusSignalType mFocusChangedSignal; + ResizedSignalType mResizedSignal; + SignalType mDeleteRequestSignal; + FocusChangeSignalType mFocusChangeSignal; + ResizeSignalType mResizeSignal; + VisibilityChangedSignalType mVisibilityChangedSignal; + TransitionEffectEventSignalType mTransitionEffectEventSignal; }; } // namespace Adaptor