Supports to acknowledge for completing window rotation
[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / common / window-impl.h
index 6c62910..4287126 100644 (file)
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WINDOWSYSTEM_COMMON_WINDOW_IMPL_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/object/ref-object.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/adaptor-framework/window-enumerations.h>
 #include <dali/public-api/object/base-object.h>
+#include <dali/public-api/object/property-array.h>
+#include <dali/public-api/object/ref-object.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/adaptor/common/lifecycle-observer.h>
-#include <dali/internal/window-system/common/indicator-interface.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/internal/window-system/common/event-handler.h>
 #include <dali/public-api/adaptor-framework/key-grab.h>
-#include <dali/devel-api/adaptor-framework/drag-and-drop-detector.h>
+#include <dali/public-api/adaptor-framework/window.h>
 
 namespace Dali
 {
 class Adaptor;
-
-namespace Integration
-{
-class SystemOverlay;
-}
+class Actor;
+class RenderSurfaceInterface;
 
 namespace Internal
 {
 namespace Adaptor
 {
 class Orientation;
-class WindowBase;
 class WindowRenderSurface;
+class WindowBase;
 
 class Window;
-typedef IntrusivePtr<Window> WindowPtr;
-typedef IntrusivePtr<Orientation> 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
+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 Signal< void () > SignalType;
+  typedef Dali::Window::FocusChangeSignalType                        FocusChangeSignalType;
+  typedef Dali::Window::ResizeSignalType                             ResizeSignalType;
+  typedef Dali::DevelWindow::VisibilityChangedSignalType             VisibilityChangedSignalType;
+  typedef Dali::DevelWindow::TransitionEffectEventSignalType         TransitionEffectEventSignalType;
+  typedef Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType KeyboardRepeatSettingsChangedSignalType;
+  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
+   * @param[in] type Window type.
    * @param[in] isTransparent Whether window is transparent
    * @return A newly allocated Window
    */
-  static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false);
+  static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, Dali::WindowType type, 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
-   */
-  WindowRenderSurface* GetSurface();
-
-  /**
-   * @copydoc Dali::Window::ShowIndicator()
-   */
-  void ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode );
-
-  /**
-   * @copydoc Dali::Window::SetIndicatorBgOpacity()
-   */
-  void SetIndicatorBgOpacity( Dali::Window::IndicatorBgOpacity opacity );
-
-  /**
-   * Set the indicator visible mode
+   * @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] type Window type.
+   * @param[in] isTransparent Whether window is transparent
+   * @return A newly allocated Window
    */
-  void SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode );
+  static Window* New(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className,  Dali::WindowType type, bool isTransparent = false);
 
   /**
-   * @copydoc Dali::Window::RotateIndicator()
+   * @copydoc Dali::Window::SetClass()
    */
-  void RotateIndicator( Dali::Window::WindowOrientation orientation );
+  void SetClass(std::string name, std::string className);
 
   /**
-   * @copydoc Dali::Window::SetClass()
+   * @brief Gets the window class name.
+   * @return The class of the window
    */
-  void SetClass( std::string name, std::string className );
+  std::string GetClassName() const;
 
   /**
    * @copydoc Dali::Window::Raise()
@@ -125,49 +116,44 @@ public:
   void Activate();
 
   /**
-   * @copydoc Dali::Window::AddAvailableOrientation()
-   */
-  void AddAvailableOrientation(Dali::Window::WindowOrientation orientation);
-
-  /**
-   * @copydoc Dali::Window::RemoveAvailableOrientation()
+   * @copydoc Dali::Window::GetLayerCount()
    */
-  void RemoveAvailableOrientation(Dali::Window::WindowOrientation orientation);
+  uint32_t GetLayerCount() const;
 
   /**
-   * @copydoc Dali::Window::SetAvailableOrientations()
+   * @copydoc Dali::Window::GetLayer()
    */
-  void SetAvailableOrientations(const std::vector<Dali::Window::WindowOrientation>& orientations);
+  Dali::Layer GetLayer(uint32_t depth) const;
 
   /**
-   * @copydoc Dali::Window::GetAvailableOrientations()
+   * @copydoc Dali::DevelWindow::GetRenderTaskList()
    */
-  const std::vector<Dali::Window::WindowOrientation>& GetAvailableOrientations();
+  Dali::RenderTaskList GetRenderTaskList() const;
 
   /**
-   * @copydoc Dali::Window::SetPreferredOrientation()
+   * @copydoc Dali::Window::AddAvailableOrientation()
    */
-  void SetPreferredOrientation(Dali::Window::WindowOrientation orientation);
+  void AddAvailableOrientation(WindowOrientation orientation);
 
   /**
-   * @copydoc Dali::Window::GetPreferredOrientation()
+   * @copydoc Dali::Window::RemoveAvailableOrientation()
    */
-  Dali::Window::WindowOrientation GetPreferredOrientation();
+  void RemoveAvailableOrientation(WindowOrientation orientation);
 
   /**
-   * @copydoc Dali::Window::GetDragAndDropDetector() const
+   * @copydoc Dali::Window::SetPreferredOrientation()
    */
-  Dali::DragAndDropDetector GetDragAndDropDetector() const;
+  void SetPreferredOrientation(WindowOrientation orientation);
 
   /**
-   * @copydoc Dali::Window::GetNativeHandle() const
+   * @copydoc Dali::Window::GetPreferredOrientation()
    */
-  Dali::Any GetNativeHandle() const;
+  WindowOrientation GetPreferredOrientation();
 
   /**
    * @copydoc Dali::Window::SetAcceptFocus()
    */
-  void SetAcceptFocus( bool accept );
+  void SetAcceptFocus(bool accept);
 
   /**
    * @copydoc Dali::Window::IsFocusAcceptable()
@@ -185,11 +171,6 @@ public:
   void Hide();
 
   /**
-   * @copydoc Dali::Window::IsVisible() const
-   */
-  bool IsVisible() const;
-
-  /**
    * @copydoc Dali::Window::GetSupportedAuxiliaryHintCount()
    */
   unsigned int GetSupportedAuxiliaryHintCount() const;
@@ -197,62 +178,62 @@ public:
   /**
    * @copydoc Dali::Window::GetSupportedAuxiliaryHint()
    */
-  std::string GetSupportedAuxiliaryHint( unsigned int index ) const;
+  std::string GetSupportedAuxiliaryHint(unsigned int index) const;
 
   /**
    * @copydoc Dali::Window::AddAuxiliaryHint()
    */
-  unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value );
+  unsigned int AddAuxiliaryHint(const std::string& hint, const std::string& value);
 
   /**
    * @copydoc Dali::Window::RemoveAuxiliaryHint()
    */
