support ecore_wl2 insteads of ecore_wayland

Change-Id: Id48b50676c84d410e46b03c77d9b53ebf8029d5b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf31d63..90eda63 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES(${INC_DIR})
 # required dependencies
 SET(dependents "dlog elementary capi-base-common capi-system-info libdrm libtbm")
 
-SET(dependents "${dependents} ecore-wayland wayland-client wayland-tbm-client screenshooter-client tizen-extension-client")
+SET(dependents "${dependents} ecore-wl2 wayland-client wayland-tbm-client screenshooter-client tizen-extension-client")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents})

diff --git a/packaging/capi-ui-efl-util.spec b/packaging/capi-ui-efl-util.spec
index 3eecce5..b7c2712 100644 (file)
--- a/packaging/capi-ui-efl-util.spec
+++ b/packaging/capi-ui-efl-util.spec
@@ -13,7 +13,7 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-tbm-client)
 BuildRequires:  pkgconfig(screenshooter-client)
 BuildRequires:  pkgconfig(tizen-extension-client)
-BuildRequires:  pkgconfig(ecore-wayland)
+BuildRequires:  pkgconfig(ecore-wl2)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(capi-system-info)

diff --git a/src/efl_util.c b/src/efl_util.c
index aff5a0d..a689bb7 100644 (file)
--- a/src/efl_util.c
+++ b/src/efl_util.c
@@ -32,7 +32,7 @@
 #include <Ecore_Evas.h>
 #include <pthread.h>
 
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 #include <wayland-client.h>
 #include <wayland-tbm-client.h>
 #include <tizen-extension-client-protocol.h>
@@ -185,6 +185,7 @@ typedef struct _Efl_Util_Data
    struct
    {
       Eina_Bool init;
+      Ecore_Wl2_Display *wl2_display;
       struct wl_display *dpy;
       struct wl_event_queue *queue;
       int dpy_fd;
@@ -234,7 +235,7 @@ static Efl_Util_Data _eflutil =
 {
    {
       EINA_FALSE,
-      NULL, NULL,
+      NULL, NULL, NULL,
       -1, NULL,
       { NULL, NULL, NULL }, /* tizen_policy protocol */
       { NULL, NULL, NULL, NULL, NULL, 0 }, /* screenshooter protocol */
@@ -417,9 +418,11 @@ _wl_init(void)
 
    if (_eflutil.wl.init) return EINA_TRUE;
 
-   ecore_wl_init(NULL);
+   ecore_wl2_init();
 
-   _eflutil.wl.dpy = ecore_wl_display_get();
+   _eflutil.wl.wl2_display = ecore_wl2_connected_display_get(NULL);
+   EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.wl2_display, fail);
+   _eflutil.wl.dpy = ecore_wl2_display_get(_eflutil.wl.wl2_display);
    EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.dpy, fail);
 
    display_wrapper = wl_proxy_create_wrapper(_eflutil.wl.dpy);
@@ -450,7 +453,7 @@ fail:
         _eflutil.wl.queue = NULL;
      }
 
-   ecore_wl_shutdown();
+   ecore_wl2_shutdown();
    return EINA_FALSE;
 }
 
