From: hyunho Date: Wed, 10 Jan 2018 10:03:24 +0000 (+0900) Subject: EFL_UPGRADE: remove ecore-wayland dependency X-Git-Tag: submit/tizen/20180319.053649~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5f9ccd5f6cb7481359f9fb68ecb0c41d6092bad;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git EFL_UPGRADE: remove ecore-wayland dependency Change-Id: I2caf5eed5b27b2e5185ea07cc8b19789886badcc Signed-off-by: hyunho --- diff --git a/packaging/libwidget_viewer.spec b/packaging/libwidget_viewer.spec index 09406cff..ec53e9bd 100644 --- a/packaging/libwidget_viewer.spec +++ b/packaging/libwidget_viewer.spec @@ -30,7 +30,7 @@ BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(appsvc) -BuildRequires: pkgconfig(ecore-wayland) +BuildRequires: pkgconfig(ecore-wl2) BuildRequires: pkgconfig(wayland-tbm-client) BuildRequires: pkgconfig(screen_connector_watcher) BuildRequires: pkgconfig(screen_connector_watcher_evas) @@ -53,6 +53,7 @@ cp %{SOURCE1003} . cp %{SOURCE1004} . %build +export CFLAGS+=" -DEFL_BETA_API_SUPPORT " MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %cmake -DWIDGET_ENABLED=On \ -DTZ_SYS_SHARE=/usr/share \ diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt index 890cf4bb..ee32abe5 100644 --- a/tool/CMakeLists.txt +++ b/tool/CMakeLists.txt @@ -13,7 +13,7 @@ SET(WIDGET_MGR_PKG_CHECK_MODULES elementary screen_connector_watcher_evas wayland-tbm-client - ecore-wayland + ecore-wl2 tizen-remote-surface-client) PKG_CHECK_MODULES(WIDGET_MGR_PKGS REQUIRED ${WIDGET_MGR_PKG_CHECK_MODULES}) diff --git a/watch-control/src/control.c b/watch-control/src/control.c index b4a7fd00..a1f408bd 100755 --- a/watch-control/src/control.c +++ b/watch-control/src/control.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #define API __attribute__((visibility("default"))) @@ -238,10 +238,12 @@ static void __manual_render_finish(void) static Eina_Bool __iconify_state_changed(void *data, int type, void *event) { - Ecore_Wl_Event_Window_Iconify_State_Change *ev = - (Ecore_Wl_Event_Window_Iconify_State_Change *)event; + Ecore_Wl2_Event_Window_Iconify_State_Change *ev = + (Ecore_Wl2_Event_Window_Iconify_State_Change *)event; + Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(__win)); - if(ev->win != ecore_wl_window_id_get(elm_win_wl_window_get(__win))) + if(ev->win != + ecore_wl2_window_id_get(ecore_evas_wayland2_window_get(ee))) return ECORE_CALLBACK_PASS_ON; LOGI("Iconify state changed, win(%d) is %s", @@ -338,7 +340,7 @@ static int __watch_viewer_init(Evas_Object *win) __win_resized(NULL, NULL, win, NULL); /* init */ evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, __win_resized, NULL); - ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_ICONIFY_STATE_CHANGE, + ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE, __iconify_state_changed, NULL); __manual_render = false; __watch_viewer_initialized = 1; diff --git a/widget_viewer_evas/src/widget_viewer_evas.c b/widget_viewer_evas/src/widget_viewer_evas.c index c7c28ef3..a9290a3a 100644 --- a/widget_viewer_evas/src/widget_viewer_evas.c +++ b/widget_viewer_evas/src/widget_viewer_evas.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -45,6 +45,11 @@ #include #include +#ifdef API +#undef API +#endif +#define API __attribute__((visibility("default"))) + #if defined(LOG_TAG) #undef LOG_TAG #endif @@ -807,7 +812,7 @@ static void __flush_event_queue(struct widget_info *info) info->event_queue = NULL; } -EAPI int widget_viewer_evas_init(Evas_Object *win) +API int widget_viewer_evas_init(Evas_Object *win) { char app_id[255]; @@ -853,7 +858,7 @@ EAPI int widget_viewer_evas_init(Evas_Object *win) return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_fini(void) +API int widget_viewer_evas_fini(void) { if (!__is_widget_feature_enabled()) return WIDGET_ERROR_NOT_SUPPORTED; @@ -881,7 +886,7 @@ EAPI int widget_viewer_evas_fini(void) return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_notify_resumed_status_of_viewer(void) +API int widget_viewer_evas_notify_resumed_status_of_viewer(void) { GHashTableIter iter; gpointer key, value; @@ -940,7 +945,7 @@ EAPI int widget_viewer_evas_notify_resumed_status_of_viewer(void) return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_notify_paused_status_of_viewer(void) +API int widget_viewer_evas_notify_paused_status_of_viewer(void) { GHashTableIter iter; gpointer key, value; @@ -979,7 +984,7 @@ EAPI int widget_viewer_evas_notify_paused_status_of_viewer(void) return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_notify_orientation_of_viewer(int orientation) +API int widget_viewer_evas_notify_orientation_of_viewer(int orientation) { if (!__is_widget_feature_enabled()) return WIDGET_ERROR_NOT_SUPPORTED; @@ -1125,14 +1130,16 @@ static void __resize_cb(void *data, Evas *e, Evas_Object *layout, void *event_in static bool __obj_is_visible(Evas_Object *layout) { int x, y, w, h; - Ecore_Wl_Window *window = NULL; + Ecore_Wl2_Window *window = NULL; int window_x, window_y, window_w, window_h; int rotation; + Ecore_Evas *ee = ecore_evas_ecore_evas_get( + evas_object_evas_get(s_info.win)); - window = elm_win_wl_window_get(s_info.win); - ecore_wl_window_geometry_get(window, &window_x, &window_y, &window_w, &window_h); + window = ecore_evas_wayland2_window_get(ee); + ecore_wl2_window_geometry_get(window, &window_x, &window_y, &window_w, &window_h); evas_object_geometry_get(layout, &x, &y, &w, &h); - rotation = ecore_wl_window_rotation_get(window); + rotation = ecore_wl2_window_rotation_get(window); if (x >= 0 && x < window_w && y >= 0 && y < window_h && @@ -1283,7 +1290,7 @@ out: return NULL; } -EAPI Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char *widget_id, const char *content_info, double period) +API Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char *widget_id, const char *content_info, double period) { char *instance_id = NULL; struct widget_info *widget_instance_info = NULL; @@ -1389,7 +1396,7 @@ EAPI Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char return widget_instance_info->layout; } -EAPI int widget_viewer_evas_set_option(widget_evas_conf_e type, int value) +API int widget_viewer_evas_set_option(widget_evas_conf_e type, int value) { if (!__is_widget_feature_enabled()) return WIDGET_ERROR_NOT_SUPPORTED; @@ -1420,7 +1427,7 @@ EAPI int widget_viewer_evas_set_option(widget_evas_conf_e type, int value) return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_pause_widget(Evas_Object *widget) +API int widget_viewer_evas_pause_widget(Evas_Object *widget) { struct widget_info *info; struct pending_item *item; @@ -1467,7 +1474,7 @@ EAPI int widget_viewer_evas_pause_widget(Evas_Object *widget) return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_resume_widget(Evas_Object *widget) +API int widget_viewer_evas_resume_widget(Evas_Object *widget) { struct widget_info *info; struct pending_item *item; @@ -1514,7 +1521,7 @@ EAPI int widget_viewer_evas_resume_widget(Evas_Object *widget) return WIDGET_ERROR_NONE; } -EAPI const char *widget_viewer_evas_get_content_info(Evas_Object *widget) +API const char *widget_viewer_evas_get_content_info(Evas_Object *widget) { struct widget_info *info; @@ -1551,7 +1558,7 @@ EAPI const char *widget_viewer_evas_get_content_info(Evas_Object *widget) return (const char*)info->content_info; } -EAPI const char *widget_viewer_evas_get_title_string(Evas_Object *widget) +API const char *widget_viewer_evas_get_title_string(Evas_Object *widget) { const char *title = NULL; struct widget_info *info; @@ -1594,7 +1601,7 @@ EAPI const char *widget_viewer_evas_get_title_string(Evas_Object *widget) return title; } -EAPI const char *widget_viewer_evas_get_widget_id(Evas_Object *widget) +API const char *widget_viewer_evas_get_widget_id(Evas_Object *widget) { struct widget_info *info; @@ -1629,7 +1636,7 @@ EAPI const char *widget_viewer_evas_get_widget_id(Evas_Object *widget) return info->widget_id; } -EAPI double widget_viewer_evas_get_period(Evas_Object *widget) +API double widget_viewer_evas_get_period(Evas_Object *widget) { struct widget_info *info; @@ -1664,7 +1671,7 @@ EAPI double widget_viewer_evas_get_period(Evas_Object *widget) return info->period; } -EAPI void widget_viewer_evas_cancel_click_event(Evas_Object *widget) +API void widget_viewer_evas_cancel_click_event(Evas_Object *widget) { Evas_Object *remote_obj; struct widget_info *info; @@ -1713,7 +1720,7 @@ EAPI void widget_viewer_evas_cancel_click_event(Evas_Object *widget) return; } -EAPI int widget_viewer_evas_feed_mouse_up_event(Evas_Object *widget) +API int widget_viewer_evas_feed_mouse_up_event(Evas_Object *widget) { Evas_Object *remote_obj; struct widget_info *info; @@ -1759,7 +1766,7 @@ EAPI int widget_viewer_evas_feed_mouse_up_event(Evas_Object *widget) * But if this function is called, the preview image will not be displayed. * Only the help text will be there. if it is not disabled of course. */ -EAPI void widget_viewer_evas_disable_preview(Evas_Object *widget) +API void widget_viewer_evas_disable_preview(Evas_Object *widget) { struct widget_info *info; @@ -1804,7 +1811,7 @@ EAPI void widget_viewer_evas_disable_preview(Evas_Object *widget) * But if this function is called, the text help message will not be displayed. * Only the preview image will be there. if it is not disabled of course. */ -EAPI void widget_viewer_evas_disable_overlay_text(Evas_Object *widget) +API void widget_viewer_evas_disable_overlay_text(Evas_Object *widget) { struct widget_info *info; @@ -1848,7 +1855,7 @@ EAPI void widget_viewer_evas_disable_overlay_text(Evas_Object *widget) * If this function is called, the widget object will not display "preview" image. * Instead of it, the widget content object will be displayed immediately. */ -EAPI void widget_viewer_evas_disable_loading(Evas_Object *widget) +API void widget_viewer_evas_disable_loading(Evas_Object *widget) { struct widget_info *info; @@ -1886,7 +1893,7 @@ EAPI void widget_viewer_evas_disable_loading(Evas_Object *widget) return; } -EAPI void widget_viewer_evas_activate_faulted_widget(Evas_Object *widget) +API void widget_viewer_evas_activate_faulted_widget(Evas_Object *widget) { struct widget_info *info; screen_connector_toolkit_evas_ops ops; @@ -1971,7 +1978,7 @@ EAPI void widget_viewer_evas_activate_faulted_widget(Evas_Object *widget) return; } -EAPI bool widget_viewer_evas_is_faulted(Evas_Object *widget) +API bool widget_viewer_evas_is_faulted(Evas_Object *widget) { struct widget_info *info; @@ -2008,7 +2015,7 @@ EAPI bool widget_viewer_evas_is_faulted(Evas_Object *widget) return info->is_faulted; } -EAPI int widget_viewer_evas_freeze_visibility(Evas_Object *widget, widget_visibility_status_e status) +API int widget_viewer_evas_freeze_visibility(Evas_Object *widget, widget_visibility_status_e status) { struct widget_info *info; int ret = 0; @@ -2067,7 +2074,7 @@ EAPI int widget_viewer_evas_freeze_visibility(Evas_Object *widget, widget_visibi return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_thaw_visibility(Evas_Object *widget) +API int widget_viewer_evas_thaw_visibility(Evas_Object *widget) { struct widget_info *info; Evas_Object *tbm_obj; @@ -2108,7 +2115,7 @@ EAPI int widget_viewer_evas_thaw_visibility(Evas_Object *widget) return WIDGET_ERROR_NONE; } -EAPI bool widget_viewer_evas_is_visibility_frozen(Evas_Object *widget) +API bool widget_viewer_evas_is_visibility_frozen(Evas_Object *widget) { struct widget_info *info; @@ -2148,7 +2155,7 @@ EAPI bool widget_viewer_evas_is_visibility_frozen(Evas_Object *widget) return false; } -EAPI bool widget_viewer_evas_is_widget(Evas_Object *widget) +API bool widget_viewer_evas_is_widget(Evas_Object *widget) { struct widget_info *info; @@ -2185,7 +2192,7 @@ EAPI bool widget_viewer_evas_is_widget(Evas_Object *widget) return true; } -EAPI void widget_viewer_evas_set_permanent_delete(Evas_Object *widget, int flag) +API void widget_viewer_evas_set_permanent_delete(Evas_Object *widget, int flag) { struct widget_info *info; @@ -2223,7 +2230,7 @@ EAPI void widget_viewer_evas_set_permanent_delete(Evas_Object *widget, int flag) return; } -EAPI const char *widget_viewer_evas_get_widget_instance_id(Evas_Object *widget) +API const char *widget_viewer_evas_get_widget_instance_id(Evas_Object *widget) { struct widget_info *info; @@ -2260,7 +2267,7 @@ EAPI const char *widget_viewer_evas_get_widget_instance_id(Evas_Object *widget) return (const char *)info->instance_id; } -EAPI int widget_viewer_evas_set_delayed_resuming_time(int time) +API int widget_viewer_evas_set_delayed_resuming_time(int time) { if (time < 0 || time > 10000) return WIDGET_ERROR_INVALID_PARAMETER; @@ -2272,7 +2279,7 @@ EAPI int widget_viewer_evas_set_delayed_resuming_time(int time) return WIDGET_ERROR_NONE; } -EAPI int widget_viewer_evas_launch_setup_app(Evas_Object *widget) +API int widget_viewer_evas_launch_setup_app(Evas_Object *widget) { char *setup_appid; const char *widget_id;