Remove elementary dependency

Change-Id: Ic4b765ddd68e5a3ce2c29eb5ea376c982a530701
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 897ccab32747703bb06afb49780e92f6d38b595b..7fc84fe6382bd1e85aea2ad176fd6092068c2317 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src
 
 INCLUDE(FindPkgConfig)
 SET(PKGS_CHECK_MODULES
-        elementary
+        ecore-evas
+        evas
         glib-2.0
         feedback
         dlog

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
index 6d0c207f612f32421b1f99893f6b77aa367c9057..15a4d3db945669798fb31673eeb8dfabcbd72dff 100644 (file)
--- a/capi/CMakeLists.txt
+++ b/capi/CMakeLists.txt
@@ -4,7 +4,8 @@ PROJECT(scl-ui-nui-capi CXX)
 # Find Packages
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
-    elementary
+    ecore-evas
+    evas
     glib-2.0
     feedback
     dlog

diff --git a/capi/src/cscl-ui-dbus.cpp b/capi/src/cscl-ui-dbus.cpp
index f0240d5ad2c7938cfb6577bf04024171d899c829..175166da3aae9b68ab48e4ed61601cd86231967f 100644 (file)
--- a/capi/src/cscl-ui-dbus.cpp
+++ b/capi/src/cscl-ui-dbus.cpp
@@ -23,7 +23,6 @@
 #include <dbus/dbus.h>
 #include <inputmethod.h>
 #include <inputmethod_internal.h>
-#include <Elementary.h>
 #include "cscl-ui-dbus.h"
 
 #ifdef LOG_TAG

diff --git a/capi/src/cscl-ui-nui.cpp b/capi/src/cscl-ui-nui.cpp
index 5d75215be982f3fa0398ec63a4bfba36c5826d71..de8045efd516a81462fc49bf639b865e57a50c91 100644 (file)
--- a/capi/src/cscl-ui-nui.cpp
+++ b/capi/src/cscl-ui-nui.cpp
@@ -16,7 +16,7 @@
 
 #include <dlog.h>
 #include <sclui.h>
-#include <Elementary.h>
+#include <Ecore_Wl2.h>
 #include "cscl-ui-nui.h"
 #include "cscl-ui-graphics-backend.h"
 #include "cscl-ui-window-backend.h"

diff --git a/packaging/libscl-ui-nui.spec b/packaging/libscl-ui-nui.spec
index 9059ab20ab5aa1cb756de3ed60b11d9acfd64ee2..0543ba0fe0d6a269ed123fb89ed8070a230ecdf8 100644 (file)
--- a/packaging/libscl-ui-nui.spec
+++ b/packaging/libscl-ui-nui.spec
@@ -9,7 +9,8 @@ Group:      Graphics & UI Framework/Input
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(elementary)
+BuildRequires:  pkgconfig(evas)
+BuildRequires:  pkgconfig(ecore-evas)
 BuildRequires:  pkgconfig(eldbus)
 BuildRequires:  pkgconfig(ecore-wl2)
 BuildRequires:  pkgconfig(vconf)

diff --git a/scl/sclanimator-nui.cpp b/scl/sclanimator-nui.cpp
index c2c8c9b550455cb4dab7606ba04a8a6b073e00a5..0d2e6e72dfabda9000627099683ed3bea9fab30d 100644 (file)
--- a/scl/sclanimator-nui.cpp
+++ b/scl/sclanimator-nui.cpp
@@ -19,7 +19,6 @@
 #include "scldebug.h"
 
 #include <Ecore.h>
-#include <Elementary.h>
 
 #include "sclutils.h"
 #include "sclwindows.h"

diff --git a/scl/sclcontroller.cpp b/scl/sclcontroller.cpp
index 6cca2001b067e7112072ed84b68403698a4c56c9..af7302906a2f5fbe809ac6e516fbf70209740d42 100644 (file)
--- a/scl/sclcontroller.cpp
+++ b/scl/sclcontroller.cpp
@@ -785,8 +785,8 @@ CSCLController::process_button_pressed_event(sclwindow window, sclint x, sclint
             }
 #else
             if (windows) {
-                if (context && context->get_magnifier_enabled())
-                    windows->update_window(window, coordinate->x, coordinate->y, coordinate->width, coordinate->height, WINDOW_MAGNIFIER);
+                // if (context && context->get_magnifier_enabled())
+                //     windows->update_window(window, coordinate->x, coordinate->y, coordinate->width, coordinate->height, WINDOW_MAGNIFIER);
 
                 windows->update_window(window, coordinate->x, coordinate->y, coordinate->width, coordinate->height, WINDOW_KEYPAD);
             }

diff --git a/scl/sclevents-nui.cpp b/scl/sclevents-nui.cpp
index 5b4427ee1cd8dda422700d8a2b4b493e3f487e09..2ce11bb1566cf0680d53e52d3e7ef5f64fbfa649 100644 (file)
--- a/scl/sclevents-nui.cpp
+++ b/scl/sclevents-nui.cpp
@@ -25,7 +25,9 @@
 #include "sclresourcecache.h"
 #include "sclres_manager.h"
 
-#include <Elementary.h>
+#include <Ecore.h>
+#include <Ecore_Input.h>
+#include <Evas.h>
 #include <Eldbus.h>
 #include <dlog.h>
 #ifdef WAYLAND
@@ -456,17 +458,20 @@ static Eina_Bool mouse_press(void *data, int type, void *event_info)
         sclboolean is_scl_window = FALSE;
 #ifdef WAYLAND
         sclboolean is_magnifier_window = FALSE;
-        wl_base_window = (Ecore_Wl2_Window*)elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_base_window()));
-        wl_magnifier_window = (Ecore_Wl2_Window*)(elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_magnifier_window())));
+        //wl_base_window = (Ecore_Wl2_Window*)elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_base_window()));
+        wl_base_window = (static_cast<Ecore_Wl2_Window *>(windows->get_base_window()));
+        //wl_magnifier_window = (Ecore_Wl2_Window*)(elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_magnifier_window())));
+        wl_magnifier_window = (static_cast<Ecore_Wl2_Window *>(windows->get_magnifier_window()));
         if (wl_base_window && (unsigned int)ecore_wl2_window_id_get(wl_base_window) == ev->window) {
             is_scl_window = TRUE;
         } else if (wl_magnifier_window && (unsigned int)ecore_wl2_window_id_get(wl_magnifier_window) == ev->window) {
             is_scl_window = TRUE;
             is_magnifier_window = TRUE;
 #else
-        if (elm_win_xwindow_get(static_cast<Evas_Object*>(windows->get_base_window())) == ev->window) {
+        if (static_cast<Ecore_Wl2_Window*>(windows->get_base_window()) == ev->window) {
             is_scl_window = TRUE;
-        } else if (elm_win_xwindow_get(static_cast<Evas_Object*>(windows->get_magnifier_window())) == ev->window) {
+        //} else if (elm_win_xwindow_get(static_cast<Evas_Object*>(windows->get_magnifier_window())) == ev->window) {
+        } else if (((unsigned int)ecore_wl2_window_id_get(static_cast<Ecore_Wl2_Window*>(windows->get_magnifier_window())) == ev->window) {
             is_scl_window = TRUE;
 #endif
         } else {
@@ -477,7 +482,7 @@ static Eina_Bool mouse_press(void *data, int type, void *event_info)
                     if (window_context->is_virtual) {
                         is_scl_window  = TRUE;
 #ifdef WAYLAND
-                    } else if ((wl_window = (Ecore_Wl2_Window*)elm_win_wl_window_get(static_cast<Evas_Object*>(window)))) {
+                    } else if ((wl_window = (static_cast<Ecore_Wl2_Window*>(window)))) {
                         if ((unsigned int)ecore_wl2_window_id_get(wl_window) == ev->window)
                             is_scl_window = TRUE;
 #else
@@ -635,7 +640,7 @@ static Eina_Bool mouse_release(void *data, int type, void *event_info)
         SclWindowContext *dim_window_context = windows->get_window_context(windows->get_dim_window());
         if (dim_window_context) {
             if (!(dim_window_context->is_virtual)) {
-                if (elm_win_xwindow_get(static_cast<Evas_Object*>(windows->get_dim_window())) == ev->window) {
+                if ((unsigned int)ecore_wl2_window_id_get(static_cast<Ecore_Wl2_Window*>(windows->get_dim_window())) == ev->window) {
                     dimwinevent = TRUE;
                 }
             }
@@ -654,7 +659,7 @@ static Eina_Bool mouse_release(void *data, int type, void *event_info)
                             int root_x = 0;
                             int root_y = 0;
                             Ecore_Wl2_Window *wl_magnifier_window =
-                                (Ecore_Wl2_Window*)(elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_magnifier_window())));
+                                (static_cast<Ecore_Wl2_Window*>(windows->get_magnifier_window()));
                             if (wl_magnifier_window &&
                                 (unsigned int)ecore_wl2_window_id_get(wl_magnifier_window) == ev->window) {
                                 SclRectangle magnifier_rect = { 0, 0, 0, 0 };
@@ -886,9 +891,9 @@ static Eina_Bool mouse_move(void *data, int type, void *event_info)
             int root_y = 0;
 
             Ecore_Wl2_Window *wl_base_window =
-                (Ecore_Wl2_Window*)elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_base_window()));
+                (static_cast<Ecore_Wl2_Window *>(windows->get_base_window()));
             Ecore_Wl2_Window  *wl_magnifier_window =
-                (Ecore_Wl2_Window*)(elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_magnifier_window())));
+                (static_cast<Ecore_Wl2_Window*>(windows->get_magnifier_window()));
             if (wl_base_window && (unsigned int)ecore_wl2_window_id_get(wl_base_window) == ev->window) {
                 SclRectangle base_rect;
                 if (get_window_rect(windows->get_base_window(), &base_rect)) {
@@ -1168,7 +1173,7 @@ CSCLEventsImplNui::generate_mouse_event(SCLMouseEvent type, scl16 x, scl16 y)
                         Ecore_Event_Mouse_Button evt;
 #ifdef WAYLAND
                         Ecore_Wl2_Window *wl_base_window;
-                        wl_base_window = (Ecore_Wl2_Window*)elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_base_window()));
+                        wl_base_window = (static_cast<Ecore_Wl2_Window*>(windows->get_base_window()));
                         if (wl_base_window)
                             evt.window = (unsigned int)ecore_wl2_window_id_get(wl_base_window);
 #else
@@ -1196,7 +1201,7 @@ CSCLEventsImplNui::generate_mouse_event(SCLMouseEvent type, scl16 x, scl16 y)
                         Ecore_Event_Mouse_Button evt;
 #ifdef WAYLAND
                         Ecore_Wl2_Window *wl_base_window;
-                        wl_base_window = (Ecore_Wl2_Window*)elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_base_window()));
+                        wl_base_window = static_cast<Ecore_Wl2_Window *>(windows->get_base_window());
                         if (wl_base_window)
                             evt.window = (unsigned int)ecore_wl2_window_id_get(wl_base_window);
 #else
