Revert "[Tizen] Add input region APIs"

This reverts commit 2a78611579429fd810dbbada3b6dff2f222ea592.

Change-Id: I88b70a9aa9aa55730d63d21e0190a8403f3bdd92

diff --git a/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp b/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp
index cab5d0a..e0580d0 100644 (file)
--- a/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-Window.cpp
@@ -1350,39 +1350,3 @@ int UtcDaliWindowSetParentNegative(void)
   }
   END_TEST;
 }
-
-int UtcDaliWindowAddInputRegion(void)
-{
-  Dali::Window instance;
-  try
-  {
-    Rect<int> includedInputRegion(0,0,720,640);
-    DevelWindow::IncludeInputRegion(instance, includedInputRegion);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
-  END_TEST;
-}
-
-int UtcDaliWindowSubtractInputRegion(void)
-{
-  Dali::Window instance;
-  try
-  {
-    Rect<int> includedInputRegion(0,0,720,1280);
-    DevelWindow::IncludeInputRegion(instance, includedInputRegion);
-
-    Rect<int> excludedInputRegion(0,641,720,640);
-    DevelWindow::ExcludeInputRegion(instance, excludedInputRegion);
-
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
-  END_TEST;
-}

diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp
index 908a8ae..886d56b 100644 (file)
--- a/dali/devel-api/adaptor-framework/window-devel.cpp
+++ b/dali/devel-api/adaptor-framework/window-devel.cpp
@@ -171,16 +171,6 @@ void EnableFloatingMode(Window window, bool enable)
   GetImplementation(window).EnableFloatingMode(enable);
 }
 
-void IncludeInputRegion(Window window, const Rect<int>& inputRegion)
-{
-  GetImplementation(window).IncludeInputRegion(inputRegion);
-}
-
-void ExcludeInputRegion(Window window, const Rect<int>& inputRegion)
-{
-  GetImplementation(window).ExcludeInputRegion(inputRegion);
-}
-
 } // namespace DevelWindow
 
 } // namespace Dali

diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h
index 108b4f4..20adb92 100644 (file)
--- a/dali/devel-api/adaptor-framework/window-devel.h
+++ b/dali/devel-api/adaptor-framework/window-devel.h
@@ -308,39 +308,6 @@ DALI_ADAPTOR_API void RequestResizeToServer(Window window, WindowResizeDirection
  */
 DALI_ADAPTOR_API void EnableFloatingMode(Window window, bool enable);
 
-/**
- * @brief Includes input region.
- *
- * This function inlcudes input regions.
- * It can be used multiple times and supports multiple regions.
- * It means input region will be extended.
- *
- * This input is related to mouse and touch event.
- * If device has touch screen, this function is useful.
- * Otherwise device does not have that, we can use it after connecting mouse to the device.
- *
- * @param[in] window The window instance.
- * @param[in] inputRegion The added region to accept input events.
- */
-DALI_ADAPTOR_API void IncludeInputRegion(Window window, const Rect<int>& inputRegion);
-
-/**
- * @brief Excludes input region.
- *
- * This function excludes input regions.
- * It can be used multiple times and supports multiple regions.
- * It means input region will be reduced.
- * Nofice, should be set input area by IncludeInputRegion() before this function is used.
- *
- * This input is related to mouse and touch event.
- * If device has touch screen, this function is useful.
- * Otherwise device does not have that, we can use it after connecting mouse to the device.
- *
- * @param[in] window The window instance.
- * @param[in] inputRegion The subtracted region to except input events.
- */
-DALI_ADAPTOR_API void ExcludeInputRegion(Window window, const Rect<int>& inputRegion);
-
 } // namespace DevelWindow
 
 } // namespace Dali

diff --git a/dali/internal/window-system/android/window-base-android.cpp b/dali/internal/window-system/android/window-base-android.cpp
index 99e1dee..98d8b20 100644 (file)
--- a/dali/internal/window-system/android/window-base-android.cpp
+++ b/dali/internal/window-system/android/window-base-android.cpp
@@ -389,14 +389,6 @@ bool WindowBaseAndroid::IsFloatingModeEnabled() const
   return false;
 }
 
