Merge "Enable atspi" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / ubuntu-x11 / display-connection-impl-x.cpp

diff --git a/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp b/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp
index 030373d..c3e9b20 100644 (file)
--- a/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,21 +19,19 @@
 #include <dali/internal/window-system/ubuntu-x11/display-connection-impl-x.h>
 
 // EXTERNAL_HEADERS
-#include <Ecore_X.h>
 #include <dali/integration-api/debug.h>
+#include <dali/internal/system/linux/dali-ecore-x.h>
 
 // INTERNAL HEADERS
+#include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h>
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace Adaptor
 {
-
 DisplayConnection* DisplayConnectionX11::New()
 {
   //DisplayConnection* pDisplayConnection(new DisplayConnection());
@@ -43,7 +41,8 @@ DisplayConnection* DisplayConnectionX11::New()
 }
 
 DisplayConnectionX11::DisplayConnectionX11()
-: mDisplay(NULL)
+: mGraphics(nullptr),
+  mDisplay(nullptr)
 {
 }
 
@@ -70,22 +69,22 @@ void DisplayConnectionX11::ConsumeEvents()
     // Check if there are any events in the queue
     events = XEventsQueued(mDisplay, QueuedAfterFlush);
 
-    if (events > 0)
+    if(events > 0)
     {
       // Just flush event to prevent memory leak from event queue as the events get built up in
       // memory but are only deleted when we retrieve them
       XEvent ev;
       XNextEvent(mDisplay, &ev);
     }
-  }
-  while (events > 0);
+  } while(events > 0);
 }
 
-bool DisplayConnectionX11::InitializeEgl(EglInterface& egl)
+bool DisplayConnectionX11::InitializeGraphics()
 {
-  EglImplementation& eglImpl = static_cast<EglImplementation&>(egl);
+  auto               eglGraphics = static_cast<EglGraphics*>(mGraphics);
+  EglImplementation& eglImpl     = eglGraphics->GetEglImplementation();
 
-  if (!eglImpl.InitializeGles(reinterpret_cast<EGLNativeDisplayType>(mDisplay)))
+  if(!eglImpl.InitializeGles(reinterpret_cast<EGLNativeDisplayType>(mDisplay)))
   {
     DALI_LOG_ERROR("Failed to initialize GLES.\n");
     return false;
@@ -94,26 +93,18 @@ bool DisplayConnectionX11::InitializeEgl(EglInterface& egl)
   return true;
 }
 
-void DisplayConnectionX11::SetSurfaceType( RenderSurface::Type type )
+void DisplayConnectionX11::SetSurfaceType(Dali::RenderSurfaceInterface::Type type)
 {
-  if( type == RenderSurface::WINDOW_RENDER_SURFACE )
+  if(type == Dali::RenderSurfaceInterface::WINDOW_RENDER_SURFACE)
   {
     // Because of DDK issue, we need to use separated x display instead of ecore default display
     mDisplay = XOpenDisplay(0);
   }
 }
 
-void DisplayConnectionX11::GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical)
+void DisplayConnectionX11::SetGraphicsInterface(GraphicsInterface& graphics)
 {
-  // calculate DPI
-  float xres, yres;
-
-  // 1 inch = 25.4 millimeters
-  xres = ecore_x_dpi_get();
-  yres = ecore_x_dpi_get();
-
-  dpiHorizontal = int(xres + 0.5f);  // rounding
-  dpiVertical   = int(yres + 0.5f);
+  mGraphics = &graphics;
 }
 
 } // namespace Adaptor