Revert "[Tizen][AT-SPI] Bindings for Bridge::{Enable,Disable}AutoInit() and etc."

This reverts commit 208bb5d7c61c62179d4275fe1a660fe116aff68f.

diff --git a/dali-csharp-binder/src/atspi.cpp b/dali-csharp-binder/src/atspi.cpp
index 8f9eb047d759b7323bba1a4411cc069270678554..5fe4de856537242f8e92ce1ed7c7f18efb85d11c 100755 (executable)
--- a/dali-csharp-binder/src/atspi.cpp
+++ b/dali-csharp-binder/src/atspi.cpp
@@ -129,20 +129,6 @@ SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_stop_reading(void *jarg1,
   DALI_LOG_ERROR("csharp_dali_accessibility_stop_reading() arg2=%d", arg2);
 }
 
-SWIGEXPORT bool SWIGSTDCALL csharp_dali_accessibility_suppress_screen_reader(void *jarg1, bool jarg2)
-{
-  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1;
-  bool arg2 = jarg2;
-
-  if (!arg1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control is null", 0);
-    return false;
-  }
-
-  return Dali::AtspiAccessibility::SuppressScreenReader(arg2);
-}
-
 SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_Enable(void *jarg1, bool jarg2)
 {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1;
@@ -158,16 +144,6 @@ SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_Enable(void *jarg1, bool j
   DALI_LOG_ERROR("csharp_dali_accessibility_Enable() jarg2=%d \n", jarg2);
 }
 
-SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_BridgeEnableAutoInit()
-{
-  Dali::Accessibility::Bridge::EnableAutoInit();
-}
-
-SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_BridgeDisableAutoInit()
-{
-  Dali::Accessibility::Bridge::DisableAutoInit();
-}
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/dali-csharp-binder/src/control-devel_wrap.cpp b/dali-csharp-binder/src/control-devel_wrap.cpp
index a9218e3ff02ebce4c813085c0eaa14f3810981fe..b8b663b99ff54acc5924344c032b038184706947 100644 (file)
--- a/dali-csharp-binder/src/control-devel_wrap.cpp
+++ b/dali-csharp-binder/src/control-devel_wrap.cpp
@@ -232,6 +232,37 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityA
     });
 }
 
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_SetAccessibilityReadingInfoType(void *arg1, void *arg2) {
+    GUARD_ON_NULL_RET(arg1);
+    GUARD_ON_NULL_RET(arg2);
+    try_catch([&]() {
+        Dali::Actor *control = (Dali::Actor*) arg1;
+        Dali::Accessibility::ReadingInfoTypes *types = (Dali::Accessibility::ReadingInfoTypes*) arg2;
+        SetAccessibilityReadingInfoType(*control, *types);
+    });
+}
+
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_new_ReadingInfoType() {
+    Dali::Accessibility::ReadingInfoTypes *result = nullptr;
+    try_catch([&]() {
+        result = new Dali::Accessibility::ReadingInfoTypes();
+    });
+    return (void*) result;
+}
+
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_new_GetAccessibilityReadingInfoType(void *arg1) {
+    Dali::Accessibility::ReadingInfoTypes *result = nullptr;
+    GUARD_ON_NULL_RET0(arg1);
+    try_catch([&]() {
+        Dali::Actor *control = (Dali::Actor*) arg1;
+        result = new Dali::Accessibility::ReadingInfoTypes(GetAccessibilityReadingInfoType(*control));
+    });
+    return (void*) result;
+}
+
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_SetAccessibilityReadingInfoType2(void *arg1, int arg2) {
     using namespace Dali::Accessibility;
     static_assert(static_cast<int>(ReadingInfoType::NAME) == 0
@@ -259,6 +290,35 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_GetAccessibilityRead
     return result;
 }
 
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_delete_ReadingInfoType(void *arg1) {
+    try_catch([&]() {
+        delete static_cast<Dali::Accessibility::ReadingInfoTypes*>(arg1);
+    });
+}
+
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_ReadingInfoTypes_Get(void *arg1, int arg2) {
+    bool result = false;
+    GUARD_ON_NULL_RET0(arg1);
+    try_catch([&]() {
+        Dali::Accessibility::ReadingInfoTypes *types = (Dali::Accessibility::ReadingInfoTypes*) arg1;
+        Dali::Accessibility::ReadingInfoType type = (Dali::Accessibility::ReadingInfoType) arg2;
+        result = types->operator[](type);
+    });
+    return result;
+}
+
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_ReadingInfoTypes_Set(void *arg1, int arg2, int arg3) {
+    GUARD_ON_NULL_RET(arg1);
+    try_catch([&]() {
+        Dali::Accessibility::ReadingInfoTypes *types = (Dali::Accessibility::ReadingInfoTypes*) arg1;
+        Dali::Accessibility::ReadingInfoType type = (Dali::Accessibility::ReadingInfoType) arg2;
+        types->operator[](type) = (bool)arg3;
+    });
+}
+
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityHighlight(void *arg1) {
     bool result = false;
     GUARD_ON_NULL_RET0(arg1);
@@ -279,7 +339,6 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_GrabAccessi
     return result;
 }
 
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_new_States() {
     Dali::Accessibility::States *result = nullptr;
     try_catch([&]() {
@@ -288,7 +347,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_new_States() {
     return (void*)result;
 }
 
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_new_GetAccessibilityStates(void *arg1) {
     Dali::Accessibility::States *result = nullptr;
     GUARD_ON_NULL_RET0(arg1);
@@ -299,7 +357,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_new_GetAccessibili
     return (void*)result;
 }
 
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_States_Get(void *arg1, int arg2) {
     bool result = false;
     GUARD_ON_NULL_RET0(arg1);
@@ -311,7 +368,6 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_States_Get(
     return result;
 }
 
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_States_Set(void *arg1, int arg2, int arg3) {
     GUARD_ON_NULL_RET(arg1);
     try_catch([&]() {
@@ -321,14 +377,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_States_Set(void *ar
     });
 }
 
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_delete_States(void *arg1) {
     try_catch([&]() {
         delete static_cast<Dali::Accessibility::States*>(arg1);
     });
 }
 
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_States_Copy(void *arg1) {
     Dali::Accessibility::States *result = nullptr;
     GUARD_ON_NULL_RET0(arg1);
@@ -339,20 +393,6 @@ SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_States_Copy(void *
     return result;
 }
 
-SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_ConvertState(uint64_t arg1) {
-    Dali::Accessibility::States *result = nullptr;
-    GUARD_ON_NULL_RET0(arg1);
-    try_catch([&]() {
-       std::array<uint32_t, 2> data;
-       data[0] = static_cast<uint32_t>(arg1);
-       data[1] = static_cast<uint32_t>(arg1 >> 32);
-
-       result = new Dali::Accessibility::States(data);
-    });
-    return result;
-}
-
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_NotifyAccessibilityStateChange(void *arg1, void *arg2, int arg3) {
     GUARD_ON_NULL_RET(arg1);
     GUARD_ON_NULL_RET(arg2);
@@ -364,33 +404,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_NotifyAccessibility
     });
 }
 
-SWIGEXPORT uint64_t SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_GetAccessibilityState(void *arg1) {
-    uint64_t result = 0;
-    GUARD_ON_NULL_RET0(arg1);
-    try_catch([&]() {
-        Dali::Actor *control = (Dali::Actor*) arg1;
-        auto states = GetAccessibilityStates(*control);
-        result = states.GetRawData()[0];
-        uint64_t high = states.GetRawData()[1];
-        result |= (high << 32);
-    });
-    return result;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_NotifyAccessibilityStateChange2(void *arg1, uint64_t arg2, int arg3) {
-    GUARD_ON_NULL_RET(arg1);
-    try_catch([&]() {
-        std::array<uint32_t, 2> data;
-        data[0] = static_cast<uint32_t>(arg2);
-        data[1] = static_cast<uint32_t>(arg2 >> 32);
-
-        Dali::Accessibility::States states(data);
-        Dali::Actor *control = (Dali::Actor*) arg1;
-        bool doRecursive = arg3 ? true : false;
-        NotifyAccessibilityStateChange(*control, states, doRecursive);
-    });
-}
-
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_GetBoundAccessibilityObject(void *arg1) {
     Dali::Accessibility::Accessible *result = nullptr;
     GUARD_ON_NULL_RET0(arg1);
@@ -417,7 +430,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_EmitAccessibilityEvent(voi
     });
 }
 
-// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_EmitAccessibilityStateChangedEvent(void *arg1, int arg2_state, int arg3) {
     GUARD_ON_NULL_RET(arg1);
     try_catch([&]() {
@@ -430,31 +442,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_EmitAccessibilityStateChan
     });
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_EmitAccessibilityStateChangedEvent2(void *arg1, uint64_t arg2_state_bitfield, int arg3) {
-    GUARD_ON_NULL_RET(arg1);
-    try_catch([&]() {
-        /* Only one state may be passed with EmitStateChanged function */
-        /* TODO: replace with std::popcount() after migration to c++20 */
-        if (1 != __builtin_popcountll(arg2_state_bitfield)) {
-            SWIG_CSharpException(SWIG_RuntimeError, "Exactly one state must be set!");
-            return;
-        }
-
-        /* Now we need to convert "nui bitfield" into "dali enum State".   *
-         * Position of the bit equals value of Dali::Accessibility::State. */
-        /* TODO: replace with std::count_zero() after migration to c++20   */
-        int leading_zeros = __builtin_clzll(arg2_state_bitfield);
-        Dali::Accessibility::State state = (Dali::Accessibility::State) (63-leading_zeros);
-
-        Dali::Actor *control = (Dali::Actor*) arg1;
-        auto accessible = GetBoundAccessibilityObject(*control);
-        if (accessible)
-            accessible->EmitStateChanged((Dali::Accessibility::State)state, arg3);
-        else
-            SWIG_CSharpException(SWIG_RuntimeError, "Actor does not have accessible object.");
-    });
-}
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_EmitTextInsertedEvent(void *arg1, int arg2_position, int arg3_length, char *arg4_content) {
     GUARD_ON_NULL_RET(arg1);
     try_catch([&]() {

diff --git a/dali-csharp-binder/src/signal_wrap.cpp b/dali-csharp-binder/src/signal_wrap.cpp
index 36116c0da0b571b94f8c173afaf70d83a3b32701..7d730049077946a83eb4fe13136dbe5f4672623f 100644 (file)
--- a/dali-csharp-binder/src/signal_wrap.cpp
+++ b/dali-csharp-binder/src/signal_wrap.cpp
@@ -53,6 +53,17 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Disconnect(void *arg
     });
 }
 
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Emit(void *arg1, char *arg2) {
+    GUARD_ON_NULL_RET(arg1);
+    GUARD_ON_NULL_RET(arg2);
+    try_catch([&]() {
+        auto object = (StringToVoidSignal*)arg1;
+        std::string arg2_str(arg2);
+        object->Emit(arg2_str);
+    });
+}
+
 SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_new() {
     try_catch([&]() {
         return new StringToVoidSignal();
@@ -68,10 +79,23 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_delete(void *arg1) {
     });
 }
 
+// TODO - DEPRECATED - REMOVE AFTER TIZENFX MERGE
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_Convert_Param1(void *arg1) {
+    GUARD_ON_NULL_RET0(arg1);
+    try_catch([&]() {
+        auto result = (std::string*)arg1;
+        return SWIG_csharp_string_callback(result->c_str());
+    });
+    return nullptr;
+}
+
 SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_GetResult(void *arg1) {
     GUARD_ON_NULL_RET0(arg1);
-    std::string *data = (std::string*)arg1;
-    return SWIG_csharp_string_callback(data->c_str());
+    try_catch([&]() {
+        auto result = (std::string*)arg1;
+        return SWIG_csharp_string_callback(result->c_str());
+    });
+    return nullptr;
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_StringToVoid_SetResult(void *arg1, char *arg2) {
@@ -182,3 +206,4 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Signal_GesturePairToVoid_SetResult(void
 #ifdef __cplusplus
 }
 #endif
+