[Tizen] remove GetNativeWindowHandler() in devel window

This reverts commit 2a1266cb487ba95c6716e3015df0bf7014e217c8.

Conflicts:
	dali-csharp-binder/src/dali_wrap.cpp

Change-Id: I265c9b3fe4b6e2f0dbfb0f7e40af1711c89948a0

diff --git a/configure.ac b/configure.ac
index d081046d772b735d462eb57c6457aa74921a6963..4f8b0447440aeff9041509cfda4c7b2839d557f2 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,20 @@ AM_INIT_AUTOMAKE(1.6)
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
+# added for key grab binding only for tizen
+AC_ARG_ENABLE(tizenBuild,
+              [  --enable-tizenBuild       build on tizen],
+              enable_tizenBuild=yes,
+              enable_tizenBuild=no)
+
+AM_CONDITIONAL([TIZENBUILD], [test x$enable_tizenBuild = xyes])
+
 # Checks for libraries.
 PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
+# added for key grab binding only for tizen
+if test x$enable_tizenBuild = xyes; then
+PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
+fi
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/dali-csharp-binder/Makefile.am b/dali-csharp-binder/Makefile.am
index 7680c3122e8bad4a755de9fdd61a69143c952281..abcc7cd6eca21779ec7ce52c751972dc54e8cea7 100755 (executable)
--- a/dali-csharp-binder/Makefile.am
+++ b/dali-csharp-binder/Makefile.am
@@ -11,9 +11,16 @@ libdali_csharp_binder_la_LDFLAGS = ${LDFLAGS}
 libdali_csharp_binder_la_CXXFLAGS = \
    ${CFLAGS} \
    $(DALI_CFLAGS) \
+   $(ECORE_WAYLAND_CFLAGS) \
    $(dali_csharp_binder_includes)
 
+# added for key grab binding only for tizen
+if TIZENBUILD
+libdali_csharp_binder_la_CXXFLAGS += -DTIZEN_BUILD
+libdali_csharp_binder_la_SOURCES = $(dali_csharp_binder_src_files_tizen)
+else
 libdali_csharp_binder_la_SOURCES = $(dali_csharp_binder_src_files)
+endif
 
 libdali_csharp_binderdir = $(includedir)/dali-csharp-binder
 libdali_csharp_binder_HEADERS = $(dali_csharp_binder_header_files)

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index b46c1f94b2bdb8ceb065eb8d69201aa89a5843e4..c87a320d1176bd0661769f94471b94d97e775355 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -3,6 +3,18 @@
 #
 
 dali_csharp_binder_src_files = \
+  src/dali_wrap.cpp \
+  src/callbackbase_wrap.cpp \
+  src/keyboard_focus_manager_wrap.cpp \
+  src/devel-property-wrap.cpp \
+  src/version-check.cpp \
+  src/view-wrapper-impl-wrap.cpp \
+  src/event-thread-callback-wrap.cpp \
+  src/manual-bindings-all.cpp \
+  src/tts-player.cpp
+
+# added for key grab binding only for tizen
+dali_csharp_binder_src_files_tizen = \
   src/dali_wrap.cpp \
   src/callbackbase_wrap.cpp \
   src/keyboard_focus_manager_wrap.cpp \

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 1cf966509480e25a44b0de37bf6cdfdfa81b27d8..5ef26dd114d0332f0f7409c8d989634c952bf420 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -3496,7 +3496,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_Assign(void * jarg1, void * jarg2)
   Dali::Any *arg2 = 0 ;
   Dali::Any *result = 0 ;
 