-  bool RemoveAuxiliaryHint( unsigned int id );
+  bool RemoveAuxiliaryHint(unsigned int id);
 
   /**
    * @copydoc Dali::Window::SetAuxiliaryHintValue()
    */
-  bool SetAuxiliaryHintValue( unsigned int id, const std::string& value );
+  bool SetAuxiliaryHintValue(unsigned int id, const std::string& value);
 
   /**
    * @copydoc Dali::Window::GetAuxiliaryHintValue()
    */
-  std::string GetAuxiliaryHintValue( unsigned int id ) const;
+  std::string GetAuxiliaryHintValue(unsigned int id) const;
 
   /**
    * @copydoc Dali::Window::GetAuxiliaryHintId()
    */
-  unsigned int GetAuxiliaryHintId( const std::string& hint ) const;
+  unsigned int GetAuxiliaryHintId(const std::string& hint) const;
 
   /**
    * @copydoc Dali::Window::SetInputRegion()
    */
-  void SetInputRegion( const Rect< int >& inputRegion );
+  void SetInputRegion(const Rect<int>& inputRegion);
 
   /**
    * @copydoc Dali::Window::SetType()
    */
-  void SetType( Dali::Window::Type type );
+  void SetType(WindowType type);
 
   /**
    * @copydoc Dali::Window::GetType() const
    */
