Revert "[3.0] Add key grab/ungrab interfaces for Tizen (X11/Wayland)"

[platform/core/uifw/dali-adaptor.git] / adaptors / ubuntu / accessibility-manager-impl-ubuntu.cpp

diff --git a/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp b/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp
index cb8fc21..f510dc1 100644 (file)
--- a/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp
+++ b/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp
@@ -19,11 +19,14 @@
 #include "accessibility-manager-impl.h"
 
 // EXTERNAL INCLUDES
-
-#include <dali/public-api/dali-core.h>
+#include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/integration-api/events/hover-event-integ.h>
 #include <dali/integration-api/events/gesture-requests.h>
+
+// INTERNAL INCLUDES
+#include <singleton-service-impl.h>
 #include "system-settings.h"
 
 namespace Dali
@@ -45,12 +48,15 @@ BaseHandle Create()
 {
   BaseHandle handle( AccessibilityManager::Get() );
 
-  if ( !handle && Adaptor::IsAvailable() )
+  if ( !handle )
   {
-    Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) );
-    Dali::AccessibilityManager manager = Dali::AccessibilityManager( new AccessibilityManager() );
-    adaptorImpl.RegisterSingleton( typeid( manager ), manager );
-    handle = manager;
+    Dali::SingletonService service( SingletonService::Get() );
+    if ( service )
+    {
+      Dali::AccessibilityManager manager = Dali::AccessibilityManager( new AccessibilityManager() );
+      service.Register( typeid( manager ), manager );
+      handle = manager;
+    }
   }
 
   return handle;
@@ -63,10 +69,11 @@ Dali::AccessibilityManager AccessibilityManager::Get()
 {
   Dali::AccessibilityManager manager;
 
-  if ( Adaptor::IsAvailable() )
+  Dali::SingletonService service( SingletonService::Get() );
+  if ( service )
   {
     // Check whether the singleton is already created
-    Dali::BaseHandle handle = Dali::Adaptor::Get().GetSingleton( typeid( Dali::AccessibilityManager ) );
+    Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::AccessibilityManager ) );
     if(handle)
     {
       // If so, downcast the handle
@@ -107,9 +114,9 @@ bool AccessibilityManager::HandleActionClearFocusEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionClearFocusSignalV2.Empty() )
+    if( !mActionClearFocusSignal.Empty() )
     {
-      mActionClearFocusSignalV2.Emit( handle );
+      mActionClearFocusSignal.Emit( handle );
     }
   }
 