-  arg1 = (Dali::Any *)jarg1;
+  //DALI_LOG_ERROR("#####CSharp_Dali_Any_Assign()!\n");
+  arg1 = (Dali::Any *)jarg1; 
   arg2 = (Dali::Any *)jarg2;
   if (!arg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Any const & type is null", 0);
@@ -3529,7 +3530,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_GetType(void * jarg1) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   std::type_info *result = 0 ;
 
-  arg1 = (Dali::Any *)jarg1;
+  //DALI_LOG_ERROR("#####CSharp_Dali_Any_GetType()!\n");
+  arg1 = (Dali::Any *)jarg1; 
   {
     try {
       result = (std::type_info *) &((Dali::Any const *)arg1)->GetType();
@@ -3557,7 +3559,8 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Any_Empty(void * jarg1) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   bool result;
 
-  arg1 = (Dali::Any *)jarg1;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_Empty()!\n");
+  arg1 = (Dali::Any *)jarg1; 
   {
     try {
       result = (bool)((Dali::Any const *)arg1)->Empty();
@@ -3587,6 +3590,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Any_AnyContainerBase(void * jarg1,
   Dali::Any::DeleteFunc arg3 = (Dali::Any::DeleteFunc) 0 ;
   Dali::Any::AnyContainerBase *result = 0 ;
 
+  //DALI_LOG_ERROR("##### CSharp_Dali_new_Any_AnyContainerBase()!\n");
   arg1 = (std::type_info *)jarg1;
   if (!arg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
@@ -3621,7 +3625,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_GetType(void * ja
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   std::type_info *result = 0 ;
 
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_GetType()!\n");
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
   {
     try {
       result = (std::type_info *) &((Dali::Any::AnyContainerBase const *)arg1)->GetType();
@@ -3649,7 +3654,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mType_get(void *
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   ::std::type_info *result = 0 ;
 
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mType_get()!\n");
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
   result = (::std::type_info *) &(::std::type_info const &) ((arg1)->mType);
   jresult = (void *)result;
   return jresult;
@@ -3660,8 +3666,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_set(void
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::CloneFunc arg2 = (Dali::Any::CloneFunc) 0 ;
 
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  arg2 = (Dali::Any::CloneFunc)jarg2;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mCloneFunc_set()!\n");
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
+  arg2 = (Dali::Any::CloneFunc)jarg2; 
   if (arg1) (arg1)->mCloneFunc = arg2;
 }
 
@@ -3671,7 +3678,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_get(vo
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::CloneFunc result;
 
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mCloneFunc_get()!\n");
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
   result = (Dali::Any::CloneFunc) ((arg1)->mCloneFunc);
   jresult = (void *)result;
   return jresult;
@@ -3682,8 +3690,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_set(voi
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::DeleteFunc arg2 = (Dali::Any::DeleteFunc) 0 ;
 
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
-  arg2 = (Dali::Any::DeleteFunc)jarg2;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_set()!\n");
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
+  arg2 = (Dali::Any::DeleteFunc)jarg2; 
   if (arg1) (arg1)->mDeleteFunc = arg2;
 }
 
@@ -3693,7 +3702,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get(v
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::DeleteFunc result;
 
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get()!\n");
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
   result = (Dali::Any::DeleteFunc) ((arg1)->mDeleteFunc);
   jresult = (void *)result;
   return jresult;
@@ -3703,7 +3713,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get(v
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Any_AnyContainerBase(void * jarg1) {
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
 
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
+  //DALI_LOG_ERROR("##### CSharp_Dali_delete_Any_AnyContainerBase()!\n");
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
   {
     try {
       delete arg1;
@@ -3728,8 +3739,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_mContainer_set(void * jarg1, void *
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   Dali::Any::AnyContainerBase *arg2 = (Dali::Any::AnyContainerBase *) 0 ;
 
-  arg1 = (Dali::Any *)jarg1;
-  arg2 = (Dali::Any::AnyContainerBase *)jarg2;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_mContainer_set()!\n");
+  arg1 = (Dali::Any *)jarg1; 
+  arg2 = (Dali::Any::AnyContainerBase *)jarg2; 
   if (arg1) (arg1)->mContainer = arg2;
 }
 
@@ -3739,7 +3751,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_mContainer_get(void * jarg1) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   Dali::Any::AnyContainerBase *result = 0 ;
 
-  arg1 = (Dali::Any *)jarg1;
+  //DALI_LOG_ERROR("##### CSharp_Dali_Any_mContainer_get()!\n");
+  arg1 = (Dali::Any *)jarg1; 
   result = (Dali::Any::AnyContainerBase *) ((arg1)->mContainer);
   jresult = (void *)result;
   return jresult;
@@ -3750,8 +3763,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_DaliAssertMessage(char * jarg1, char * j
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
 
-  arg1 = (char *)jarg1;
-  arg2 = (char *)jarg2;
+  //DALI_LOG_ERROR("##### CSharp_Dali_DaliAssertMessage()!\n");
+  arg1 = (char *)jarg1; 
+  arg2 = (char *)jarg2; 
   {
     try {
       Dali::DaliAssertMessage((char const *)arg1,(char const *)arg2);

diff --git a/dali-csharp-binder/src/key-grab.cpp b/dali-csharp-binder/src/key-grab.cpp
index 248edd0d083693c05348246af91dd301d80b97b1..d589e4f0b845c0953503aac88e350c808382bc49 100755 (executable)
--- a/dali-csharp-binder/src/key-grab.cpp
+++ b/dali-csharp-binder/src/key-grab.cpp
@@ -20,6 +20,9 @@
 #include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>
 
+#ifdef TIZEN_BUILD
+#include <Ecore_Wayland.h>
+#endif
 
 #undef LOG
 //#define LOG DALI_LOG_ERROR
@@ -30,7 +33,6 @@
 extern "C" {
 #endif
 
-
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GrabKeyTopmost(void * window, int daliKey)
 {
   Dali::Window *_win = (Dali::Window *)window;
@@ -159,8 +161,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetNativeWindowHandler( void* window )
   LOG("CSharp_Dali_GetNativeWindowHandler() [DP1] window=%d", window);
 
   {
+    Dali::Any result;
     try {
-      ret = Dali::DevelWindow::GetNativeWindowHandler(*_win);
+      result = _win->GetNativeHandle();
+
+      Ecore_Wl_Window * ecore_win = Dali::AnyCast<Ecore_Wl_Window*>(result);
+      ret = (void*)ecore_win;
+
     } catch (std::out_of_range& e) {
     {
       SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return NULL;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 85cf9e4a19edec0464217f0a0ca2ee42714048c1..1005c2768879c5387f8c338e4ed6f826f4c1af06 100755 (executable)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -1,3 +1,4 @@
+
 Name: dali-csharp-binder
 Version: 1.2.41
 Release: 1
@@ -9,6 +10,7 @@ Source: %{name}-%{version}.tar.xz
 BuildRequires: pkgconfig(dali-core)
 BuildRequires: pkgconfig(dali-adaptor)
 BuildRequires: pkgconfig(dali-toolkit)
+BuildRequires: pkgconfig(ecore-wayland)
 
 %description
 dali-csharp-binder
@@ -35,6 +37,8 @@ This package includes developer files common to all packages.
 ##############################
 %build
 %autogen
+# added for key grab binding only for tizen
+%configure --enable-tizenBuild=yes
 make %{?_smp_mflags}
 
 ##############################