Revert "[3.0] Implement wayland specfic indicator, window appId, ..."

This reverts commit d5b6a16b545f3e06e3258e8be1cdd0b8665c70bc.

Change-Id: I1e713c4a2bdc209dbfa308c72e947c01899fc8c6

diff --git a/adaptors/common/adaptor-impl.h b/adaptors/common/adaptor-impl.h
index 40b9bb2..e920459 100644 (file)
--- a/adaptors/common/adaptor-impl.h
+++ b/adaptors/common/adaptor-impl.h
@@ -324,11 +324,6 @@ public:
    */
   void NotifyLanguageChanged();
 
-  /**
-   * Gets AppId of current application
-   */
-  void GetAppId( std::string& appId );
-
 public:  //AdaptorInternalServices
 
   /**

diff --git a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
index 1d38c49..419e880 100644 (file)
--- a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp
@@ -49,7 +49,6 @@
 #include <physical-keyboard-impl.h>
 #include <style-monitor-impl.h>
 #include <base/core-event-interface.h>
-#include <virtual-keyboard.h>
 
 namespace Dali
 {
@@ -185,10 +184,6 @@ struct EventHandler::Impl
       // Register Mouse wheel events
       mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_EVENT_MOUSE_WHEEL,        EcoreEventMouseWheel,      handler ) );
 
-      // Register Focus events
-      mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_IN,  EcoreEventWindowFocusIn,   handler ) );
-      mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_OUT, EcoreEventWindowFocusOut,  handler ) );
-
       // Register Key events
       mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_EVENT_KEY_DOWN,           EcoreEventKeyDown,         handler ) );
       mEcoreEventHandler.push_back( ecore_event_handler_add( ECORE_EVENT_KEY_UP,             EcoreEventKeyUp,           handler ) );
@@ -381,10 +376,10 @@ struct EventHandler::Impl
       {
         std::string keyName( keyEvent->keyname );
         std::string keyString( "" );
-        int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname);
-        keyCode = (keyCode == -1) ? 0 : keyCode;
+        int keyCode = 0/*ecore_x_keysym_keycode_get(keyEvent->keyname)*/;
         int modifier( keyEvent->modifiers );
         unsigned long time = keyEvent->timestamp;
+
         if (!strncmp(keyEvent->keyname, "Keycode-", 8))
           keyCode = atoi(keyEvent->keyname + 8);
 
@@ -448,10 +443,10 @@ struct EventHandler::Impl
       {
         std::string keyName( keyEvent->keyname );
         std::string keyString( "" );
-        int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname);
-        keyCode = (keyCode == -1) ? 0 : keyCode;
+        int keyCode = 0/*ecore_x_keysym_keycode_get(keyEvent->keyname)*/;
         int modifier( keyEvent->modifiers );
-        unsigned long time = keyEvent->timestamp;
+        unsigned long time( keyEvent->timestamp );
+
         if (!strncmp(keyEvent->keyname, "Keycode-", 8))
           keyCode = atoi(keyEvent->keyname + 8);
 

diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
index 41c7f36..32d0227 100644 (file)
--- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
@@ -34,6 +34,7 @@
 #include <ecore-indicator-impl.h>
 #include <window-visibility-observer.h>
 #include <orientation-impl.h>
+
 namespace
 {
 const float INDICATOR_ANIMATION_DURATION( 0.18f ); // 180 milli seconds
@@ -161,34 +162,6 @@ void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode )
   DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "visible : %d\n", visibleMode );
   DALI_ASSERT_DEBUG(mOverlay);
 