@@ -1223,7 +1228,7 @@ CSCLEventsImplNui::generate_mouse_event(SCLMouseEvent type, scl16 x, scl16 y)
                         Ecore_Event_Mouse_Move evt;
 #ifdef WAYLAND
                         Ecore_Wl2_Window *wl_base_window;
-                        wl_base_window = (Ecore_Wl2_Window*)elm_win_wl_window_get(static_cast<Evas_Object*>(windows->get_base_window()));
+                        wl_base_window = (static_cast<Ecore_Wl2_Window*>(windows->get_base_window()));
                         if (wl_base_window)
                             evt.window = (unsigned int)ecore_wl2_window_id_get(wl_base_window);
 #else

diff --git a/scl/sclevents-nui.h b/scl/sclevents-nui.h
index 663b2ddc4705edcde02f984971fb71da0b9fbf16..6de02b615fa7752c0101ec4876b8f8a2e0967ac0 100644 (file)
--- a/scl/sclevents-nui.h
+++ b/scl/sclevents-nui.h
@@ -16,7 +16,6 @@
  */
 
 #include "sclevents.h"
-#include <Ecore_Evas.h>
 #include <Ecore.h>
 #include <map>
 

diff --git a/scl/sclgraphics-nui.cpp b/scl/sclgraphics-nui.cpp
index adc9c44be31240d012613d00eb53a7e27cb5565d..7ad8e904a1a864c855fba5492c9ffc66bf0ad380 100644 (file)
--- a/scl/sclgraphics-nui.cpp
+++ b/scl/sclgraphics-nui.cpp
@@ -26,7 +26,6 @@
 
 #include <Ecore_Evas.h>
 #include <Ecore.h>