-void WindowBaseAndroid::IncludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
-void WindowBaseAndroid::ExcludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/android/window-base-android.h b/dali/internal/window-system/android/window-base-android.h
index 8ba0a14..c3c52b3 100644 (file)
--- a/dali/internal/window-system/android/window-base-android.h
+++ b/dali/internal/window-system/android/window-base-android.h
@@ -404,16 +404,6 @@ public:
    */
   bool IsFloatingModeEnabled() const override;
 
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IncludeInputRegion()
-   */
-  void IncludeInputRegion(const Rect<int>& inputRegion) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ExcludeInputRegion()
-   */
-  void ExcludeInputRegion(const Rect<int>& inputRegion) override;
-
 private:
   /**
    * Second stage initialization

diff --git a/dali/internal/window-system/common/window-base.h b/dali/internal/window-system/common/window-base.h
index 7983f45..389e7c5 100644 (file)
--- a/dali/internal/window-system/common/window-base.h
+++ b/dali/internal/window-system/common/window-base.h
@@ -406,18 +406,6 @@ public:
    */
   virtual void ImeWindowReadyToRender() = 0;
 
-  /**
-   * @brief Includes input region.
-   * @param[in] inputRegion The added region to accept input events.
-   */
-  virtual void IncludeInputRegion(const Rect<int>& inputRegion) = 0;
-
-  /**
-   * @brief Excludes input region.
-   * @param[in] inputRegion The subtracted region to except input events.
-   */
-  virtual void ExcludeInputRegion(const Rect<int>& inputRegion) = 0;
-
   // Signals
 
   /**

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 1bc3188..79228af 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -995,16 +995,6 @@ void Window::EnableFloatingMode(bool enable)
   mWindowBase->EnableFloatingMode(enable);
 }
 
-void Window::IncludeInputRegion(const Rect<int>& inputRegion)
-{
-  mWindowBase->IncludeInputRegion(inputRegion);
-}
-
-void Window::ExcludeInputRegion(const Rect<int>& inputRegion)
-{
-  mWindowBase->ExcludeInputRegion(inputRegion);
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index 761bb0e..b7c1d61 100644 (file)
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -391,16 +391,6 @@ public: // Dali::Internal::Adaptor::SceneHolder
    */
   void EnableFloatingMode(bool enable);
 
-  /**
-   * @copydoc Dali::DevelWindow::IncludeInputRegion()
-   */
-  void IncludeInputRegion(const Rect<int>& inputRegion);
-
-  /**
-   * @copydoc Dali::DevelWindow::ExcludeInputRegion()
-   */
-  void ExcludeInputRegion(const Rect<int>& inputRegion);
-
 private:
   /**
    * @brief Enumeration for orietation mode.

diff --git a/dali/internal/window-system/macos/window-base-mac.h b/dali/internal/window-system/macos/window-base-mac.h
index b967686..41bc806 100644 (file)
--- a/dali/internal/window-system/macos/window-base-mac.h
+++ b/dali/internal/window-system/macos/window-base-mac.h
@@ -337,16 +337,6 @@ public:
    */
   bool IsFloatingModeEnabled() const override;
 
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IncludeInputRegion()
-   */
-  void IncludeInputRegion(const Rect<int>& inputRegion) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ExcludeInputRegion()
-   */
-  void ExcludeInputRegion(const Rect<int>& inputRegion) override;
-
 private:
   // Undefined
   WindowBaseCocoa(const WindowBaseCocoa&) = delete;

diff --git a/dali/internal/window-system/macos/window-base-mac.mm b/dali/internal/window-system/macos/window-base-mac.mm
index 594a186..e4c06ac 100644 (file)
--- a/dali/internal/window-system/macos/window-base-mac.mm
+++ b/dali/internal/window-system/macos/window-base-mac.mm
@@ -680,14 +680,6 @@ bool WindowBaseCocoa::IsFloatingModeEnabled() const
   return false;
 }
 
-void WindowBaseCocoa::IncludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
-void WindowBaseCocoa::ExcludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
 } // namespace Dali::Internal::Adaptor
 
 @implementation CocoaView

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
index 55c6a7e..37f992c 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
@@ -2209,14 +2209,6 @@ bool WindowBaseEcoreWl::IsFloatingModeEnabled() const
   return false;
 }
 