-  ECore::WindowRenderSurface* wlSurface( dynamic_cast< ECore::WindowRenderSurface * >( mSurface ) );
-  DALI_ASSERT_DEBUG(wlSurface);
-  Ecore_Wl_Window* wlWindow = wlSurface->GetWlWindow();
-
-  mIndicatorVisible = visibleMode;
-
-  if ( mIndicatorVisible == Dali::Window::VISIBLE )
-  {
-    // when the indicator is visible, set proper mode for indicator server according to bg mode
-    if ( mIndicatorOpacityMode == Dali::Window::OPAQUE )
-    {
-      ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_OPAQUE);
-    }
-    else if ( mIndicatorOpacityMode == Dali::Window::TRANSLUCENT )
-    {
-      ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_TRANSLUCENT);
-    }
-    else if ( mIndicatorOpacityMode == Dali::Window::TRANSPARENT )
-    {
-      ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_OPAQUE);
-    }
-  }
-  else
-  {
-    // when the indicator is not visible, set TRANSPARENT mode for indicator server
-    ecore_wl_window_indicator_opacity_set(wlWindow, ECORE_WL_INDICATOR_TRANSPARENT); // it means hidden indicator
-  }
-
   DoShowIndicator( mIndicatorOrientation );
 }
 
@@ -262,11 +235,6 @@ void Window::Initialize(const PositionSize& windowPosition, const std::string& n
 
   mSurface = windowSurface;
 
-  std::string appId;
-  mAdaptor->GetAppId( appId );
-  Ecore_Wl_Window* wlWindow = windowSurface ->GetWlWindow();
-  ecore_wl_window_class_name_set(wlWindow, appId.c_str());
-
   mOrientation = Orientation::New(this);
 
   // create event handler for Wayland window

diff --git a/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp b/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
index da42e93..a093174 100644 (file)
--- a/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
@@ -260,6 +260,8 @@ void WindowRenderSurface::CreateWlRenderable()
   {
       DALI_ASSERT_ALWAYS(0 && "Failed to create X window");
   }
+
+  //FIXME
 }
 
 void WindowRenderSurface::UseExistingRenderable( unsigned int surfaceId )

diff --git a/adaptors/integration-api/wayland/ecore-wl-render-surface.h b/adaptors/integration-api/wayland/ecore-wl-render-surface.h
index aa747c4..88cd7c8 100644 (file)
--- a/adaptors/integration-api/wayland/ecore-wl-render-surface.h
+++ b/adaptors/integration-api/wayland/ecore-wl-render-surface.h
@@ -82,7 +82,7 @@ public: // API
    *
    * @return the Ecore X window handle
    */
-  virtual Ecore_Wl_Window* GetWlWindow();
+  Ecore_Wl_Window* GetWlWindow();
 
   /**
    * Get the surface as an Ecore_Wl_Window

diff --git a/adaptors/tizen/adaptor-impl-tizen.cpp b/adaptors/tizen/adaptor-impl-tizen.cpp
index b4a56eb..cc5f260 100644 (file)
--- a/adaptors/tizen/adaptor-impl-tizen.cpp
+++ b/adaptors/tizen/adaptor-impl-tizen.cpp
@@ -49,22 +49,6 @@ void Adaptor::GetDataStoragePath( std::string& path)
 
 }
 
-void Adaptor::GetAppId( std::string& appId )
-{
-#ifdef USE_APPFW
-  char *id;
-  app_get_id(&id);
-  if ( id )
-  {
-    appId = id;
-  }
-  else
-  {
-    appId = "";
-  }
-#endif
-}
-
 } // namespace Adaptor
 
 } // namespace Internal

diff --git a/adaptors/ubuntu/adaptor-impl-ubuntu.cpp b/adaptors/ubuntu/adaptor-impl-ubuntu.cpp
index 7574dc7..118816e 100644 (file)
--- a/adaptors/ubuntu/adaptor-impl-ubuntu.cpp
+++ b/adaptors/ubuntu/adaptor-impl-ubuntu.cpp
@@ -32,11 +32,6 @@ void Adaptor::GetDataStoragePath( std::string& path)
   path = DALI_SHADERBIN_DIR;
 }
 
-void Adaptor::GetAppId( std::string& appId )
-{
-  appId = "";
-}
-
 } // namespace Adaptor
 
 } // namespace Internal