X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fwidget_app.c;h=e25fdd126de09ba3ca61f3759b1f7bd270d34058;hb=fcbfa76f54caaff86e2ff9648d420f1338854af8;hp=2128f0b0bbfb155e5beaa0e1ccbe8ae1c55a7c92;hpb=94e629734622f169fd471ab4f5545235ffffc784;p=platform%2Fcore%2Fappfw%2Fappcore-widget.git diff --git a/src/widget_app.c b/src/widget_app.c index 2128f0b..e25fdd1 100755 --- a/src/widget_app.c +++ b/src/widget_app.c @@ -16,6 +16,7 @@ #include +#include #include #include @@ -36,6 +37,7 @@ #include #include #include +#include #include "widget_app.h" #include "widget-log.h" @@ -49,6 +51,9 @@ #define STR_MAX_BUF 128 #define LOG_TAG "CAPI_WIDGET_APPLICATION" #define K_REASON "__WC_K_REASON__" +#define APP_TYPE_WIDGET "widgetapp" +#define STATUS_FOREGROUND "fg" +#define STATUS_BACKGROUND "bg" typedef enum _widget_obj_state_e { WC_READY = 0, @@ -84,6 +89,8 @@ static void *app_user_data; static char *appid; static widget_class_h class_provider; static int exit_called; +static char *package_id; +static bool fg_signal; static void _widget_core_set_appcore_event_cb(void); static void _widget_core_unset_appcore_event_cb(void); @@ -147,6 +154,28 @@ static widget_context_s *__find_context_by_id(const char *id) return ret->data; } +static gint __comp_by_state(gconstpointer a, gconstpointer b) +{ + widget_context_s *wc = (widget_context_s *)a; + + if (wc->state == (widget_obj_state_e)GPOINTER_TO_INT(b)) + return 0; + + return -1; +} + +static widget_context_s *__find_context_by_state(widget_obj_state_e state) +{ + GList *ret; + GList *contexts = _widget_app_get_contexts(); + + ret = g_list_find_custom(contexts, GINT_TO_POINTER((int)state), __comp_by_state); + if (ret == NULL) + return NULL; + + return ret->data; +} + static gint __comp_by_win(gconstpointer a, gconstpointer b) { int win = GPOINTER_TO_INT(b); @@ -170,6 +199,7 @@ static int __send_lifecycle_event(const char *class_id, const char *instance_id, int status) { bundle *b = bundle_create(); + char pkgid[256] = {0, }; int ret; if (b == NULL) { @@ -177,9 +207,17 @@ static int __send_lifecycle_event(const char *class_id, const char *instance_id, return -1; /* LCOV_EXCL_LINE */ } + if (package_id == NULL) { + ret = aul_app_get_pkgid_bypid(getpid(), pkgid, sizeof(pkgid)); + if (ret == 0) + package_id = strdup(pkgid); + } + bundle_add_str(b, AUL_K_WIDGET_ID, class_id); bundle_add_str(b, AUL_K_WIDGET_INSTANCE_ID, instance_id); bundle_add_byte(b, AUL_K_WIDGET_STATUS, &status, sizeof(int)); + if (package_id) + bundle_add_str(b, AUL_K_PKGID, package_id); _D("send lifecycle %s(%d)", instance_id, status); ret = aul_app_com_send("widget.status", b); @@ -272,6 +310,15 @@ static int __instance_resume(widget_class_h handle, const char *id, int send_upd if (send_update) { ret = __send_update_status(handle->classid, wc->id, WIDGET_INSTANCE_EVENT_RESUME, NULL); + if (!fg_signal) { + _D("Send fg signal to resourceD"); + aul_send_app_status_change_signal(getpid(), + appid, + package_id, + STATUS_FOREGROUND, + APP_TYPE_WIDGET); + fg_signal = true; + } } else { ret = 0; } @@ -307,6 +354,16 @@ static int __instance_pause(widget_class_h handle, const char *id, int send_upda if (send_update) { ret = __send_update_status(handle->classid, wc->id, WIDGET_INSTANCE_EVENT_PAUSE, NULL); + wc = __find_context_by_state(WC_RUNNING); + if (!wc && fg_signal) { + _D("Send bg signal to resourceD"); + aul_send_app_status_change_signal(getpid(), + appid, + package_id, + STATUS_BACKGROUND, + APP_TYPE_WIDGET); + fg_signal = false; + } } else { ret = 0; } @@ -398,11 +455,13 @@ static int __instance_create(widget_class_h handle, const char *id, const char * bundle *content_info = NULL; wc = (widget_context_s *)calloc(1, sizeof(widget_context_s)); - if (!wc) + if (!wc) { + _E("Out of memory"); return WIDGET_ERROR_OUT_OF_MEMORY; + } wc->state = WC_READY; - wc->id = g_strdup(id); + wc->id = strdup(id); wc->provider = handle; wc->win = NULL; wc->win_id = -1; @@ -416,7 +475,18 @@ static int __instance_create(widget_class_h handle, const char *id, const char * ret = handle->ops.create(wc, content_info, w, h, handle->user_data); if (ret < 0) { - /* TODO send abort */ + _W("Create callback resturns error(%d)", ret); + ret = __send_update_status(handle->classid, wc->id, + WIDGET_INSTANCE_EVENT_CREATE_ABORTED, NULL); + _widget_app_remove_context(wc); + if (wc->id) + free(wc->id); + if (wc->content) + free(wc->content); + free(wc); + + if (_widget_app_get_contexts() == NULL && !exit_called) + widget_app_exit(); } else { ret = __send_update_status(handle->classid, wc->id, WIDGET_INSTANCE_EVENT_CREATE, NULL); @@ -441,10 +511,10 @@ static int __instance_destroy(widget_class_h handle, const char *id, int event = WIDGET_INSTANCE_EVENT_TERMINATE; bundle *content_info; - if (!wc) { - _E("could not find widget obj: %s", id); /* LCOV_EXCL_LINE */ - return WIDGET_ERROR_INVALID_PARAMETER; /* LCOV_EXCL_LINE */ + _E("could not find widget obj: %s, clear amd info", id); /* LCOV_EXCL_LINE */ + aul_widget_instance_del(handle->classid, id); /* LCOV_EXCL_LINE */ + return WIDGET_ERROR_NONE; /* LCOV_EXCL_LINE */ } wc->state = WC_TERMINATED; @@ -458,13 +528,12 @@ static int __instance_destroy(widget_class_h handle, const char *id, if (reason == WIDGET_APP_DESTROY_TYPE_PERMANENT) { event = WIDGET_INSTANCE_EVENT_DESTROY; + aul_widget_instance_del(handle->classid, id); } else { ret = __send_update_status(handle->classid, id, WIDGET_INSTANCE_EVENT_EXTRA_UPDATED, content_info); } - aul_widget_instance_del(handle->classid, id); - if (content_info) bundle_free(content_info); @@ -614,6 +683,7 @@ static void __pause_all(int send_update) __instance_pause(cxt->provider, cxt->id, send_update); break; } + LOGD("pause %s", cxt->id); iter = g_list_next(iter); } } @@ -646,16 +716,15 @@ static void __destroy_all(int reason, int send_update) GList *iter = g_list_first(contexts); __pause_all(send_update); - while (iter != NULL) { widget_context_s *cxt = (widget_context_s *)iter->data; - + iter = g_list_next(iter); switch (cxt->state) { case WC_PAUSED: + LOGD("destroy %d : %s", cxt->state, cxt->id); __instance_destroy(cxt->provider, cxt->id, reason, send_update); break; } - iter = g_list_next(iter); } } @@ -750,6 +819,30 @@ static void __add_climsg() ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_CONFIGURE, __configure_cb, NULL); } +static void __get_content(bundle *b) +{ + char *instance_id = NULL; + widget_context_s *cxt = NULL; + + bundle_get_str(b, AUL_K_WIDGET_INSTANCE_ID, &instance_id); + if (!instance_id) + return; + + cxt = __find_context_by_id(instance_id); + if (!cxt) { + _E("can not find instance id:%s", instance_id); + return; + } + + if (cxt->content) { + bundle_add_str(b, AUL_K_WIDGET_CONTENT_INFO, cxt->content); + _D("content info of %s found", cxt->id); + } else { + bundle_add_str(b, AUL_K_WIDGET_CONTENT_INFO, ""); + _D("empty content info added"); + } +} + static int __aul_handler(aul_type type, bundle *b, void *data) { char *caller = NULL; @@ -776,6 +869,9 @@ static int __aul_handler(aul_type type, bundle *b, void *data) case AUL_TERMINATE: widget_app_exit(); break; + case AUL_WIDGET_CONTENT: + __get_content(b); + break; default: break; } @@ -831,8 +927,6 @@ static int __before_loop(int argc, char **argv) { int r; bundle *kb = NULL; - char *wayland_display = NULL; - char *xdg_runtime_dir = NULL; char *name; char *viewer_endpoint = NULL; @@ -842,8 +936,6 @@ static int __before_loop(int argc, char **argv) kb = bundle_import_from_argv(argc, argv); if (kb) { - bundle_get_str(kb, AUL_K_WAYLAND_WORKING_DIR, &xdg_runtime_dir); - bundle_get_str(kb, AUL_K_WAYLAND_DISPLAY, &wayland_display); bundle_get_str(kb, WIDGET_K_ENDPOINT, &viewer_endpoint); if (viewer_endpoint) { _E("viewer endpoint :%s", viewer_endpoint); @@ -852,22 +944,13 @@ static int __before_loop(int argc, char **argv) _E("endpoint is missing"); } - if (xdg_runtime_dir) - setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1); - - _D("xdg_runtime_dir:%s", xdg_runtime_dir); - - if (wayland_display) - setenv("WAYLAND_DISPLAY", wayland_display, 1); - - _D("wayland_display:%s", wayland_display); - bundle_free(kb); kb = NULL; } else { _E("failed to get launch argv"); /* LCOV_EXCL_LINE */ } + screen_connector_provider_init(); elm_init(argc, argv); r = aul_launch_init(__aul_handler, NULL); @@ -938,9 +1021,22 @@ static void __after_loop() if (app_ops->terminate) app_ops->terminate(app_user_data); + screen_connector_provider_fini(); + _widget_app_free_viewer_endpoint(); _widget_core_unset_appcore_event_cb(); __free_handler_list(); + + if (package_id) { + free(package_id); + package_id = NULL; + } + + if (appid) { + free(appid); + appid = NULL; + } + elm_shutdown(); } @@ -1113,12 +1209,16 @@ EXPORT_API int widget_app_main(int argc, char **argv, __FUNCTION__, "widget_app_create_cb() callback must be " "registered"); - app_ops = callback; app_user_data = user_data; r = __before_loop(argc, argv); - if (r < 0) + if (r < 0) { + if (appid) { + free(appid); + appid = NULL; + } return r; + } ecore_main_loop_begin(); aul_status_update(STATUS_DYING); @@ -1314,12 +1414,23 @@ EXPORT_API const char *widget_app_get_id(widget_context_h context) return context->id; } +static void _win_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + /* Remove data used in accessibility */ + char *plug_id; + plug_id = evas_object_data_del(obj, "___PLUGID"); + free(plug_id); +} + EXPORT_API int widget_app_get_elm_win(widget_context_h context, Evas_Object **win) { widget_context_s *cxt = (widget_context_s *)context; Evas_Object *ret_win; Ecore_Wl_Window *wl_win; + struct wl_surface *surface; + char buffer[256]; + int rots[3] = {0}; if (!_is_widget_feature_enabled()) { _E("not supported"); /* LCOV_EXCL_LINE */ @@ -1333,25 +1444,47 @@ EXPORT_API int widget_app_get_elm_win(widget_context_h context, ret_win = elm_win_add(NULL, cxt->id, ELM_WIN_BASIC); if (ret_win == NULL) { _E("failed to create window"); /* LCOV_EXCL_LINE */ - return WIDGET_ERROR_FAULT; /* LCOV_EXCL_LINE */ + goto fault; /* LCOV_EXCL_LINE */ } + elm_win_wm_rotation_preferred_rotation_set(ret_win, -1); + elm_win_wm_rotation_available_rotations_set(ret_win, rots, 1); + wl_win = elm_win_wl_window_get(ret_win); if (wl_win == NULL) { _E("failed to get wayland window"); /* LCOV_EXCL_LINE */ - evas_object_del(ret_win); /* LCOV_EXCL_LINE */ - return WIDGET_ERROR_FAULT; /* LCOV_EXCL_LINE */ + goto fault; + } + + surface = ecore_wl_window_surface_get(wl_win); + if (surface == NULL) { + _E("failed to get surface"); /* LCOV_EXCL_LINE */ + goto fault; /* LCOV_EXCL_LINE */ } + screen_connector_provider_remote_enable(cxt->id, surface); ecore_wl_window_class_name_set(wl_win, cxt->id); + elm_win_aux_hint_add(ret_win, "wm.policy.win.user.geometry", "1"); *win = ret_win; cxt->win = ret_win; cxt->win_id = ecore_wl_window_id_get(wl_win); + /* Set data to use in accessibility */ + snprintf(buffer, sizeof(buffer), "%s:%d", cxt->id, getpid()); + evas_object_data_set(ret_win, "___PLUGID", strdup(buffer)); + evas_object_event_callback_add(ret_win, EVAS_CALLBACK_DEL, _win_del_cb, NULL); + _D("window created: %d", cxt->win_id); return WIDGET_ERROR_NONE; + +fault: + if (ret_win) /* LCOV_EXCL_LINE */ + evas_object_del(ret_win); /* LCOV_EXCL_LINE */ + + return WIDGET_ERROR_FAULT; /* LCOV_EXCL_LINE */ + } widget_class_h _widget_class_create(widget_class_s *prev, const char *class_id, @@ -1474,6 +1607,7 @@ EXPORT_API int widget_app_context_set_content_info(widget_context_h context, else context->content = NULL; + free(raw); if (ret < 0) { /* LCOV_EXCL_START */ _E("failed to send content info: %s of %s (%d)", context->id,