-void WindowBaseEcoreWl::IncludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
-void WindowBaseEcoreWl::ExcludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
index 8cca415..003fdfa 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
@@ -470,16 +470,6 @@ public:
    */
   bool IsFloatingModeEnabled() const override;
 
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IncludeInputRegion()
-   */
-  void IncludeInputRegion(const Rect<int>& inputRegion) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ExcludeInputRegion()
-   */
-  void ExcludeInputRegion(const Rect<int>& inputRegion) override;
-
 private:
   /**
    * Second stage initialization

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
index 403337a..d467bb3 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -2720,30 +2720,6 @@ bool WindowBaseEcoreWl2::IsFloatingModeEnabled() const
   return ecore_wl2_window_floating_mode_get(mEcoreWindow);
 }
 
-void WindowBaseEcoreWl2::IncludeInputRegion(const Rect<int>& inputRegion)
-{
-  Eina_Rectangle rect;
-  rect.x = inputRegion.x;
-  rect.y = inputRegion.y;
-  rect.w = inputRegion.width;
-  rect.h = inputRegion.height;
-
-  ecore_wl2_window_input_rect_add(mEcoreWindow, &rect);
-  ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE);
-}
-
-void WindowBaseEcoreWl2::ExcludeInputRegion(const Rect<int>& inputRegion)
-{
-  Eina_Rectangle rect;
-  rect.x = inputRegion.x;
-  rect.y = inputRegion.y;
-  rect.w = inputRegion.width;
-  rect.h = inputRegion.height;
-
-  ecore_wl2_window_input_rect_subtract(mEcoreWindow, &rect);
-  ecore_wl2_window_commit(mEcoreWindow, EINA_TRUE);
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
index d05c99a..9c71f52 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
@@ -502,16 +502,6 @@ public:
    */
   bool IsFloatingModeEnabled() const override;
 
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IncludeInputRegion()
-   */
-  void IncludeInputRegion(const Rect<int>& inputRegion) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ExcludeInputRegion()
-   */
-  void ExcludeInputRegion(const Rect<int>& inputRegion) override;
-
 private:
   /**
    * Second stage initialization

diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
index 67cb784..fa125d8 100644 (file)
--- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
@@ -955,14 +955,6 @@ bool WindowBaseEcoreX::IsFloatingModeEnabled() const
   return false;
 }
 
-void WindowBaseEcoreX::IncludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
-void WindowBaseEcoreX::ExcludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
index 2a34f8f..03ffbcc 100644 (file)
--- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
+++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
@@ -404,16 +404,6 @@ public:
    */
   bool IsFloatingModeEnabled() const override;
 
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IncludeInputRegion()
-   */
-  void IncludeInputRegion(const Rect<int>& inputRegion) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ExcludeInputRegion()
-   */
-  void ExcludeInputRegion(const Rect<int>& inputRegion) override;
-
 private:
   /**
    * Second stage initialization

diff --git a/dali/internal/window-system/windows/window-base-win.cpp b/dali/internal/window-system/windows/window-base-win.cpp
index cb903ef..748f707 100644 (file)
--- a/dali/internal/window-system/windows/window-base-win.cpp
+++ b/dali/internal/window-system/windows/window-base-win.cpp
@@ -611,14 +611,6 @@ bool WindowBaseWin::IsFloatingModeEnabled() const
   return false;
 }
 
-void WindowBaseWin::IncludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
-void WindowBaseWin::ExcludeInputRegion(const Rect<int>& inputRegion)
-{
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/dali/internal/window-system/windows/window-base-win.h b/dali/internal/window-system/windows/window-base-win.h
index 6e0f7db..854e66c 100644 (file)
--- a/dali/internal/window-system/windows/window-base-win.h
+++ b/dali/internal/window-system/windows/window-base-win.h
@@ -391,16 +391,6 @@ public:
    */
   bool IsFloatingModeEnabled() const override;
 
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IncludeInputRegion()
-   */
-  void IncludeInputRegion(const Rect<int>& inputRegion) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ExcludeInputRegion()
-   */
-  void ExcludeInputRegion(const Rect<int>& inputRegion) override;
-
 private:
   /**
    * Second stage initialization