jeyzu pushed a commit to branch master. http://git.enlightenment.org/tools/clouseau.git/commit/?id=0f9a7e2d0336555905f2adb9b51c9a285e085a02
commit 0f9a7e2d0336555905f2adb9b51c9a285e085a02 Author: Jérémy Zurcher <[email protected]> Date: Thu Aug 18 09:41:36 2016 +0200 follow namespace switch from Eo to Efl --- src/bin/clouseau_client.c | 18 ++-- src/lib/Clouseau.h | 2 +- src/lib/clouseau_app.c | 22 ++--- src/lib/clouseau_data.c | 60 ++++++------ src/lib/clouseau_object_information.c | 172 +++++++++++++++++----------------- src/lib/clouseau_private.h | 28 +++--- src/modules/client/canvas_checker.c | 2 +- 7 files changed, 152 insertions(+), 152 deletions(-) diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c index 5155201..32fcb0a 100644 --- a/src/bin/clouseau_client.c +++ b/src/bin/clouseau_client.c @@ -1039,7 +1039,7 @@ static Eina_Bool _tree_it_is_elm(Clouseau_Tree_Item *treeit) { Eina_List *l; - Eo_Dbg_Info *eo_root, *eo; + Efl_Dbg_Info *eo_root, *eo; Eina_Value_List eo_list; clouseau_tree_item_from_legacy_convert(treeit); eo_root = treeit->new_eo_info; @@ -1340,7 +1340,7 @@ _gl_selected(void *data, Evas_Object *pobj EINA_UNUSED, void *event_info) /* Populate the property list. */ { - Eo_Dbg_Info *eo_root, *eo; + Efl_Dbg_Info *eo_root, *eo; Eina_Value_List eo_list; /* FIXME: Do it before and save it like that. Probably at the * eet conversion stage. */ @@ -2197,12 +2197,12 @@ _main_list_create(Evas_Object *panes) } static void -_obj_info_compactable_list_to_buffer(Eo_Dbg_Info *root_eo, char* buffer, unsigned int buffer_size) +_obj_info_compactable_list_to_buffer(Efl_Dbg_Info *root_eo, char* buffer, unsigned int buffer_size) { Eina_List *l; // Iterator Eina_Value_List list; // list of the elements in root_eo eina_value_pget(&(root_eo->value), &list); - Eo_Dbg_Info *eo; // List element + Efl_Dbg_Info *eo; // List element buffer += snprintf(buffer, buffer_size, "%s:", root_eo->name); EINA_LIST_FOREACH(list.list, l, eo) { @@ -2223,11 +2223,11 @@ _obj_info_compactable_list_to_buffer(Eo_Dbg_Info *root_eo, char* buffer, unsigne } static Eina_Bool -_obj_info_can_list_be_compacted(Eo_Dbg_Info *root_eo) +_obj_info_can_list_be_compacted(Efl_Dbg_Info *root_eo) { Eina_List *l; // Iterator Eina_Value_List list; // list of the elements in root_eo - Eo_Dbg_Info *eo; // List element + Efl_Dbg_Info *eo; // List element eina_value_pget(&(root_eo->value), &list); // We check that there is no list into this list. If such list exists, // we can't compact the list. @@ -2255,7 +2255,7 @@ _obj_info_gl_exp(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve { Eina_List *l; Eina_Value_List eo_list; - Eo_Dbg_Info *eo_root, *eo; + Efl_Dbg_Info *eo_root, *eo; eo_root = elm_object_item_data_get(glit); eina_value_pget(&(eo_root->value), &eo_list); @@ -2305,7 +2305,7 @@ static char * _obj_info_gl_item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { - Eo_Dbg_Info *eo = data; + Efl_Dbg_Info *eo = data; char buf[1024] = ""; if (eina_value_type_get(&(eo->value)) == EINA_VALUE_TYPE_LIST) { @@ -2338,7 +2338,7 @@ static char * _class_info_gl_item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { - Eo_Dbg_Info *eo = data; + Efl_Dbg_Info *eo = data; return strdup(eo->name); } diff --git a/src/lib/Clouseau.h b/src/lib/Clouseau.h index 864524e..cc14e40 100644 --- a/src/lib/Clouseau.h +++ b/src/lib/Clouseau.h @@ -32,7 +32,7 @@ struct _Clouseau_Tree_Item { Eina_List *children; Eina_List *eo_info; /* The intermediate type we use for eet. */ - Eo_Dbg_Info *new_eo_info; + Efl_Dbg_Info *new_eo_info; const char *name; unsigned long long ptr; /* Just a ptr, we keep the value but not accessing mem */ Clouseau_Object *info; /* Legacy */ diff --git a/src/lib/clouseau_app.c b/src/lib/clouseau_app.c index 0778fc2..c4e96fa 100644 --- a/src/lib/clouseau_app.c +++ b/src/lib/clouseau_app.c @@ -26,11 +26,11 @@ libclouseau_item_add(Evas_Object *o, Clouseau_Tree_Item *parent) treeit->ptr = (uintptr_t) o; treeit->is_obj = EINA_TRUE; - treeit->name = eina_stringshare_add(eo_class_name_get(o)); + treeit->name = eina_stringshare_add(efl_class_name_get(o)); /* FIXME: Hack to work with old smart inheritance. * Check if the class *is* (not just implements) Evas_Smart. */ - if (eo_class_get(o) == EFL_CANVAS_GROUP_CLASS) + if (efl_class_get(o) == EFL_CANVAS_GROUP_CLASS) { char buf[1024]; snprintf(buf, sizeof(buf), "%s (%s)", evas_object_type_get(o), treeit->name); @@ -46,7 +46,7 @@ libclouseau_item_add(Evas_Object *o, Clouseau_Tree_Item *parent) /* if (!evas_object_smart_data_get(o)) return ; */ /* Do this only for smart object */ - if (eo_isa(o, EFL_CANVAS_GROUP_CLASS)) + if (efl_isa(o, EFL_CANVAS_GROUP_CLASS)) { children = evas_object_smart_members_get(o); EINA_LIST_FREE(children, child) @@ -188,7 +188,7 @@ _clouseau_verify_e_children(Evas_Object *obj, Evas_Object *ptr) if (ptr == obj) return ptr; - if (eo_isa(obj, EFL_CANVAS_GROUP_CLASS)) + if (efl_isa(obj, EFL_CANVAS_GROUP_CLASS)) { children = evas_object_smart_members_get(obj); EINA_LIST_FREE(children, child) @@ -346,13 +346,13 @@ static Clouseau_Object * _clouseau_object_information_get(Clouseau_Tree_Item *treeit) { Evas_Object *obj = (void*) (uintptr_t) treeit->ptr; - Eo_Dbg_Info *eo_dbg_info; + Efl_Dbg_Info *efl_dbg_info; if (!treeit->is_obj) return NULL; - eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, ""); - eo_dbg_info_get(obj, eo_dbg_info); + efl_dbg_info = EFL_DBG_INFO_LIST_APPEND(NULL, ""); + efl_dbg_info_get(obj, efl_dbg_info); /* XXX: Edje information that should be here because Evas objects can't * depend on Edje. This should be removed in the future. */ @@ -360,14 +360,14 @@ _clouseau_object_information_get(Clouseau_Tree_Item *treeit) const char *part_name = edje_object_part_object_name_get(obj); if (part_name) { - Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(eo_dbg_info, "Edje_Part"); - EO_DBG_INFO_APPEND(group, "Part name", EINA_VALUE_TYPE_STRING, part_name); + Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(efl_dbg_info, "Edje_Part"); + EFL_DBG_INFO_APPEND(group, "Part name", EINA_VALUE_TYPE_STRING, part_name); } } - treeit->eo_info = clouseau_eo_to_legacy_convert(eo_dbg_info); + treeit->eo_info = clouseau_eo_to_legacy_convert(efl_dbg_info); - eo_dbg_info_free(eo_dbg_info); /* Free original list */ + efl_dbg_info_free(efl_dbg_info); /* Free original list */ return NULL; } diff --git a/src/lib/clouseau_data.c b/src/lib/clouseau_data.c index 559f86a..59e08cc 100644 --- a/src/lib/clouseau_data.c +++ b/src/lib/clouseau_data.c @@ -22,12 +22,12 @@ static Eet_Data_Descriptor *eo_bool_edd = NULL; static Eet_Data_Descriptor *eo_ptr_edd = NULL; static Eet_Data_Descriptor *eo_double_edd = NULL; static Eet_Data_Descriptor *eo_list_edd = NULL; -static Eet_Data_Descriptor *eo_dbg_info_edd = NULL; +static Eet_Data_Descriptor *efl_dbg_info_edd = NULL; EAPI void -clouseau_eo_info_free(Clouseau_Eo_Dbg_Info *parent) +clouseau_eo_info_free(Clouseau_Efl_Dbg_Info *parent) { - Clouseau_Eo_Dbg_Info *eo; + Clouseau_Efl_Dbg_Info *eo; if (parent->type == CLOUSEAU_DBG_INFO_TYPE_LIST) EINA_LIST_FREE(parent->un_dbg_info.dbg.list, eo) @@ -43,10 +43,10 @@ static void _clouseau_tree_item_free(Clouseau_Tree_Item *parent) { Clouseau_Tree_Item *treeit; - Clouseau_Eo_Dbg_Info *eo; + Clouseau_Efl_Dbg_Info *eo; if (parent->new_eo_info) - eo_dbg_info_free(parent->new_eo_info); + efl_dbg_info_free(parent->new_eo_info); EINA_LIST_FREE(parent->eo_info, eo) clouseau_eo_info_free(eo); @@ -157,7 +157,7 @@ _clouseau_tree_item_desc_make(void) EET_DATA_DESCRIPTOR_ADD_LIST(clouseau_tree_edd, Clouseau_Tree_Item, "children", children, clouseau_tree_edd); EET_DATA_DESCRIPTOR_ADD_LIST(clouseau_tree_edd, Clouseau_Tree_Item, - "eo_info", eo_info, eo_dbg_info_edd); + "eo_info", eo_info, efl_dbg_info_edd); EET_DATA_DESCRIPTOR_ADD_BASIC(clouseau_tree_edd, Clouseau_Tree_Item, "name", name, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(clouseau_tree_edd, Clouseau_Tree_Item, @@ -233,22 +233,22 @@ _clouseau_bmp_req_desc_make(void) } /* START EO descs */ -struct _Clouseau_Eo_Dbg_Info_Mapping +struct _Clouseau_Efl_Dbg_Info_Mapping { Clouseau_Dbg_Info_Type u; const char *name; }; -typedef struct _Clouseau_Eo_Dbg_Info_Mapping Clouseau_Eo_Dbg_Info_Mapping; +typedef struct _Clouseau_Efl_Dbg_Info_Mapping Clouseau_Efl_Dbg_Info_Mapping; /* It's init later. */ -static Clouseau_Eo_Dbg_Info_Mapping eet_dbg_info_mapping[] = +static Clouseau_Efl_Dbg_Info_Mapping eet_dbg_info_mapping[] = { - { CLOUSEAU_DBG_INFO_TYPE_STRING, EO_DBG_INFO_TYPE_STRING_STR }, - { CLOUSEAU_DBG_INFO_TYPE_INT, EO_DBG_INFO_TYPE_INT_STR }, - { CLOUSEAU_DBG_INFO_TYPE_BOOL, EO_DBG_INFO_TYPE_BOOL_STR }, - { CLOUSEAU_DBG_INFO_TYPE_PTR, EO_DBG_INFO_TYPE_PTR_STR }, - { CLOUSEAU_DBG_INFO_TYPE_DOUBLE, EO_DBG_INFO_TYPE_DOUBLE_STR }, - { CLOUSEAU_DBG_INFO_TYPE_LIST, EO_DBG_INFO_TYPE_LIST_STR }, + { CLOUSEAU_DBG_INFO_TYPE_STRING, EFL_DBG_INFO_TYPE_STRING_STR }, + { CLOUSEAU_DBG_INFO_TYPE_INT, EFL_DBG_INFO_TYPE_INT_STR }, + { CLOUSEAU_DBG_INFO_TYPE_BOOL, EFL_DBG_INFO_TYPE_BOOL_STR }, + { CLOUSEAU_DBG_INFO_TYPE_PTR, EFL_DBG_INFO_TYPE_PTR_STR }, + { CLOUSEAU_DBG_INFO_TYPE_DOUBLE, EFL_DBG_INFO_TYPE_DOUBLE_STR }, + { CLOUSEAU_DBG_INFO_TYPE_LIST, EFL_DBG_INFO_TYPE_LIST_STR }, { CLOUSEAU_DBG_INFO_TYPE_UNKNOWN, NULL } }; @@ -375,7 +375,7 @@ clouseau_list_desc_make(void) d = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST (d, Clouseau_st_dbg_list, - "list", list, eo_dbg_info_edd); /* Carefull, has to be initiated */ + "list", list, efl_dbg_info_edd); /* Carefull, has to be initiated */ return d; } @@ -391,14 +391,14 @@ _clouseau_eo_descs_make(void) eo_ptr_edd = clouseau_ptr_desc_make(); eo_double_edd = clouseau_double_desc_make(); - EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Clouseau_Eo_Dbg_Info); - eo_dbg_info_edd = eet_data_descriptor_file_new(&eddc); - EET_DATA_DESCRIPTOR_ADD_BASIC (eo_dbg_info_edd, Clouseau_Eo_Dbg_Info, + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Clouseau_Efl_Dbg_Info); + efl_dbg_info_edd = eet_data_descriptor_file_new(&eddc); + EET_DATA_DESCRIPTOR_ADD_BASIC (efl_dbg_info_edd, Clouseau_Efl_Dbg_Info, "name", name, EET_T_STRING); - EET_DATA_DESCRIPTOR_ADD_BASIC (eo_dbg_info_edd, Clouseau_Eo_Dbg_Info, + EET_DATA_DESCRIPTOR_ADD_BASIC (efl_dbg_info_edd, Clouseau_Efl_Dbg_Info, "type", type, EET_T_UINT); - /* Here because clouseau_list_desc_make() uses eo_dbg_info_edd */ + /* Here because clouseau_list_desc_make() uses efl_dbg_info_edd */ eo_list_edd = clouseau_list_desc_make(); /* for union */ @@ -408,31 +408,31 @@ _clouseau_eo_descs_make(void) clouseau_union_edd = eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_MAPPING( - clouseau_union_edd, EO_DBG_INFO_TYPE_STRING_STR + clouseau_union_edd, EFL_DBG_INFO_TYPE_STRING_STR ,eo_string_edd); EET_DATA_DESCRIPTOR_ADD_MAPPING( - clouseau_union_edd, EO_DBG_INFO_TYPE_INT_STR + clouseau_union_edd, EFL_DBG_INFO_TYPE_INT_STR ,eo_int_edd); EET_DATA_DESCRIPTOR_ADD_MAPPING( - clouseau_union_edd, EO_DBG_INFO_TYPE_BOOL_STR + clouseau_union_edd, EFL_DBG_INFO_TYPE_BOOL_STR ,eo_bool_edd); EET_DATA_DESCRIPTOR_ADD_MAPPING( - clouseau_union_edd, EO_DBG_INFO_TYPE_PTR_STR + clouseau_union_edd, EFL_DBG_INFO_TYPE_PTR_STR ,eo_ptr_edd); EET_DATA_DESCRIPTOR_ADD_MAPPING( - clouseau_union_edd, EO_DBG_INFO_TYPE_DOUBLE_STR + clouseau_union_edd, EFL_DBG_INFO_TYPE_DOUBLE_STR ,eo_double_edd); EET_DATA_DESCRIPTOR_ADD_MAPPING( - clouseau_union_edd, EO_DBG_INFO_TYPE_LIST_STR + clouseau_union_edd, EFL_DBG_INFO_TYPE_LIST_STR ,eo_list_edd); - EET_DATA_DESCRIPTOR_ADD_UNION(eo_dbg_info_edd, - Clouseau_Eo_Dbg_Info, + EET_DATA_DESCRIPTOR_ADD_UNION(efl_dbg_info_edd, + Clouseau_Efl_Dbg_Info, "un_dbg_info", un_dbg_info, type, clouseau_union_edd); } @@ -466,7 +466,7 @@ _clouseau_data_descriptors_shutdown(void) eet_data_descriptor_free(eo_ptr_edd); eet_data_descriptor_free(eo_double_edd); eet_data_descriptor_free(eo_list_edd); - eet_data_descriptor_free(eo_dbg_info_edd); + eet_data_descriptor_free(efl_dbg_info_edd); eet_data_descriptor_free(clouseau_union_edd); eet_data_descriptor_free(clouseau_connect_edd); diff --git a/src/lib/clouseau_object_information.c b/src/lib/clouseau_object_information.c index c23fea0..5dfc8e3 100644 --- a/src/lib/clouseau_object_information.c +++ b/src/lib/clouseau_object_information.c @@ -49,31 +49,31 @@ clouseau_object_information_free(Clouseau_Object *oinfo) } static void -_clouseau_eo_from_legacy_convert_helper(Eo_Dbg_Info *new_root, Clouseau_Eo_Dbg_Info *root) +_clouseau_eo_from_legacy_convert_helper(Efl_Dbg_Info *new_root, Clouseau_Efl_Dbg_Info *root) { switch (root->type) { case CLOUSEAU_DBG_INFO_TYPE_STRING: - EO_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_STRING, root->un_dbg_info.text.s); + EFL_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_STRING, root->un_dbg_info.text.s); break; case CLOUSEAU_DBG_INFO_TYPE_INT: - EO_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_INT, root->un_dbg_info.intg.i); + EFL_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_INT, root->un_dbg_info.intg.i); break; case CLOUSEAU_DBG_INFO_TYPE_BOOL: - EO_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_CHAR, root->un_dbg_info.bl.b); + EFL_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_CHAR, root->un_dbg_info.bl.b); break; case CLOUSEAU_DBG_INFO_TYPE_PTR: - EO_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_UINT64, root->un_dbg_info.ptr.p); + EFL_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_UINT64, root->un_dbg_info.ptr.p); break; case CLOUSEAU_DBG_INFO_TYPE_DOUBLE: - EO_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_DOUBLE, root->un_dbg_info.dbl.d); + EFL_DBG_INFO_APPEND(new_root, root->name, EINA_VALUE_TYPE_DOUBLE, root->un_dbg_info.dbl.d); break; case CLOUSEAU_DBG_INFO_TYPE_LIST: { Eina_List *l; - Clouseau_Eo_Dbg_Info *eo; + Clouseau_Efl_Dbg_Info *eo; - new_root = EO_DBG_INFO_LIST_APPEND(new_root, root->name); + new_root = EFL_DBG_INFO_LIST_APPEND(new_root, root->name); EINA_LIST_FOREACH(root->un_dbg_info.dbg.list, l, eo) _clouseau_eo_from_legacy_convert_helper(new_root, eo); } @@ -91,11 +91,11 @@ clouseau_tree_item_from_legacy_convert(Clouseau_Tree_Item *treeit) if (!treeit->eo_info) return; Eina_List *root = treeit->eo_info; - Eo_Dbg_Info *new_root = NULL; + Efl_Dbg_Info *new_root = NULL; Eina_List *l; - Clouseau_Eo_Dbg_Info *eo; + Clouseau_Efl_Dbg_Info *eo; - new_root = EO_DBG_INFO_LIST_APPEND(NULL, ""); + new_root = EFL_DBG_INFO_LIST_APPEND(NULL, ""); EINA_LIST_FOREACH(root, l, eo) { _clouseau_eo_from_legacy_convert_helper(new_root, eo); @@ -126,17 +126,17 @@ _clouseau_eina_value_type_to_clouseau_type(const Eina_Value_Type *type) return CLOUSEAU_DBG_INFO_TYPE_UNKNOWN; } -/* This function converts a list of Eo_Dbg_Info - * to a list of Clouseau_Eo_Dbg_Info. +/* This function converts a list of Efl_Dbg_Info + * to a list of Clouseau_Efl_Dbg_Info. * This is required because we would like to keep the def of - * Eo_Dbg_Info in EO code. Thus, avoiding API/ABI error if user + * Efl_Dbg_Info in EO code. Thus, avoiding API/ABI error if user * does not do a full update of Clouseau and EO */ EAPI Eina_List * -clouseau_eo_to_legacy_convert(Eo_Dbg_Info *root) +clouseau_eo_to_legacy_convert(Efl_Dbg_Info *root) { Eina_List *l; Eina_List *new_list = NULL; - Eo_Dbg_Info *eo; + Efl_Dbg_Info *eo; if (!root && (eina_value_type_get(&(root->value)) != EINA_VALUE_TYPE_LIST)) return new_list; @@ -145,7 +145,7 @@ clouseau_eo_to_legacy_convert(Eo_Dbg_Info *root) EINA_LIST_FOREACH(root_list.list, l, eo) { - Clouseau_Eo_Dbg_Info *info = calloc(1, sizeof(*info)); + Clouseau_Efl_Dbg_Info *info = calloc(1, sizeof(*info)); info->type = _clouseau_eina_value_type_to_clouseau_type( eina_value_type_get(&(eo->value))); info->name = eina_stringshare_add(eo->name); @@ -228,23 +228,23 @@ clouseau_object_information_list_populate(Clouseau_Tree_Item *treeit) /* This code is here only for backward compatibility and will be removed soon */ if (!treeit->eo_info && !treeit->new_eo_info) { - Eo_Dbg_Info *root = EO_DBG_INFO_LIST_APPEND(NULL, ""); + Efl_Dbg_Info *root = EFL_DBG_INFO_LIST_APPEND(NULL, ""); /* Populate evas properties list */ - Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, "Evas"); - Eo_Dbg_Info *node; + Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, "Evas"); + Efl_Dbg_Info *node; - EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.is_visible); - EO_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT, oinfo->evas_props.layer); + EFL_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.is_visible); + EFL_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT, oinfo->evas_props.layer); - node = EO_DBG_INFO_LIST_APPEND(group, "Position"); - EO_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, oinfo->evas_props.x); - EO_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, oinfo->evas_props.y); + node = EFL_DBG_INFO_LIST_APPEND(group, "Position"); + EFL_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, oinfo->evas_props.x); + EFL_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, oinfo->evas_props.y); - node = EO_DBG_INFO_LIST_APPEND(group, "Size"); - EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.w); - EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.h); + node = EFL_DBG_INFO_LIST_APPEND(group, "Size"); + EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.w); + EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.h); - EO_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.scale); + EFL_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.scale); #if 0 if (evas_object_clip_get(obj)) @@ -255,115 +255,115 @@ clouseau_object_information_list_populate(Clouseau_Tree_Item *treeit) } #endif - node = EO_DBG_INFO_LIST_APPEND(group, "Min size"); - EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.min_w); - EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.min_h); - node = EO_DBG_INFO_LIST_APPEND(group, "Max size"); - EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.max_w); - EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.max_h); - node = EO_DBG_INFO_LIST_APPEND(group, "Request size"); - EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.req_w); - EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.req_h); - node = EO_DBG_INFO_LIST_APPEND(group, "Align"); - EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.align_x); - EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.align_y); - node = EO_DBG_INFO_LIST_APPEND(group, "Weight"); - EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.weight_x); - EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.weight_y); + node = EFL_DBG_INFO_LIST_APPEND(group, "Min size"); + EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.min_w); + EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.min_h); + node = EFL_DBG_INFO_LIST_APPEND(group, "Max size"); + EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.max_w); + EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.max_h); + node = EFL_DBG_INFO_LIST_APPEND(group, "Request size"); + EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, oinfo->evas_props.req_w); + EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, oinfo->evas_props.req_h); + node = EFL_DBG_INFO_LIST_APPEND(group, "Align"); + EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.align_x); + EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.align_y); + node = EFL_DBG_INFO_LIST_APPEND(group, "Weight"); + EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.weight_x); + EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_DOUBLE, oinfo->evas_props.weight_y); #if 0 evas_object_size_hint_aspect_get(obj, &w, &h); _clouseau_information_geometry_to_tree(main_tit, "Aspect", w, h); #endif - node = EO_DBG_INFO_LIST_APPEND(group, "Color"); - EO_DBG_INFO_APPEND(node, "r", EINA_VALUE_TYPE_INT, oinfo->evas_props.r); - EO_DBG_INFO_APPEND(node, "g", EINA_VALUE_TYPE_INT, oinfo->evas_props.g); - EO_DBG_INFO_APPEND(node, "b", EINA_VALUE_TYPE_INT, oinfo->evas_props.b); - EO_DBG_INFO_APPEND(node, "a", EINA_VALUE_TYPE_INT, oinfo->evas_props.a); + node = EFL_DBG_INFO_LIST_APPEND(group, "Color"); + EFL_DBG_INFO_APPEND(node, "r", EINA_VALUE_TYPE_INT, oinfo->evas_props.r); + EFL_DBG_INFO_APPEND(node, "g", EINA_VALUE_TYPE_INT, oinfo->evas_props.g); + EFL_DBG_INFO_APPEND(node, "b", EINA_VALUE_TYPE_INT, oinfo->evas_props.b); + EFL_DBG_INFO_APPEND(node, "a", EINA_VALUE_TYPE_INT, oinfo->evas_props.a); - EO_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.has_focus); + EFL_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.has_focus); for (i = 0; i < sizeof (pointer_mode) / sizeof (pointer_mode[0]); ++i) if (pointer_mode[i].mode == oinfo->evas_props.mode) { - EO_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, pointer_mode[i].text); + EFL_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, pointer_mode[i].text); break; } - EO_DBG_INFO_APPEND(group, "Pass Events", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.pass_events); - EO_DBG_INFO_APPEND(group, "Repeat Events", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.repeat_events); - EO_DBG_INFO_APPEND(group, "Propagate Events", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.propagate_events); - EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.is_clipper); + EFL_DBG_INFO_APPEND(group, "Pass Events", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.pass_events); + EFL_DBG_INFO_APPEND(group, "Repeat Events", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.repeat_events); + EFL_DBG_INFO_APPEND(group, "Propagate Events", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.propagate_events); + EFL_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, oinfo->evas_props.is_clipper); if (oinfo->evas_props.clipper) { snprintf(buf, sizeof(buf), "%llx", oinfo->evas_props.clipper); - EO_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_STRING, buf); + EFL_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_STRING, buf); } if (oinfo->evas_props.points_count) { - node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map"); + node = EFL_DBG_INFO_LIST_APPEND(group, "Evas Map"); Clouseau_Evas_Map_Point_Props *p; for(i = 0 ; (int) i < oinfo->evas_props.points_count; i++) { p = &oinfo->evas_props.points[i]; - Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(node, "Coords"); - EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, p->x); - EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, p->y); - EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, p->z); + Efl_Dbg_Info *point = EFL_DBG_INFO_LIST_APPEND(node, "Coords"); + EFL_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, p->x); + EFL_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, p->y); + EFL_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, p->z); } } if (oinfo->extra_props.type == CLOUSEAU_OBJ_TYPE_ELM) { - group = EO_DBG_INFO_LIST_APPEND(root, "Elm"); - EO_DBG_INFO_APPEND(group, "Wid-Type", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.elm.type); + group = EFL_DBG_INFO_LIST_APPEND(root, "Elm"); + EFL_DBG_INFO_APPEND(group, "Wid-Type", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.elm.type); #if 0 /* Extract actual data from theme? */ _clouseau_information_string_to_tree(main_tit, "Theme", elm_widget_theme_get(obj)); #endif - EO_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.elm.style); - EO_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, oinfo->extra_props.u.elm.scale); - EO_DBG_INFO_APPEND(group, "Disabled", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.is_disabled); - EO_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.has_focus); - EO_DBG_INFO_APPEND(group, "Mirrored", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.is_mirrored); - EO_DBG_INFO_APPEND(group, "Automatic mirroring", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.is_mirrored_automatic); + EFL_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.elm.style); + EFL_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, oinfo->extra_props.u.elm.scale); + EFL_DBG_INFO_APPEND(group, "Disabled", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.is_disabled); + EFL_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.has_focus); + EFL_DBG_INFO_APPEND(group, "Mirrored", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.is_mirrored); + EFL_DBG_INFO_APPEND(group, "Automatic mirroring", EINA_VALUE_TYPE_CHAR, oinfo->extra_props.u.elm.is_mirrored_automatic); } else if (oinfo->extra_props.type == CLOUSEAU_OBJ_TYPE_TEXT) { /* EVAS_OBJ_TEXT_CLASS */ - group = EO_DBG_INFO_LIST_APPEND(root, "Text"); - EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.text.font); + group = EFL_DBG_INFO_LIST_APPEND(root, "Text"); + EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.text.font); - EO_DBG_INFO_APPEND(group, "Size", EINA_VALUE_TYPE_INT, oinfo->extra_props.u.text.size); + EFL_DBG_INFO_APPEND(group, "Size", EINA_VALUE_TYPE_INT, oinfo->extra_props.u.text.size); - EO_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.text.source); - EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.text.text); + EFL_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.text.source); + EFL_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.text.text); } else if (oinfo->extra_props.type == CLOUSEAU_OBJ_TYPE_IMAGE) { /* EVAS_OBJ_IMAGE_CLASS */ - group = EO_DBG_INFO_LIST_APPEND(root, "Image"); - EO_DBG_INFO_APPEND(group, "Filename", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.image.file); - EO_DBG_INFO_APPEND(group, "File key", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.image.key); - EO_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64, oinfo->extra_props.u.image.source); + group = EFL_DBG_INFO_LIST_APPEND(root, "Image"); + EFL_DBG_INFO_APPEND(group, "Filename", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.image.file); + EFL_DBG_INFO_APPEND(group, "File key", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.image.key); + EFL_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64, oinfo->extra_props.u.image.source); if (oinfo->extra_props.u.image.load_err) - EO_DBG_INFO_APPEND(group, "Load error", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.image.load_err); + EFL_DBG_INFO_APPEND(group, "Load error", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.image.load_err); } else if (oinfo->extra_props.type == CLOUSEAU_OBJ_TYPE_EDJE) { /* EDJE_OBJ_CLASS */ - group = EO_DBG_INFO_LIST_APPEND(root, "Edje"); - EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.edje.file); - EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.edje.group); + group = EFL_DBG_INFO_LIST_APPEND(root, "Edje"); + EFL_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.edje.file); + EFL_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.edje.group); if (oinfo->extra_props.u.image.load_err) - EO_DBG_INFO_APPEND(group, "Load error", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.edje.load_err); + EFL_DBG_INFO_APPEND(group, "Load error", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.edje.load_err); } else if (oinfo->extra_props.type == CLOUSEAU_OBJ_TYPE_TEXTBLOCK) { /* EVAS_OBJ_TEXTBLOCK_CLASS */ - group = EO_DBG_INFO_LIST_APPEND(root, "Text Block"); - EO_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.textblock.style); - EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.textblock.text); + group = EFL_DBG_INFO_LIST_APPEND(root, "Text Block"); + EFL_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.textblock.style); + EFL_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, oinfo->extra_props.u.textblock.text); } /* Convert Old format to Clouseau_eo */ diff --git a/src/lib/clouseau_private.h b/src/lib/clouseau_private.h index 915e068..d641aa2 100644 --- a/src/lib/clouseau_private.h +++ b/src/lib/clouseau_private.h @@ -35,13 +35,13 @@ #define CLOUSEAU_BMP_DATA_ENTRY "clouseau/app/screenshot" /* START - EO EET defs */ -#define EO_DBG_INFO_TYPE_UNKNOWN_STR "EO_DBG_INFO_TYPE_UNKNOWN" -#define EO_DBG_INFO_TYPE_STRING_STR "EO_DBG_INFO_TYPE_STRING" -#define EO_DBG_INFO_TYPE_INT_STR "EO_DBG_INFO_TYPE_INT" -#define EO_DBG_INFO_TYPE_BOOL_STR "EO_DBG_INFO_TYPE_BOOL" -#define EO_DBG_INFO_TYPE_PTR_STR "EO_DBG_INFO_TYPE_PTR" -#define EO_DBG_INFO_TYPE_DOUBLE_STR "EO_DBG_INFO_TYPE_DOUBLE" -#define EO_DBG_INFO_TYPE_LIST_STR "EO_DBG_INFO_TYPE_LIST" +#define EFL_DBG_INFO_TYPE_UNKNOWN_STR "EFL_DBG_INFO_TYPE_UNKNOWN" +#define EFL_DBG_INFO_TYPE_STRING_STR "EFL_DBG_INFO_TYPE_STRING" +#define EFL_DBG_INFO_TYPE_INT_STR "EFL_DBG_INFO_TYPE_INT" +#define EFL_DBG_INFO_TYPE_BOOL_STR "EFL_DBG_INFO_TYPE_BOOL" +#define EFL_DBG_INFO_TYPE_PTR_STR "EFL_DBG_INFO_TYPE_PTR" +#define EFL_DBG_INFO_TYPE_DOUBLE_STR "EFL_DBG_INFO_TYPE_DOUBLE" +#define EFL_DBG_INFO_TYPE_LIST_STR "EFL_DBG_INFO_TYPE_LIST" /* END - EO EET defs */ struct _connect_st @@ -175,7 +175,7 @@ struct _Clouseau_st_double struct _Clouseau_st_dbg_list { - Eina_List *list; /* Sub-List of (Eo_Dbg_Info *) if needed */ + Eina_List *list; /* Sub-List of (Efl_Dbg_Info *) if needed */ }; /* START - EO - debug structs */ @@ -185,7 +185,7 @@ typedef struct _Clouseau_st_bool Clouseau_st_bool; typedef struct _Clouseau_st_ptr Clouseau_st_ptr; typedef struct _Clouseau_st_double Clouseau_st_double; typedef struct _Clouseau_st_dbg_list Clouseau_st_dbg_list; -typedef struct _Clouseau_Eo_Dbg_Info Clouseau_Eo_Dbg_Info; +typedef struct _Clouseau_Efl_Dbg_Info Clouseau_Efl_Dbg_Info; /* END - EO - debug structs */ typedef enum @@ -199,8 +199,8 @@ typedef enum CLOUSEAU_DBG_INFO_TYPE_UNKNOWN } Clouseau_Dbg_Info_Type; -struct _Clouseau_Eo_Dbg_Info -{ /* Debug info composed of a list of Eo_Dbg_Info */ +struct _Clouseau_Efl_Dbg_Info +{ /* Debug info composed of a list of Efl_Dbg_Info */ const char *name; Clouseau_Dbg_Info_Type type; @@ -211,16 +211,16 @@ struct _Clouseau_Eo_Dbg_Info Clouseau_st_bool bl; Clouseau_st_ptr ptr; Clouseau_st_double dbl; - Clouseau_st_dbg_list dbg; /* Sub-List of (Eo_Dbg_Info *) if needed */ + Clouseau_st_dbg_list dbg; /* Sub-List of (Efl_Dbg_Info *) if needed */ } un_dbg_info; }; /* END - EO - debug structs */ void clouseau_app_disconnect(void); -EAPI void clouseau_eo_info_free(Clouseau_Eo_Dbg_Info *parent); +EAPI void clouseau_eo_info_free(Clouseau_Efl_Dbg_Info *parent); EAPI void clouseau_tree_item_from_legacy_convert(Clouseau_Tree_Item *treeit); -EAPI Eina_List *clouseau_eo_to_legacy_convert(Eo_Dbg_Info *root); +EAPI Eina_List *clouseau_eo_to_legacy_convert(Efl_Dbg_Info *root); /* Exported From Object information */ EAPI void clouseau_object_information_free(Clouseau_Object *oinfo); diff --git a/src/modules/client/canvas_checker.c b/src/modules/client/canvas_checker.c index ff82bb1..ed0d2e2 100644 --- a/src/modules/client/canvas_checker.c +++ b/src/modules/client/canvas_checker.c @@ -45,7 +45,7 @@ static uint64_t _treeit_clipee_is(Clouseau_Tree_Item *treeit) { Eina_List *l; - Eo_Dbg_Info *eo_root, *eo; + Efl_Dbg_Info *eo_root, *eo; Eina_Value_List eo_list; clouseau_tree_item_from_legacy_convert(treeit); eo_root = treeit->new_eo_info; --
