e_info: print topvwins gl available(with engine config)

and remove code not using

Change-Id: Ied52ca19a6bc3a75a2107dab08d8166ab075f9d0

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 4d23769541ff2e05b8495ed870c53e880c8a5bac..47f359df802153d669967c03cfcd2835f0d86fe0 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -17,6 +17,7 @@ typedef struct _E_Info_Client
    /* topvwins */
    int                use_gl, use_hwc, use_multi_layer, hwc, hwc_windows;
    int                use_buffer_flush, deiconify_approve;
+   int                config_engine;
    const char        *engine;
    Eina_List         *win_list;
 
@@ -500,9 +501,10 @@ _cb_vwindow_info_get(const Eldbus_Message *msg)
    res = eldbus_message_error_get(msg, &name, &text);
    EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, "iiiiisiia("VALUE_TYPE_FOR_TOPVWINS")",
+   res = eldbus_message_arguments_get(msg, "iiiiisiiia("VALUE_TYPE_FOR_TOPVWINS")",
                                       &e_info_client.use_gl, &e_info_client.use_hwc, &e_info_client.use_multi_layer,
-                                      &e_info_client.hwc, &e_info_client.hwc_windows, &engine,
+                                      &e_info_client.hwc, &e_info_client.hwc_windows,
+                                      &engine, &e_info_client.config_engine,
                                       &e_info_client.use_buffer_flush, &e_info_client.deiconify_approve,
                                       &array);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
@@ -988,13 +990,8 @@ _cb_vec_info_get(const Eldbus_Message *msg)
    res = eldbus_message_error_get(msg, &name, &text);
    EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, "iiiiisiia("VALUE_TYPE_FOR_TOPVWINS")",
-                                      &e_info_client.use_gl, &e_info_client.use_hwc, &e_info_client.use_multi_layer,
-                                      &e_info_client.hwc, &e_info_client.hwc_windows, &engine,
-                                      &e_info_client.use_buffer_flush, &e_info_client.deiconify_approve,
-                                      &array);
+   res = eldbus_message_arguments_get(msg, "a("VALUE_TYPE_FOR_TOPVWINS")", &array);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
-   e_info_client.engine = eina_stringshare_add(engine);
 
    _e_win_info_make_array(array);
 
@@ -1099,7 +1096,7 @@ _e_info_client_proc_topvwins_info(int argc, char **argv)
      goto ec_info;
 
    printf("GL :  %s\n", e_info_client.use_gl ? "on":"off");
-   printf("ENG:  %s\n", e_info_client.engine);
+   printf("ENG:  %s (config: %d)\n", e_info_client.engine, e_info_client.config_engine);
    if (e_info_client.use_hwc)
      {
         if (e_info_client.hwc)

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 29aa7dd64c7c369b097963daf78b55aab5b18553..1d35cb630f5331e47e2af8d20373e95adb9d3e3f 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -416,12 +416,13 @@ _e_info_server_cb_window_info_get(const Eldbus_Service_Interface *iface EINA_UNU
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
 
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->engine);
+   eldbus_message_iter_basic_append(iter, 'i', e_comp_gl_get());
    eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->hwc);
    eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->hwc_use_multi_plane);
    eldbus_message_iter_basic_append(iter, 'i', e_comp->hwc);
    eldbus_message_iter_basic_append(iter, 'i', _e_info_server_is_hwc_windows());
    eldbus_message_iter_basic_append(iter, 's', ecore_evas_engine_name_get(e_comp->ee));
+   eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->engine);
    eldbus_message_iter_basic_append(iter, 'i', e_config->use_buffer_flush);
    eldbus_message_iter_basic_append(iter, 'i', e_config->deiconify_approve);
 
@@ -437,15 +438,6 @@ _e_info_server_cb_ec_info_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
 
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->engine);
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->hwc);
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->hwc_use_multi_plane);
-   eldbus_message_iter_basic_append(iter, 'i', e_comp->hwc);
-   eldbus_message_iter_basic_append(iter, 'i', _e_info_server_is_hwc_windows());
-   eldbus_message_iter_basic_append(iter, 's', ecore_evas_engine_name_get(e_comp->ee));
-   eldbus_message_iter_basic_append(iter, 'i', e_config->use_buffer_flush);
-   eldbus_message_iter_basic_append(iter, 'i', e_config->deiconify_approve);
-
    _msg_ecs_append(iter, EINA_TRUE);
 
    return reply;
@@ -6140,8 +6132,8 @@ _e_info_server_cb_hwc_wins_info_get(const Eldbus_Service_Interface *iface EINA_U
 
 //{ "method_name", arguments_from_client, return_values_to_client, _method_cb, ELDBUS_METHOD_FLAG },
 static const Eldbus_Method methods[] = {
-   { "get_window_info", NULL, ELDBUS_ARGS({"iiiiisa("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_window_info_get, 0 },
-   { "get_ec_info", NULL, ELDBUS_ARGS({"iiiiisa("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_ec_info_get, 0 },
+   { "get_window_info", NULL, ELDBUS_ARGS({"iiiiisiiia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_window_info_get, 0 },
+   { "get_ec_info", NULL, ELDBUS_ARGS({"a("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}),_e_info_server_cb_ec_info_get, 0 },
    { "get_all_window_info", NULL, ELDBUS_ARGS({"a("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_all_window_info_get, 0 },
    { "compobjs", NULL, ELDBUS_ARGS({"a("SIGNATURE_COMPOBJS_CLIENT")", "array of comp objs"}), _e_info_server_cb_compobjs, 0 },
    { "subsurface", NULL, ELDBUS_ARGS({"a("SIGNATURE_SUBSURFACE")", "array of ec"}), _e_info_server_cb_subsurface, 0 },