Merge branch 'tizen' into devel/new_mesh

[platform/core/uifw/dali-adaptor.git] / adaptors / x11 / window-impl-x.cpp

diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp
index 71a2925..dca0fb1 100644 (file)
--- a/adaptors/x11/window-impl-x.cpp
+++ b/adaptors/x11/window-impl-x.cpp
@@ -26,13 +26,13 @@
 #include <dali/integration-api/system-overlay.h>
 #include <dali/public-api/render-tasks/render-task.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
-#include <orientation.h>
 
 // INTERNAL HEADERS
 #include <window-render-surface.h>
 #include <drag-and-drop-detector-impl.h>
 #include <indicator-impl.h>
 #include <window-visibility-observer.h>
+#include <orientation.h>
 #include <orientation-impl.h>
 
 namespace
@@ -82,6 +82,8 @@ struct Window::EventHandler
                              ECORE_X_ATOM_E_DEICONIFY_APPROVE,
                              &tmp, 1);
 #endif // DALI_PROFILE_UBUNTU
+
+    ecore_x_input_multi_select( mEcoreWindow );
   }
 
   /**
@@ -240,11 +242,6 @@ RenderSurface* Window::GetSurface()
   return mSurface;
 }
 
-void Window::SetIndicatorStyle( Dali::Window::IndicatorStyle style )
-{
-  mIndicatorStyle = style;
-}
-
 void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode )
 {
   DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "visible : %d\n", visibleMode );
@@ -315,7 +312,6 @@ void Window::SetClass(std::string name, std::string klass)
 
 Window::Window()
 : mSurface(NULL),
-  mIndicatorStyle(Dali::Window::CHANGEABLE_COLOR),
   mIndicatorVisible(Dali::Window::INVISIBLE),
   mIndicatorIsShown(false),
   mShowRotatedIndicatorOnClose(false),
@@ -361,8 +357,11 @@ void Window::Initialize(const PositionSize& windowPosition, const std::string& n
 {
   // create an X11 window by default
   Any surface;
-  Any display;
-  mSurface = new ECore::WindowRenderSurface( windowPosition, surface, display, name, mIsTransparent );
+  ECore::WindowRenderSurface* windowSurface = new ECore::WindowRenderSurface( windowPosition, surface, name, mIsTransparent );
+  windowSurface->Map();
+
+  mSurface = windowSurface;
+
   mOrientation = Orientation::New(this);
 
   // create event handler for X11 window
@@ -375,7 +374,7 @@ void Window::DoShowIndicator( Dali::Window::WindowOrientation lastOrientation )
   {
     if( mIndicatorVisible != Dali::Window::INVISIBLE )
     {
-      mIndicator = new Indicator( mAdaptor, mIndicatorOrientation, mIndicatorStyle, this );
+      mIndicator = new Indicator( mAdaptor, mIndicatorOrientation, this );
       mIndicator->SetOpacityMode( mIndicatorOpacityMode );
       Dali::Actor actor = mIndicator->GetActor();
       SetIndicatorActorRotation();
@@ -503,22 +502,22 @@ void Window::SetIndicatorActorRotation()
     case Dali::Window::PORTRAIT:
       actor.SetParentOrigin( ParentOrigin::TOP_CENTER );
       actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-      actor.SetRotation( Degree(0), Vector3::ZAXIS );
+      actor.SetOrientation( Degree(0), Vector3::ZAXIS );
       break;
     case Dali::Window::PORTRAIT_INVERSE:
       actor.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
       actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-      actor.SetRotation( Degree(180), Vector3::ZAXIS );
+      actor.SetOrientation( Degree(180), Vector3::ZAXIS );
       break;
     case Dali::Window::LANDSCAPE:
       actor.SetParentOrigin( ParentOrigin::CENTER_LEFT );
       actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-      actor.SetRotation( Degree(270), Vector3::ZAXIS );
+      actor.SetOrientation( Degree(270), Vector3::ZAXIS );
       break;
     case Dali::Window::LANDSCAPE_INVERSE:
       actor.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
       actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-      actor.SetRotation( Degree(90), Vector3::ZAXIS );
+      actor.SetOrientation( Degree(90), Vector3::ZAXIS );
       break;
   }
 }
@@ -606,11 +605,6 @@ void Window::OnDestroy()
   mAdaptor = NULL;
 }
 
-OrientationPtr Window::GetOrientation()
-{
-  return mOrientation;
-}
-
 void Window::AddAvailableOrientation(Dali::Window::WindowOrientation orientation)
 {
   bool found = false;