-  Dali::Window::Type GetType() const;
+  WindowType GetType() const;
 
   /**
    * @copydoc Dali::Window::SetNotificationLevel()
    */
-  bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level );
+  WindowOperationResult SetNotificationLevel(WindowNotificationLevel level);
 
   /**
    * @copydoc Dali::Window::GetNotificationLevel()
    */
-  Dali::Window::NotificationLevel::Type GetNotificationLevel() const;
+  WindowNotificationLevel GetNotificationLevel() const;
 
   /**
    * @copydoc Dali::Window::SetOpaqueState()
    */
-  void SetOpaqueState( bool opaque );
+  void SetOpaqueState(bool opaque);
 
   /**
    * @copydoc Dali::Window::IsOpaqueState()
@@ -262,17 +243,17 @@ public:
   /**
    * @copydoc Dali::Window::SetScreenOffMode()
    */
-  bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode);
+  WindowOperationResult SetScreenOffMode(WindowScreenOffMode screenOffMode);
 
   /**
    * @copydoc Dali::Window::GetScreenOffMode()
    */
-  Dali::Window::ScreenOffMode::Type GetScreenOffMode() const;
+  WindowScreenOffMode GetScreenOffMode() const;
 
   /**
    * @copydoc Dali::Window::SetBrightness()
    */
-  bool SetBrightness( int brightness );
+  WindowOperationResult SetBrightness(int brightness);
 
   /**
    * @copydoc Dali::Window::GetBrightness()
@@ -282,7 +263,7 @@ public:
   /**
    * @copydoc Dali::Window::SetSize()
    */
-  void SetSize( Dali::Window::WindowSize size );
+  void SetSize(Dali::Window::WindowSize size);
 
   /**
    * @copydoc Dali::Window::GetSize()
@@ -292,7 +273,7 @@ public:
   /**
    * @copydoc Dali::Window::SetPosition()
    */
-  void SetPosition( Dali::Window::WindowPosition position );
+  void SetPosition(Dali::Window::WindowPosition position);
 
   /**
    * @copydoc Dali::Window::GetPosition()
@@ -300,57 +281,155 @@ public:
   Dali::Window::WindowPosition GetPosition() const;
 
   /**
+   * @copydoc Dali::DevelWindow::SetPositionSize()
+   */
+  void SetPositionSize(PositionSize positionSize);
+
+  /**
+   * @copydoc Dali::DevelWindow::GetPositionSize()
+   */
+  PositionSize GetPositionSize() const;
+
+  /**
+   * @copydoc Dali::Window::GetRootLayer()
+   */
+  Dali::Layer GetRootLayer() const;
+
+  /**
    * @copydoc Dali::Window::SetTransparency()
    */
-  void SetTransparency( bool transparent );
+  void SetTransparency(bool transparent);
 
   /**
    * @copydoc Dali::KeyGrab::GrabKey()
    */
-  bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode );
+  bool GrabKey(Dali::KEY key, KeyGrab::KeyGrabMode grabMode);
 
   /**
    * @copydoc Dali::KeyGrab::UngrabKey()
    */
-  bool UngrabKey( Dali::KEY key );
+  bool UngrabKey(Dali::KEY key);
 
   /**
    * @copydoc Dali::KeyGrab::GrabKeyList()
    */
-  bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result );
+  bool GrabKeyList(const Dali::Vector<Dali::KEY>& key, const Dali::Vector<KeyGrab::KeyGrabMode>& grabMode, Dali::Vector<bool>& result);
 
   /**
    * @copydoc Dali::KeyGrab::UngrabKeyList()
    */
-  bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result );
+  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);
 
   /**
-   * Called when the window becomes iconified or deiconified.
+   * @copydoc Dali::DevelWindow::SetParent(Window window, Window parent)
    */