-#include <Elementary.h>
 //#include <list>
 #include <vector>
 #include <dlog.h>
@@ -62,7 +61,6 @@ CSCLGraphicsImplNui::CSCLGraphicsImplNui()
 {
     SCL_DEBUG();
     /* Initializes all window resources */
-    m_highlight_ui_object = NULL;
     m_backend_callback = NULL;
     m_backend_callback_data = NULL;
 }
@@ -79,7 +77,6 @@ CSCLGraphicsImplNui::~CSCLGraphicsImplNui()
 
 void CSCLGraphicsImplNui::init()
 {
-    m_highlight_ui_object = NULL;
     m_backend_callback = NULL;
     m_backend_callback_data = NULL;
 
@@ -91,11 +88,6 @@ void CSCLGraphicsImplNui::init()
 
 void CSCLGraphicsImplNui::fini()
 {
-    if (m_highlight_ui_object) {
-        evas_object_del(m_highlight_ui_object);
-        m_highlight_ui_object = NULL;
-    }
-
     m_backend_callback = NULL;
     m_backend_callback_data = NULL;
 

diff --git a/scl/sclgraphics-nui.h b/scl/sclgraphics-nui.h
index 1e8dc0a64870f09d8c5b383401670a245f69b6ed..a3a34beb2a733897a20843c961cb4dc27cf522e4 100644 (file)
--- a/scl/sclgraphics-nui.h
+++ b/scl/sclgraphics-nui.h
@@ -30,7 +30,6 @@
 #ifdef TEST_NEWBACKEND
 using namespace scl;
 
-#include <Ecore_Evas.h>
 #include <Ecore.h>
 
 typedef struct {
@@ -112,7 +111,6 @@ public :
     void set_graphics_backend_callback(ISCLUIGraphicsBackendCallback *callback, void *data);
 
 private:
-    Evas_Object *m_highlight_ui_object;
     ISCLUIGraphicsBackendCallback* m_backend_callback;
     void* m_backend_callback_data;
 };

diff --git a/scl/sclkeyfocushandler.cpp b/scl/sclkeyfocushandler.cpp
index 9c892d7a6f1b28de38b160e1f47046e2122cef61..37c6e1782b2424fb9ca5da396f6fd7b2b2c42a2d 100644 (file)
--- a/scl/sclkeyfocushandler.cpp
+++ b/scl/sclkeyfocushandler.cpp
@@ -15,7 +15,6 @@
  *
  */
 #include "sclkeyfocushandler.h"
-#include <Elementary.h>
 #include <Evas.h>
 #include <dlog.h>
 #ifndef WAYLAND

diff --git a/scl/sclutils-linux.cpp b/scl/sclutils-linux.cpp
index 526a14123baf0fee3c5a2f72ce8fd47e48544c40..370c4c623a8339699690a3077ceac147cad382fe 100644 (file)
--- a/scl/sclutils-linux.cpp
+++ b/scl/sclutils-linux.cpp
@@ -21,7 +21,6 @@
 
 #include <stdarg.h>
 
-#include <Elementary.h>
 #ifdef WAYLAND
 #define EFL_BETA_API_SUPPORT
 #include <Ecore_Wl2.h>

diff --git a/scl/sclwindows-nui.cpp b/scl/sclwindows-nui.cpp
index aa1eb748e3fe999120b7f2b1306e863927c235f7..fc3fccc5955252cc71d63bef190888f69b9b7cc7 100644 (file)
--- a/scl/sclwindows-nui.cpp
+++ b/scl/sclwindows-nui.cpp
@@ -25,7 +25,6 @@
 #include "sclres_manager.h"
 
 #include <glib.h>
-#include <Elementary.h>
 #include <malloc.h>
 #define EFL_BETA_API_SUPPORT
 #include <Ecore_Wl2.h>
@@ -122,7 +121,8 @@ CSCLWindowsImplNui::create_base_window(const sclwindow parent, SclWindowContext
     }
 
     int rots[4] = {0, 90, 180, 270};
-    elm_win_wm_rotation_available_rotations_set(static_cast<Evas_Object*>(parent), rots, 4);
+    //elm_win_wm_rotation_available_rotations_set(static_cast<Evas_Object*>(parent), rots, 4);
+    ecore_wl2_window_available_rotations_set(static_cast<Ecore_Wl2_Window*>(parent), rots, 4);
 
     CSCLUtils *utils = CSCLUtils::get_instance();
     if (utils) {
@@ -297,7 +297,8 @@ CSCLWindowsImplNui::destroy_window(sclwindow window)
         window_context = windows->get_window_context(window);
         if (window_context) {
             utils->log("WinNui_destroywin %p %x (basewin %p mag %p)\n", window,
-                (!(window_context->is_virtual)) ? elm_win_xwindow_get(static_cast<Evas_Object*>(window)) : 0x01,
+                // (!(window_context->is_virtual)) ? elm_win_xwindow_get(static_cast<Evas_Object*>(window)) : 0x01,
+                (!(window_context->is_virtual)) ? ecore_wl2_window_id_get(static_cast<Ecore_Wl2_Window*>(window)) : 0x01,
                 windows->get_base_window(), windows->get_magnifier_window());
             if (window_context->etc_info) {
                 Eina_List *list = (Eina_List*)(window_context->etc_info);
@@ -402,7 +403,8 @@ CSCLWindowsImplNui::show_window(const sclwindow window, sclboolean queue, SCLWin
              * N_SE-52548: ...and modified if() for other popup windows as well...
              */
             if (window_context && !(window_context->is_virtual)) {
-                elm_win_raise((Evas_Object *)window);
+                //elm_win_raise((Evas_Object *)window);
+                ecore_wl2_window_raise((Ecore_Wl2_Window *)window);
             }
         }
 
@@ -523,7 +525,6 @@ CSCLWindowsImplNui::hide_window(const sclwindow window,  sclboolean fForce)
             //evas_render_idle_flush(evas);
         }
         if (window == windows->get_base_window()) {
-            elm_cache_all_flush();
             malloc_trim(0);
         }
         utils->log("WinNui_hidewin %p (basewin %p mag %p)\n",
@@ -678,7 +679,7 @@ CSCLWindowsImplNui::resize_window(const sclwindow window, scl16 width, scl16 hei
     if (windows && window) {
         if (window != windows->get_base_window()) {
 #ifdef WAYLAND
-            Ecore_Wl2_Window *wl_window = (Ecore_Wl2_Window *)(elm_win_wl_window_get(win));
+            Ecore_Wl2_Window *wl_window = (Ecore_Wl2_Window *)win;
             ecore_wl2_window_rotation_geometry_set(wl_window,
                 rotation_values_EFL[ROTATION_0], 0, 0, width, height);
             ecore_wl2_window_rotation_geometry_set(wl_window,
@@ -840,7 +841,7 @@ CSCLWindowsImplNui::set_keep_above(const sclwindow window, sclboolean keepabove)
 
 void CSCLWindowsImplNui::set_window_accepts_focus(const sclwindow window, sclboolean acceptable)
 {
-    elm_win_prop_focus_skip_set(static_cast<Evas_Object*>(window), !acceptable);
+    ecore_wl2_window_focus_skip_set(static_cast<Ecore_Wl2_Window*>(window), !acceptable);
 }
 
 void CSCLWindowsImplNui::set_window_backend_callback(ISCLUIWindowBackendCallback *callback, void *data)

diff --git a/xml2binary/CMakeLists.txt b/xml2binary/CMakeLists.txt
index d5dbcd31e11201e11efaa81767558399037d467a..ae136cd2b3432ad7bc51bc1b1b62852641e44237 100644 (file)
--- a/xml2binary/CMakeLists.txt
+++ b/xml2binary/CMakeLists.txt
@@ -47,7 +47,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/xml2binary/include
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
-        elementary
         libxml-2.0
         glib-2.0
         dlog