Add component based type

Widget viewer has to deal with widget app and widget component.
So viewer use type that is expressed bellow.

SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET|SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED

Change-Id: Id1bfa74b18b7dec0fe6019a673eacc9bdbbc6469
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/tool/widget-mgr.c b/tool/widget-mgr.c
index b3293e26738b2053f74593e75ca0d5d8f7a92556..4fe602e2fc2af9b6e3a776a07bd48a7d8e134188 100644 (file)
--- a/tool/widget-mgr.c
+++ b/tool/widget-mgr.c
@@ -414,7 +414,8 @@ static int __cmd_dump_init(struct command_arg *arg)
        evas_object_show(win);
 
        screen_connector_toolkit_evas_init(win,
-                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET);
+                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET |
+                       SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED);
 
        return 0;
 }
@@ -433,7 +434,9 @@ static void __foreach_widget_info_list(gpointer data, gpointer user_data)
        ops.updated_cb = __screen_connector_toolkit_evas_updated_cb;
 
        handle = screen_connector_toolkit_evas_add_by_rid(&ops, info->surf,
-                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET, user_data);
+                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET |
+                       SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED,
+                       user_data);
        if (handle == NULL) {
                printf("Failed to add toolkit by rid(%u)", info->surf);
                return;
@@ -591,7 +594,9 @@ static int __cmd_dump_run(struct command_arg *arg)
 
 static void __cmd_dump_finish(struct command_arg *arg)
 {
-       screen_connector_toolkit_evas_fini(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET);
+       screen_connector_toolkit_evas_fini(
+                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET |
+                       SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED);
        evas_object_del(win);
        elm_shutdown();
 }

diff --git a/widget_viewer_evas/src/widget_viewer_evas.c b/widget_viewer_evas/src/widget_viewer_evas.c
index b06c091ffa18262f26f972efd4808bcde6f62601..696ca73e8b8fc30b1b28cec3e4cffab30e4c4f36 100644 (file)
--- a/widget_viewer_evas/src/widget_viewer_evas.c
+++ b/widget_viewer_evas/src/widget_viewer_evas.c
@@ -721,7 +721,8 @@ static void __launch_instance()
 
        info->toolkit_h = screen_connector_toolkit_evas_add(&ops,
                        info->instance_id,
-                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET,
+                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET |
+                       SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED,
                        info);
 
        __display_loading_text(info);
@@ -1162,7 +1163,9 @@ API int widget_viewer_evas_init(Evas_Object *win)
 
        s_info.win = win;
 
-       screen_connector_toolkit_evas_init(win, SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET);
+       screen_connector_toolkit_evas_init(win,
+                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET |
+                       SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED);
        screen_connector_toolkit_evas_start_visibility_notify();
 
        if (aul_app_get_appid_bypid(getpid(), app_id, sizeof(app_id)) != AUL_R_OK) {
@@ -1215,7 +1218,9 @@ API int widget_viewer_evas_fini(void)
        }
        pthread_mutex_unlock(&__mutex);
 
-       screen_connector_toolkit_evas_fini(SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET);
+       screen_connector_toolkit_evas_fini(
+                       SCREEN_CONNECTOR_SCREEN_TYPE_WIDGET |
+                       SCREEN_CONNECTOR_SCREEN_TYPE_COMPONENT_BASED);
        widget_instance_unlisten_event(__instance_event_cb);
        widget_instance_fini();