@@ -633,14 +636,14 @@ _cb_info_find_by_wlsurf(void *wlsurf,
 {
    Eina_List *l, *ll;
    Efl_Util_Callback_Info *info;
-   Ecore_Wl_Window *wlwin2 = NULL;
+   Ecore_Wl2_Window *wlwin2 = NULL;
    void *wlsurf2 = NULL;
 
    l = _cb_info_list_get(idx);
    EINA_LIST_FOREACH(l, ll, info)
      {
         wlwin2 = elm_win_wl_window_get(info->win);
-        wlsurf2 = ecore_wl_window_surface_get(wlwin2);
+        wlsurf2 = ecore_wl2_window_surface_get(wlwin2);
         if (wlsurf== wlsurf2) return info;
      }
 
@@ -806,10 +809,10 @@ efl_util_set_notification_window_level(Evas_Object *window,
      }
 
    Elm_Win_Type type;
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Lv_Info *lv_info;
-   Ecore_Wl_Window_Type wl_type;
+   Ecore_Wl2_Window_Type wl_type;
 
    res = _wl_init();
    EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
@@ -820,15 +823,15 @@ efl_util_set_notification_window_level(Evas_Object *window,
    type = elm_win_type_get(window);
    if (type != ELM_WIN_NOTIFICATION)
      {
-        wl_type = ecore_wl_window_type_get(wlwin);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL_WINDOW_TYPE_NOTIFICATION),
+        wl_type = ecore_wl2_window_type_get(wlwin);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL2_WINDOW_TYPE_NOTIFICATION),
                                         EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
      }
 
    while (!_eflutil.wl.policy.proto)
      wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
 
-   surface = ecore_wl_window_surface_get(wlwin);
+   surface = ecore_wl2_window_surface_get(wlwin);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                   EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
 
@@ -865,7 +868,7 @@ efl_util_set_notification_window_level(Evas_Object *window,
         int count = 0;
         while (lv_info->wait_for_done && (count < 3))
           {
-             ecore_wl_flush();
+             ecore_wl2_display_flush(_eflutil.wl.wl2_display);
              wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
              count++;
           }
@@ -896,10 +899,10 @@ efl_util_get_notification_window_level(Evas_Object *window,
    EINA_SAFETY_ON_NULL_RETURN_VAL(level, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
    Elm_Win_Type type;
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Lv_Info *lv_info;
-   Ecore_Wl_Window_Type wl_type;
+   Ecore_Wl2_Window_Type wl_type;
 
    res = _wl_init();
    EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
@@ -910,15 +913,15 @@ efl_util_get_notification_window_level(Evas_Object *window,
    type = elm_win_type_get(window);
    if (type != ELM_WIN_NOTIFICATION)
      {
-        wl_type = ecore_wl_window_type_get(wlwin);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL_WINDOW_TYPE_NOTIFICATION),
+        wl_type = ecore_wl2_window_type_get(wlwin);
+        EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL2_WINDOW_TYPE_NOTIFICATION),
                                         EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
      }
 
    while (!_eflutil.wl.policy.proto)
      wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
 
-   surface = ecore_wl_window_surface_get(wlwin);
+   surface = ecore_wl2_window_surface_get(wlwin);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                   EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
 
@@ -930,7 +933,7 @@ efl_util_get_notification_window_level(Evas_Object *window,
              int count = 0;
              while ((lv_info->wait_for_done) && (count < 3))
                {
-                  ecore_wl_flush();
+                  ecore_wl2_display_flush(_eflutil.wl.wl2_display);
                   wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
                   count++;
                }
@@ -1011,7 +1014,7 @@ efl_util_set_window_opaque_state(Evas_Object *window,
    EINA_SAFETY_ON_FALSE_RETURN_VAL(((opaque >= 0) && (opaque <= 1)),
                                    EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
 
    if (!_eflutil.wl.policy.proto)
@@ -1031,7 +1034,7 @@ efl_util_set_window_opaque_state(Evas_Object *window,
    if (!wlwin)
       return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
 
-   surface  = ecore_wl_window_surface_get(wlwin);
+   surface  = ecore_wl2_window_surface_get(wlwin);
    if (!surface)
       return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
 
@@ -1049,7 +1052,7 @@ efl_util_set_window_screen_mode(Evas_Object *window,
                                     (mode <= EFL_UTIL_SCREEN_MODE_ALWAYS_ON)),
                                    EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info;
    Eina_Bool res;
@@ -1063,7 +1066,7 @@ efl_util_set_window_screen_mode(Evas_Object *window,
         while (!_eflutil.wl.policy.proto)
           wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
 
-        surface = ecore_wl_window_surface_get(wlwin);
+        surface = ecore_wl2_window_surface_get(wlwin);
         EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                        EFL_UTIL_ERROR_INVALID_PARAMETER);
 
@@ -1096,7 +1099,7 @@ efl_util_set_window_screen_mode(Evas_Object *window,
              int count = 0;
              while (scr_mode_info->wait_for_done && (count < 3))
                {
-                  ecore_wl_flush();
+                  ecore_wl2_display_flush(_eflutil.wl.wl2_display);
                   wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
                   count++;
                }
@@ -1127,7 +1130,7 @@ efl_util_get_window_screen_mode(Evas_Object *window,
    EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
    EINA_SAFETY_ON_NULL_RETURN_VAL(mode, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info;
    Eina_Bool res;
@@ -1141,7 +1144,7 @@ efl_util_get_window_screen_mode(Evas_Object *window,
         while (!_eflutil.wl.policy.proto)
           wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
 
-        surface = ecore_wl_window_surface_get(wlwin);
+        surface = ecore_wl2_window_surface_get(wlwin);
         EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                        EFL_UTIL_ERROR_INVALID_PARAMETER);
 
@@ -1152,7 +1155,7 @@ efl_util_get_window_screen_mode(Evas_Object *window,
                {
                   while (scr_mode_info->wait_for_done)
                     {
-                       ecore_wl_flush();
+                       ecore_wl2_display_flush(_eflutil.wl.wl2_display);
                        wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
                     }
                }
@@ -1225,7 +1228,7 @@ efl_util_unset_window_screen_mode_error_cb(Evas_Object *window)
 API int
 efl_util_set_window_brightness(Evas_Object *window, int brightness)
 {
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Brightness_Info *brightness_info;
    Eina_Bool res;
@@ -1242,7 +1245,7 @@ efl_util_set_window_brightness(Evas_Object *window, int brightness)
         while (!_eflutil.wl.display_policy.proto)
           wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
 
-        surface = ecore_wl_window_surface_get(wlwin);
+        surface = ecore_wl2_window_surface_get(wlwin);
         EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                        EFL_UTIL_ERROR_INVALID_PARAMETER);
 
@@ -1275,7 +1278,7 @@ efl_util_set_window_brightness(Evas_Object *window, int brightness)
               int count = 0;
               while (brightness_info->wait_for_done && (count < 3))
                 {
-                   ecore_wl_flush();
+                   ecore_wl2_display_flush(_eflutil.wl.wl2_display);
                    wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
                    count++;
                 }
@@ -1301,7 +1304,7 @@ efl_util_set_window_brightness(Evas_Object *window, int brightness)
 API int
 efl_util_get_window_brightness(Evas_Object *window, int *brightness)
 {
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Brightness_Info *brightness_info;
    Eina_Bool res;
@@ -1318,7 +1321,7 @@ efl_util_get_window_brightness(Evas_Object *window, int *brightness)
    while (!_eflutil.wl.display_policy.proto)
      wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
 
-   surface = ecore_wl_window_surface_get(wlwin);
+   surface = ecore_wl2_window_surface_get(wlwin);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                   EFL_UTIL_ERROR_INVALID_PARAMETER);
 
@@ -1329,7 +1332,7 @@ efl_util_get_window_brightness(Evas_Object *window, int *brightness)
           {
              while (brightness_info->wait_for_done)
                {
-                  ecore_wl_flush();
+                  ecore_wl2_display_flush(_eflutil.wl.wl2_display);
                   wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
                }
           }
@@ -2808,7 +2811,7 @@ API int
 efl_util_gesture_select(efl_util_gesture_h gesture_h, Evas_Object *window, efl_util_gesture_data data)
 {
    Efl_Util_Gesture_Common_Grab_Data *base_data = NULL;
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    int ret;
 
@@ -2825,7 +2828,7 @@ efl_util_gesture_select(efl_util_gesture_h gesture_h, Evas_Object *window, efl_u
    wlwin = elm_win_wl_window_get(window);
    if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
 
-   surface = ecore_wl_window_surface_get(wlwin);
+   surface = ecore_wl2_window_surface_get(wlwin);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                   EFL_UTIL_ERROR_INVALID_PARAMETER);
 
@@ -2844,7 +2847,7 @@ API int
 efl_util_gesture_deselect(efl_util_gesture_h gesture_h, Evas_Object *window, efl_util_gesture_data data)
 {
    Efl_Util_Gesture_Common_Grab_Data *base_data = NULL;
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    int ret;
 
@@ -2861,7 +2864,7 @@ efl_util_gesture_deselect(efl_util_gesture_h gesture_h, Evas_Object *window, efl
    wlwin = elm_win_wl_window_get(window);
    if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
 
-   surface = ecore_wl_window_surface_get(wlwin);
+   surface = ecore_wl2_window_surface_get(wlwin);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                   EFL_UTIL_ERROR_INVALID_PARAMETER);
 
@@ -2901,7 +2904,7 @@ efl_util_gesture_activate_set(efl_util_gesture_h gesture_h, unsigned int type, E
 API int
 efl_util_gesture_activate_set_on_window(efl_util_gesture_h gesture_h, Evas_Object *window, unsigned int type, Eina_Bool active)
 {
-   Ecore_Wl_Window *wlwin;
+   Ecore_Wl2_Window *wlwin;
    struct wl_surface *surface;
    int ret;
 
@@ -2913,7 +2916,7 @@ efl_util_gesture_activate_set_on_window(efl_util_gesture_h gesture_h, Evas_Objec
    wlwin = elm_win_wl_window_get(window);
    if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
 
-   surface = ecore_wl_window_surface_get(wlwin);
+   surface = ecore_wl2_window_surface_get(wlwin);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                   EFL_UTIL_ERROR_INVALID_PARAMETER);