-  void OnIconifyChanged( bool iconified );
+  void SetParent(Dali::Window& parent);
 
   /**
-   * Called when the window focus is changed.
+   * @copydoc Dali::DevelWindow::SetParent(Window window, Window parent, bool belowParent)
    */
-  void OnFocusChanged( bool focusIn );
+  void SetParent(Dali::Window& parent, bool belowParent);
 
   /**
-   * Called when the output is transformed.
+   * @copydoc Dali::DevelWindow::Unparent()
    */
-  void OnOutputTransformed();
+  void Unparent();
 
   /**
-   * Called when the window receives a delete request
+   * @copydoc Dali::DevelWindow::GetParent()
    */
-  void OnDeleteRequest();
+  Dali::Window GetParent();
+
+  /**
+   * @copydoc Dali::DevelWindow::GetCurrentOrientation()
+   */
+  WindowOrientation GetCurrentOrientation() const;
+
+  /**
+   * @copydoc Dali::DevelWindow::GetPhysicalOrientation()
+   */
+  int GetPhysicalOrientation() const;
+
+  /**
+   * @copydoc Dali::DevelWindow::SetAvailableOrientations()
+   */
+  void SetAvailableOrientations(const Dali::Vector<WindowOrientation>& orientations);
+
+  /**
+   * @copydoc Dali::DevelWindow::SetPositionSizeWithOrientation()
+   */
+  void SetPositionSizeWithOrientation(PositionSize positionSize, WindowOrientation orientation);
+
+public: // Dali::Internal::Adaptor::SceneHolder
+  /**
+   * @copydoc Dali::Internal::Adaptor::SceneHolder::GetNativeHandle
+   */
+  Dali::Any GetNativeHandle() const override;
+
+  /**
+   * @copydoc Dali::Internal::Adaptor::SceneHolder::IsVisible
+   */
+  bool IsVisible() const override;
+
+  /**
+   * @copydoc Dali::DevelWindow::GetNativeId()
+   */
+  int32_t GetNativeId() const;
+
+  /**
+   * @copydoc Dali::DevelWindow::RequestMoveToServer()
+   */
+  void RequestMoveToServer();
+
+  /**
+   * @copydoc Dali::DevelWindow::RequestResizeToServer()
+   */
+  void RequestResizeToServer(WindowResizeDirection direction);
+
+  /**
+   * @copydoc Dali::DevelWindow::EnableFloatingMode()
+   */
+  void EnableFloatingMode(bool enable);
+
+  /**
+   * @copydoc Dali::DevelWindow::IncludeInputRegion()
+   */
+  void IncludeInputRegion(const Rect<int>& inputRegion);
+
+  /**
+   * @copydoc Dali::DevelWindow::ExcludeInputRegion()
+   */
+  void ExcludeInputRegion(const Rect<int>& inputRegion);
+
+  /**
+   * @copydoc Dali::DevelWindow::SetNeedsRotationCompletedAcknowledgement()
+   */
+  void SetNeedsRotationCompletedAcknowledgement(bool needAcknowledgement);
+
+  /**
+   * @copydoc Dali::DevelWindow::SendRotationCompletedAcknowledgement()
+   */
+  void SendRotationCompletedAcknowledgement();
 
 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()
    */
@@ -359,150 +438,229 @@ private:
   /**
    * Destructor
    */
-  virtual ~Window();
+  ~Window() override;
 
   /**
    * Second stage initialization
    */
-  void Initialize(const PositionSize& positionSize, const std::string& name, const std::string& className);
+  void Initialize(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className, WindowType type);
+
+  /**
+   * Called when the window becomes iconified or deiconified.
+   */
+  void OnIconifyChanged(bool iconified);
+
+  /**
+   * Called when the window focus is changed.
+   */
+  void OnFocusChanged(bool focusIn);
 
   /**
-   * Shows / hides the indicator bar.
-   * Handles close/open if rotation changes whilst hidden
+   * Called when the output is transformed.
    */