@@ -129,8 +136,8 @@ bool AccessibilityManager::HandleActionScrollEvent(const TouchPoint& point, unsi
 
   Dali::AccessibilityManager handle( this );
 
-  Dali::TouchEvent touchEvent(timeStamp);
-  touchEvent.points.push_back(point);
+  Dali::TouchEvent event(timeStamp);
+  event.points.push_back(point);
 
   /*
    * In order to application decide touch action first,
@@ -138,19 +145,21 @@ bool AccessibilityManager::HandleActionScrollEvent(const TouchPoint& point, unsi
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionScrollSignalV2.Empty() )
+    if( !mActionScrollSignal.Empty() )
     {
-      mActionScrollSignalV2.Emit( handle, touchEvent );
+      mActionScrollSignal.Emit( handle, event );
     }
   }
 
-  Integration::TouchEvent event;
-  if (mCombiner.GetNextTouchEvent(point, timeStamp, event))
+  Integration::TouchEvent touchEvent;
+  Integration::HoverEvent hoverEvent;
+  Integration::TouchEventCombiner::EventDispatchType type = mCombiner.GetNextTouchEvent(point, timeStamp, touchEvent, hoverEvent);
+  if(type == Integration::TouchEventCombiner::DispatchTouch || type == Integration::TouchEventCombiner::DispatchBoth) // hover event is ignored
   {
     // Process the touch event in accessibility gesture detector
     if( mAccessibilityGestureDetector )
     {
-      mAccessibilityGestureDetector->SendEvent(event);
+      mAccessibilityGestureDetector->SendEvent(touchEvent);
       ret = true;
     }
   }
@@ -184,9 +193,9 @@ bool AccessibilityManager::HandleActionBackEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionBackSignalV2.Empty() )
+    if( !mActionBackSignal.Empty() )
     {
-      mActionBackSignalV2.Emit( handle );
+      mActionBackSignal.Emit( handle );
     }
   }
 
@@ -223,7 +232,7 @@ void AccessibilityManager::EnableAccessibility()
 
     //emit status changed signal
     Dali::AccessibilityManager handle( this );
-    mStatusChangedSignalV2.Emit( handle );
+    mStatusChangedSignal.Emit( handle );
   }
 }
 
@@ -240,11 +249,14 @@ void AccessibilityManager::DisableAccessibility()
 
     //emit status changed signal
     Dali::AccessibilityManager handle( this );
-    mStatusChangedSignalV2.Emit( handle );
+    mStatusChangedSignal.Emit( handle );
 
     // Destroy the TtsPlayer if exists.
-    Dali::Adaptor& adaptor = Dali::Adaptor::Get();
-    Adaptor::GetImplementation(adaptor).DestroyTtsPlayer(Dali::TtsPlayer::SCREEN_READER);
+    if ( Adaptor::IsAvailable() )
+    {
+      Dali::Adaptor& adaptor = Dali::Adaptor::Get();
+      Adaptor::GetImplementation( adaptor ).DestroyTtsPlayer( Dali::TtsPlayer::SCREEN_READER );
+    }
   }
 }
 
@@ -294,9 +306,9 @@ bool AccessibilityManager::HandleActionNextEvent(bool allowEndFeedback)
    */
   if( !mIndicatorFocused )
   {
-    if( !mActionNextSignalV2.Empty() )
+    if( !mActionNextSignal.Empty() )
     {
-      mActionNextSignalV2.Emit( handle );
+      mActionNextSignal.Emit( handle );
     }
   }
 
@@ -322,9 +334,9 @@ bool AccessibilityManager::HandleActionPreviousEvent(bool allowEndFeedback)
    */
  if ( !mIndicatorFocused )
   {
-    if( !mActionPreviousSignalV2.Empty() )
+    if( !mActionPreviousSignal.Empty() )
     {
-      mActionPreviousSignalV2.Emit( handle );
+      mActionPreviousSignal.Emit( handle );
     }
   }
 
@@ -350,9 +362,9 @@ bool AccessibilityManager::HandleActionActivateEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionActivateSignalV2.Empty() )
+    if( !mActionActivateSignal.Empty() )
     {
-      mActionActivateSignalV2.Emit( handle );
+      mActionActivateSignal.Emit( handle );
     }
   }
 
@@ -425,9 +437,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y,
      */
     if( !mIndicatorFocused )
     {
-      if ( !mActionReadSignalV2.Empty() )
+      if ( !mActionReadSignal.Empty() )
       {
-        mActionReadSignalV2.Emit( handle );
+        mActionReadSignal.Emit( handle );
       }
     }
   }
@@ -439,9 +451,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y,
      */
     if( !mIndicatorFocused )
     {
-      if ( !mActionOverSignalV2.Empty() )
+      if ( !mActionOverSignal.Empty() )
       {
-        mActionOverSignalV2.Emit( handle );
+        mActionOverSignal.Emit( handle );
       }
     }
   }
@@ -469,9 +481,9 @@ bool AccessibilityManager::HandleActionReadNextEvent(bool allowEndFeedback)
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionReadNextSignalV2.Empty() )
+    if( !mActionReadNextSignal.Empty() )
     {
-      mActionReadNextSignalV2.Emit( handle );
+      mActionReadNextSignal.Emit( handle );
     }
   }
 
@@ -497,9 +509,9 @@ bool AccessibilityManager::HandleActionReadPreviousEvent(bool allowEndFeedback)
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionReadPreviousSignalV2.Empty() )
+    if( !mActionReadPreviousSignal.Empty() )
     {
-      mActionReadPreviousSignalV2.Emit( handle );
+      mActionReadPreviousSignal.Emit( handle );
     }
   }
 
@@ -525,9 +537,9 @@ bool AccessibilityManager::HandleActionUpEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionUpSignalV2.Empty() )
+    if( !mActionUpSignal.Empty() )
     {
-      mActionUpSignalV2.Emit( handle );
+      mActionUpSignal.Emit( handle );
     }
   }
 
@@ -553,9 +565,9 @@ bool AccessibilityManager::HandleActionDownEvent()
    */
   if ( !mIndicatorFocused )
   {
-    if( !mActionDownSignalV2.Empty() )
+    if( !mActionDownSignal.Empty() )
     {
-      mActionDownSignalV2.Emit( handle );
+      mActionDownSignal.Emit( handle );
     }
   }