From a3e6529a4b74fa547c4dce003ffeb57c3976a2ab Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Tue, 25 Apr 2017 14:26:22 +0900 Subject: [PATCH] [Tizen] keygrab & ecore-wl-window-handle c# binding This reverts commit 5ba26c8f5365b5ded0526f0e2079ea7bd0220c34. Change-Id: I38938b107b1251603d3c955705f13f9dc88bd748 --- adaptors/common/window-impl.h | 4 ++++ adaptors/devel-api/adaptor-framework/window-devel.cpp | 5 +++++ adaptors/devel-api/adaptor-framework/window-devel.h | 7 +++++++ adaptors/ecore/wayland/window-impl-ecore-wl.cpp | 6 ++++++ adaptors/wayland/window-impl-wl.cpp | 7 ++++++- adaptors/x11/window-impl-x.cpp | 5 +++++ 6 files changed, 33 insertions(+), 1 deletion(-) mode change 100644 => 100755 adaptors/common/window-impl.h mode change 100644 => 100755 adaptors/devel-api/adaptor-framework/window-devel.cpp mode change 100644 => 100755 adaptors/devel-api/adaptor-framework/window-devel.h mode change 100644 => 100755 adaptors/ecore/wayland/window-impl-ecore-wl.cpp mode change 100644 => 100755 adaptors/wayland/window-impl-wl.cpp mode change 100644 => 100755 adaptors/x11/window-impl-x.cpp diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h old mode 100644 new mode 100755 index 0cf251b..13a2349 --- a/adaptors/common/window-impl.h +++ b/adaptors/common/window-impl.h @@ -328,6 +328,10 @@ private: IndicatorSignalType mIndicatorVisibilityChangedSignal; FocusSignalType mFocusChangedSignal; SignalType mDeleteRequestSignal; + +public: + + void* GetNativeWindowHandler(); }; } // namespace Adaptor diff --git a/adaptors/devel-api/adaptor-framework/window-devel.cpp b/adaptors/devel-api/adaptor-framework/window-devel.cpp old mode 100644 new mode 100755 index 70ad18e..30c3d0a --- a/adaptors/devel-api/adaptor-framework/window-devel.cpp +++ b/adaptors/devel-api/adaptor-framework/window-devel.cpp @@ -55,6 +55,11 @@ bool IsVisible( Window window ) return GetImplementation( window ).IsVisible(); } +void * GetNativeWindowHandler( Window window ) +{ + return GetImplementation( window ).GetNativeWindowHandler(); +} + } // namespace DevelWindow } // namespace Dali diff --git a/adaptors/devel-api/adaptor-framework/window-devel.h b/adaptors/devel-api/adaptor-framework/window-devel.h old mode 100644 new mode 100755 index db6c6ac..b12c0b9 --- a/adaptors/devel-api/adaptor-framework/window-devel.h +++ b/adaptors/devel-api/adaptor-framework/window-devel.h @@ -82,6 +82,13 @@ DALI_IMPORT_API void Hide( Window window ); */ DALI_IMPORT_API bool IsVisible( Window window ); +/** + * @brief Returns native Ecore Wayland Window handle only for c# binding + * @param[in] window The window where Ecore Wayland window handle is extracted + * @return void * of native Ecore Wayland Window + */ +DALI_IMPORT_API void * GetNativeWindowHandler( Window window ); + } // namespace DevelWindow } // namespace Dali diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp old mode 100644 new mode 100755 index 5c0523c..1408fab --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -676,6 +676,12 @@ void Window::RotationDone( int orientation, int width, int height ) ecore_wl_window_rotation_change_done_send( mEventHandler->mEcoreWindow ); } +void* Window::GetNativeWindowHandler() +{ + return mEventHandler->mEcoreWindow; +} + + } // Adaptor } // Internal } // Dali diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp old mode 100644 new mode 100755 index e9ec667..7b3303d --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -305,11 +305,16 @@ bool Window::IsVisible() const return mVisible; } - void Window::RotationDone( int orientation, int width, int height ) { } +void* Window::GetNativeWindowHandler() +{ + return NULL; +} + + } // Adaptor } // Internal } // Dali diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp old mode 100644 new mode 100755 index 63069b2..4f07fc6 --- a/adaptors/x11/window-impl-x.cpp +++ b/adaptors/x11/window-impl-x.cpp @@ -811,6 +811,11 @@ void Window::RotationDone( int orientation, int width, int height ) } } +void* Window::GetNativeWindowHandler() +{ + return mEventHandler->mEcoreWindow; +} + } // Adaptor } // Internal -- 2.7.4