-  void DoShowIndicator( Dali::Window::WindowOrientation lastOrientation );
+  void OnOutputTransformed();
 
   /**
-   * 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.
+   * Called when the window receives a delete request.
    */
-  void DoRotateIndicator( Dali::Window::WindowOrientation orientation );
+  void OnDeleteRequest();
 
   /**
-   * Change the indicator actor's rotation to match the current orientation
+   * Called when the window receives a Transition effect-start/end event.
    */
-  void SetIndicatorActorRotation();
+  void OnTransitionEffectEvent(WindowEffectState state, WindowEffectType type);
 
   /**
-   * Set the indicator properties on the window
+   * @brief Called when window receives a keyboard repeat event.
    */
-  void SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientation lastOrientation );
+  void OnKeyboardRepeatSettingsChanged();
 
-private: // IndicatorInterface::Observer interface
+  /**
+   * @brief Called when the window redraw is requested.
+   */
+  void OnWindowRedrawRequest();
 
   /**
-   * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorTypeChanged()
+   * @brief Called when the window is resized or moved by display server.
+   *
+   * @param positionSize the updated window's position and size.
    */
-  virtual void IndicatorTypeChanged( IndicatorInterface::Type type );
+  void OnUpdatePositionSize(Dali::PositionSize& positionSize);
 
   /**
-   * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorClosed()
+   * @brief Set available orientation to window base.
    */
-  virtual void IndicatorClosed( IndicatorInterface* indicator);
+  void SetAvailableAnlges(const std::vector<int>& angles);
 
   /**
-   * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorVisibilityChanged()
+   * @brief Convert from window orientation to angle using OrientationMode.
    */
-  virtual void IndicatorVisibilityChanged( bool isVisible );
+  int ConvertToAngle(WindowOrientation orientation);
 
-private: // Adaptor::Observer interface
+  /**
+   * @brief Convert from angle to window orientation using OrientationMode.
+   */
+  WindowOrientation ConvertToOrientation(int angle) const;
 
   /**
-   * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnStart()
+   * @brief Check available window orientation for Available orientation.
    */
-  virtual void OnStart();
+  bool IsOrientationAvailable(WindowOrientation orientation) const;
 
+private: // Dali::Internal::Adaptor::SceneHolder
   /**
-   * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnPause()
+   * @copydoc Dali::Internal::Adaptor::SceneHolder::OnAdaptorSet
    */
-  virtual void OnPause();
+  void OnAdaptorSet(Dali::Adaptor& adaptor) override;
 
   /**
-   * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnResume()
+   * @copydoc Dali::Internal::Adaptor::SceneHolder::OnSurfaceSet
    */
-  virtual void OnResume();
+  void OnSurfaceSet(Dali::RenderSurfaceInterface* surface) override;
 
   /**
-   * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnStop()
+   * @copydoc Dali::Internal::Adaptor::SceneHolder::OnPause
    */
-  virtual void OnStop();
+  void OnPause() override;
 
   /**
-   * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnDestroy()
+   * @copydoc Dali::Internal::Adaptor::SceneHolder::OnResume
    */
-  virtual void OnDestroy();
+  void OnResume() override;
 
-public: // Signals
+  /**
+   * @copydoc Dali::Internal::Adaptor::SceneHolder::RecalculateTouchPosition
+   */
+  void RecalculateTouchPosition(Integration::Point& point) override;
+
+private: // Dali::Internal::Adaptor::EventHandler::Observer
+  /**
+   * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnTouchPoint
+   */
+  void OnTouchPoint(Dali::Integration::Point& point, int timeStamp) override;
+
+  /**
+   * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnWheelEvent
+   */
+  void OnWheelEvent(Dali::Integration::WheelEvent& wheelEvent) override;
+
+  /**
+   * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnKeyEvent
+   */
+  void OnKeyEvent(Dali::Integration::KeyEvent& keyEvent) override;
 
   /**
-   * The user should connect to this signal to get a timing when indicator was shown / hidden.
+   * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnRotation
    */
