summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJengHyun Kang <jhyuni.kang@samsung.com>2017-12-12 15:49:47 +0900
committerJengHyun Kang <jhyuni.kang@samsung.com>2017-12-12 15:49:47 +0900
commite11f2a0c2799d18109efe0b3ae845ea71072b07f (patch)
tree29ac5b786cfa8546aa45e15a33333c9ce4557b4f
parentd9905cb9c710fb2d9687d5b6745ca071285455c1 (diff)
downloadefl-util-sandbox/upgrade/efl120.tar.gz
efl-util-sandbox/upgrade/efl120.tar.bz2
efl-util-sandbox/upgrade/efl120.zip
change a method to get displaysandbox/upgrade/efl120
Change-Id: I6751c27c1038472404eb1760dc755f7bb2a606fc
-rw-r--r--src/efl_util.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/efl_util.c b/src/efl_util.c
index a689bb7..f6e14db 100644
--- a/src/efl_util.c
+++ b/src/efl_util.c
@@ -420,7 +420,7 @@ _wl_init(void)
ecore_wl2_init();
- _eflutil.wl.wl2_display = ecore_wl2_connected_display_get(NULL);
+ _eflutil.wl.wl2_display = ecore_wl2_display_connect(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);
@@ -642,7 +642,7 @@ _cb_info_find_by_wlsurf(void *wlsurf,
l = _cb_info_list_get(idx);
EINA_LIST_FOREACH(l, ll, info)
{
- wlwin2 = elm_win_wl_window_get(info->win);
+ wlwin2 = (Ecore_Wl2_Window *)elm_win_wl_window_get(info->win);
wlsurf2 = ecore_wl2_window_surface_get(wlwin2);
if (wlsurf== wlsurf2) return info;
}
@@ -817,7 +817,7 @@ efl_util_set_notification_window_level(Evas_Object *window,
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
type = elm_win_type_get(window);
@@ -907,7 +907,7 @@ efl_util_get_notification_window_level(Evas_Object *window,
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
type = elm_win_type_get(window);
@@ -1030,7 +1030,7 @@ efl_util_set_window_opaque_state(Evas_Object *window,
EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.policy.proto, EFL_UTIL_ERROR_INVALID_PARAMETER);
}
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin)
return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
@@ -1060,7 +1060,7 @@ efl_util_set_window_screen_mode(Evas_Object *window,
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (wlwin)
{
while (!_eflutil.wl.policy.proto)
@@ -1138,7 +1138,7 @@ efl_util_get_window_screen_mode(Evas_Object *window,
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (wlwin)
{
while (!_eflutil.wl.policy.proto)
@@ -1239,7 +1239,7 @@ efl_util_set_window_brightness(Evas_Object *window, int brightness)
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (wlwin)
{
while (!_eflutil.wl.display_policy.proto)
@@ -1315,7 +1315,7 @@ efl_util_get_window_brightness(Evas_Object *window, int *brightness)
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
while (!_eflutil.wl.display_policy.proto)
@@ -2825,7 +2825,7 @@ efl_util_gesture_select(efl_util_gesture_h gesture_h, Evas_Object *window, efl_u
if (base_data->type != TIZEN_GESTURE_TYPE_PALM_COVER)
return EFL_UTIL_ERROR_NOT_SUPPORTED;
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
surface = ecore_wl2_window_surface_get(wlwin);
@@ -2861,7 +2861,7 @@ efl_util_gesture_deselect(efl_util_gesture_h gesture_h, Evas_Object *window, efl
if (base_data->type != TIZEN_GESTURE_TYPE_PALM_COVER)
return EFL_UTIL_ERROR_NOT_SUPPORTED;
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
surface = ecore_wl2_window_surface_get(wlwin);
@@ -2913,7 +2913,7 @@ efl_util_gesture_activate_set_on_window(efl_util_gesture_h gesture_h, Evas_Objec
EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
EINA_SAFETY_ON_TRUE_RETURN_VAL(type == EFL_UTIL_GESTURE_TYPE_NONE, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
surface = ecore_wl2_window_surface_get(wlwin);