utilx: remove the use of utilx in detriment to efl_util

We've introduced some calls to efl_util so we can abstract the display
manager.

Change-Id: I8ae171853556692caa5056b14bba07542a9f9169
Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 6a1dbc29a2df2e54b4cc1e16759bd45c9f295990..4c1123addaf7592f2a93ed95f5e7efcb20788ba1 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -10,7 +10,7 @@ BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(utilX)
+BuildRequires:  pkgconfig(capi-ui-efl-util)
 BuildRequires:  pkgconfig(devman)
 BuildRequires:  pkgconfig(haptic)
 BuildRequires:  pkgconfig(bluetooth-api)

diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index 05b930cac33b2c6f68cc3bc476b5282482352d29..deb9f36fdf71453f88d5a20633449ebf7957b98c 100755 (executable)
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -7,7 +7,7 @@ PROJECT(${LIB_SETTING_COMMON})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_common_data REQUIRED utilX appcore-efl elementary vconf openssl evas ecore ecore-imf json-glib-1.0 edje glib-2.0 libxml-2.0 ui-gadget-1 capi-appfw-application capi-system-info capi-system-system-settings tapi)
+pkg_check_modules(pkgs_common_data REQUIRED capi-ui-efl-util appcore-efl elementary vconf openssl evas ecore ecore-imf json-glib-1.0 edje glib-2.0 libxml-2.0 ui-gadget-1 capi-appfw-application capi-system-info capi-system-system-settings tapi)
 
 FOREACH(flag ${pkgs_common_data_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c
index f7db2c7880d3cf8e3dab2c7d425af420cd8dc3ed..534aa1f556bd436f42e1e55d05e60fa4f2c75130 100755 (executable)
--- a/setting-common/src/setting-common-draw-popup.c
+++ b/setting-common/src/setting-common-draw-popup.c
@@ -17,7 +17,7 @@
 
 #include <setting-common-draw-widget.h>
 #include <glib.h>
-#include <utilX.h>
+#include <efl_util.h>
 #include <Ecore_X.h>
 
 static void _setting_def_response_cb(void *data, Evas_Object *obj,
@@ -33,9 +33,7 @@ static void __popup_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_in
 
 {
        SETTING_TRACE_BEGIN;
-       Ecore_X_Display *disp = ecore_x_display_get();
-       Ecore_X_Window xwin = elm_win_xwindow_get(obj);
-       int ret = utilx_ungrab_key(disp, xwin, KEY_HOME);
+       int ret = efl_util_ungrab_key(obj, KEY_HOME);
        if (ret) {
                SETTING_TRACE_ERROR("KEY_HOME ungrab error ret[%d]", ret);
        }
@@ -70,9 +68,7 @@ static void __popup_event_set(Evas_Object *popup, void *data,
        }
 
        if (keygrab_flag) {
-               Ecore_X_Display *disp = ecore_x_display_get();
-               Ecore_X_Window xwin = elm_win_xwindow_get(popup);
-               int ret = utilx_grab_key(disp, xwin, KEY_HOME, TOP_POSITION_GRAB);
+               int ret = efl_util_grab_key(popup, KEY_HOME, TOP_POSITION_GRAB);
                if (ret) {
                        SETTING_TRACE_ERROR("KEY_HOME grab error ret[%d]", ret);
                }

diff --git a/setting-connectivity/CMakeLists.txt b/setting-connectivity/CMakeLists.txt
index 5455c49b057dab81f045b95da6f8257a9fe76b6a..8fa2ed786fd0c7c67e46fed271e3f36d7069562f 100755 (executable)
--- a/setting-connectivity/CMakeLists.txt
+++ b/setting-connectivity/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_connectivity REQUIRED evas elementary appcore-common appcore-efl
-ui-gadget-1 capi-appfw-application utilX devman capi-system-runtime-info)
+ui-gadget-1 capi-appfw-application capi-ui-efl-util devman capi-system-runtime-info)
 
 FOREACH(flag ${pkgs_connectivity_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-password/CMakeLists.txt b/setting-password/CMakeLists.txt
index 880c2a31b66d902952afe2f4d44a7de8100b2b6c..c0632db7a2e4af52a9674ae4463ce648bad546cf 100755 (executable)
--- a/setting-password/CMakeLists.txt
+++ b/setting-password/CMakeLists.txt
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_password REQUIRED evas ecore edje elementary utilX appcore-common appcore-efl haptic ecore-imf
+pkg_check_modules(pkgs_password REQUIRED evas ecore edje elementary capi-ui-efl-util appcore-common appcore-efl haptic ecore-imf
 ui-gadget-1 capi-appfw-application tapi dlog)
 
 FOREACH(flag ${pkgs_password_CFLAGS})

diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index adb631b5ee3f82a81db4ac7f745532e988ea01b8..698d185358855889012d4a622cdf7ea530af50ff 100755 (executable)
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_profile REQUIRED ecore ecore-file evas elementary utilX appcore-common appcore-efl haptic ui-gadget-1 capi-appfw-application vconf capi-media-player capi-media-sound-manager dlog svi devman capi-system-device feedback)
+pkg_check_modules(pkgs_profile REQUIRED ecore ecore-file evas elementary capi-ui-efl-util appcore-common appcore-efl haptic ui-gadget-1 capi-appfw-application vconf capi-media-player capi-media-sound-manager dlog svi devman capi-system-device feedback)
 
 FOREACH(flag ${pkgs_profile_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-profile/src/setting-profile.c b/setting-profile/src/setting-profile.c
index 62abb44f63413bf1c70f470871f9fdd96fc0798a..c903d5b8530c6e8986468bdadac313339684afcb 100755 (executable)
--- a/setting-profile/src/setting-profile.c
+++ b/setting-profile/src/setting-profile.c
@@ -18,7 +18,7 @@
 #include <setting-profile.h>
 #include <haptic.h>
 
-#include <utilX.h>
+#include <efl_util.h>
 
 #ifdef HAVE_ECORE_X
 #include <Ecore_X.h>
@@ -418,21 +418,16 @@ int setting_profile_unlisten_vconf_change(void *data)
 void __setting_profile_ug_key_grab(SettingProfileUG *ad)
 {
        SETTING_TRACE_BEGIN;
-       Ecore_X_Window xwin = 0;
-       Ecore_X_Display *disp = NULL;
 
        int ret = 0;
 
        if(ad == NULL)
                return;
 
-       disp = ecore_x_display_get();
-       xwin = elm_win_xwindow_get((Evas_Object*)ug_get_window());
-
-       ret = utilx_grab_key(disp, xwin, KEY_VOLUMEUP, TOP_POSITION_GRAB);
+       ret = efl_util_grab_key(ug_get_window(), KEY_VOLUMEUP, TOP_POSITION_GRAB);
        if(ret)
                return;
-       ret = utilx_grab_key(disp, xwin, KEY_VOLUMEDOWN, TOP_POSITION_GRAB);
+       ret = utilx_grab_key(ug_get_window(), KEY_VOLUMEDOWN, TOP_POSITION_GRAB);
        if(ret)
                return;
 
@@ -442,21 +437,16 @@ void __setting_profile_ug_key_grab(SettingProfileUG *ad)
 void __setting_profile_ug_key_ungrab(SettingProfileUG *ad)
 {
        SETTING_TRACE_BEGIN;
-       Ecore_X_Window xwin = 0;
-       Ecore_X_Display *disp = NULL;
 
        int ret = 0;
 
        if(ad == NULL)
                return;
 
-       disp = ecore_x_display_get();
-       xwin = elm_win_xwindow_get((Evas_Object*)ug_get_window());
-
-       ret = utilx_ungrab_key(disp, xwin, KEY_VOLUMEUP);
+       ret = efl_util_ungrab_key(ug_get_window(), KEY_VOLUMEUP);
        if(ret)
                return;
-       ret = utilx_ungrab_key(disp, xwin, KEY_VOLUMEDOWN);
+       ret = efl_util_ungrab_key(ug_get_window(), KEY_VOLUMEDOWN);
        if(ret)
                return;
 

diff --git a/setting-reset/CMakeLists.txt b/setting-reset/CMakeLists.txt
index e0a4d5d75d5d281bc68e01c09e573f8587a67f70..da15c26c0ba362aa59568351d2bb0e2f4b1c4e32 100644 (file)
--- a/setting-reset/CMakeLists.txt
+++ b/setting-reset/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_reset REQUIRED evas ecore elementary appcore-common appcore-efl tapi json-glib-1.0 ui-gadget-1 capi-appfw-application mm-sound dlog sysman)
+pkg_check_modules(pkgs_reset REQUIRED capi-ui-efl-util evas ecore elementary appcore-common appcore-efl tapi json-glib-1.0 ui-gadget-1 capi-appfw-application mm-sound dlog sysman)
 
 FOREACH(flag ${pkgs_reset_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c
index 31ac049c9ac6ff9d83a77fd1294461e02912e794..3497ebd270cf3d82b80de91a12b4795a4df7249c 100755 (executable)
--- a/setting-reset/src/setting-reset-settings.c
+++ b/setting-reset/src/setting-reset-settings.c
@@ -17,7 +17,7 @@
 #include <setting-cfg.h>
 #include <setting-reset-settings.h>
 #include <Ecore_X.h>
-#include <utilX.h>
+#include <efl_util.h>
 
 #define RESULT_FONT_SIZE 28//18
 #define ITEM_NAME_FONT_SIZE 35//22
@@ -94,9 +94,7 @@ static void __processing_popup_response_cb(void *data, Evas_Object *obj,
        ad->notify= NULL;
 
        // key ungrab: after showing the result popup
-       Ecore_X_Display *disp = ecore_x_display_get();
-       Ecore_X_Window xwin = elm_win_xwindow_get((Evas_Object*)ug_get_window());
-       int ret = utilx_ungrab_key(disp, xwin, KEY_HOME);
+       int ret = efl_util_ungrab_key(ug_get_window(), KEY_HOME);
        if (ret) {
                SETTING_TRACE_ERROR("KEY_HOME ungrab error ret[%d]", ret);
        }
@@ -215,9 +213,7 @@ void __reset_all_button_cb(void *data, Evas_Object *obj, void *event_info)
        }
 
        // key grab: before showing processing popup
-       Ecore_X_Display *disp = ecore_x_display_get();
-       Ecore_X_Window xwin = elm_win_xwindow_get((Evas_Object*)ug_get_window());
-       ret = utilx_grab_key(disp, xwin, KEY_HOME, TOP_POSITION_GRAB);
+       ret = efl_util_grab_key(ug_get_window(), KEY_HOME, TOP_POSITION_GRAB);
        if (ret) {
                SETTING_TRACE_ERROR("KEY_HOME grab error ret[%d]", ret);
        }

diff --git a/setting-security/CMakeLists.txt b/setting-security/CMakeLists.txt
index dc5e96f7fd1f0c86517cae08912f6c5ca12947ba..b3a0432d5bdf187ccde5b48b14c77f15ddda74f1 100755 (executable)
--- a/setting-security/CMakeLists.txt
+++ b/setting-security/CMakeLists.txt
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_security REQUIRED ecore evas elementary tapi dlog
-ui-gadget-1 capi-appfw-application appcore-common ail utilX pkgmgr-info)
+ui-gadget-1 capi-appfw-application appcore-common ail capi-ui-efl-util pkgmgr-info)
 
 FOREACH(flag ${pkgs_security_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8039a3e5495a6c9c5f42a47db34c137df1b229a2..d6e056e83f00c04b0cafdb987876dc3834821341 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ pkg_check_modules(pkgs_main REQUIRED
                                          glib-2.0 gthread-2.0 elementary
                                          appcore-common appcore-efl
                                          tapi
-                                         utilX
+                                         capi-ui-efl-util
                                          dlog json-glib-1.0
                                          ui-gadget-1
                                          capi-appfw-application aul