-  IndicatorSignalType& IndicatorVisibilityChangedSignal() { return mIndicatorVisibilityChangedSignal; }
+  void OnRotation(const RotationEvent& rotation) override;
 
+public: // Signals
   /**
-   * @copydoc Dali::Window::FocusChangedSignal()
+   * @copydoc Dali::Window::FocusChangeSignal()
    */
-  FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; }
+  FocusChangeSignalType& FocusChangeSignal()
+  {
+    return mFocusChangeSignal;
+  }
 
   /**
    * @copydoc Dali::Window::ResizedSignal()
    */
-  ResizedSignalType& ResizedSignal() { return mResizedSignal; }
+  ResizeSignalType& ResizeSignal()
+  {
+    return mResizeSignal;
+  }
 
   /**
    * This signal is emitted when the window is requesting to be deleted
    */
-  SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; }
+  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;
+  }
+
+  /**
+   * @copydoc Dali::DevelWindow::KeyboardRepeatSettingsChangedSignal()
+   */
+  KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettingsChangedSignal()
+  {
+    return mKeyboardRepeatSettingsChangedSignal;
+  }
 
 private:
+  WindowRenderSurface* mWindowSurface; ///< The window rendering surface
+  WindowBase*          mWindowBase;
+  std::string          mName;
+  std::string          mClassName;
+  bool                 mIsTransparent : 1;
+  bool                 mIsFocusAcceptable : 1;
+  bool                 mIconified : 1;
+  bool                 mOpaqueState : 1;
+  bool                 mWindowRotationAcknowledgement : 1;
+  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;      ///< The physical screen mode is portrait or landscape
 
-  WindowRenderSurface*                  mSurface;
-  std::unique_ptr< WindowBase >         mWindowBase;
-  Dali::Window::IndicatorVisibleMode    mIndicatorVisible; ///< public state
-  bool                                  mIndicatorIsShown:1; ///< private state
-  bool                                  mShowRotatedIndicatorOnClose:1;
-  bool                                  mStarted:1;
-  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;
-
-  OrientationPtr                               mOrientation;
-  std::vector<Dali::Window::WindowOrientation> mAvailableOrientations;
-  Dali::Window::WindowOrientation              mPreferredOrientation;
+  int mNativeWindowId;                   ///< The Native Window Id
 
   // Signals
-  IndicatorSignalType mIndicatorVisibilityChangedSignal;
-  FocusSignalType     mFocusChangedSignal;
-  ResizedSignalType   mResizedSignal;
-  SignalType          mDeleteRequestSignal;
+  SignalType                              mDeleteRequestSignal;
+  FocusChangeSignalType                   mFocusChangeSignal;
+  ResizeSignalType                        mResizeSignal;
+  VisibilityChangedSignalType             mVisibilityChangedSignal;
+  TransitionEffectEventSignalType         mTransitionEffectEventSignal;
+  KeyboardRepeatSettingsChangedSignalType mKeyboardRepeatSettingsChangedSignal;
 };
 
 } // namespace Adaptor
-} // namepsace Internal
+} // namespace Internal
 
 // Helpers for public-api forwarding methods
 
 inline Internal::Adaptor::Window& GetImplementation(Dali::Window& window)
 {
-  DALI_ASSERT_ALWAYS( window && "Window handle is empty" );
+  DALI_ASSERT_ALWAYS(window && "Window handle is empty");
   BaseObject& object = window.GetBaseObject();
   return static_cast<Internal::Adaptor::Window&>(object);
 }
 
 inline const Internal::Adaptor::Window& GetImplementation(const Dali::Window& window)
 {
-  DALI_ASSERT_ALWAYS( window && "Window handle is empty" );
+  DALI_ASSERT_ALWAYS(window && "Window handle is empty");
   const BaseObject& object = window.GetBaseObject();
   return static_cast<const Internal::Adaptor::Window&>(object);
 }