bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eo dbg: Use eina_value as the debug info type. 

SVN revision: 83443
This commit is contained in:
Tom Hacohen 2013-01-29 16:36:01 +00:00
parent 139ca23be1
commit 70156285b0
8 changed files with 181 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/images.mk
View File

File diff suppressed because one or more lines are too long

6
src/lib/edje/edje_smart.c
View File

@ -45,14 +45,14 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
const char *file, *edje_group;
eo_do(eo_obj, edje_obj_file_get(&file, &edje_group));
EO_DBG_INFO_TEXT_APPEND(group, "File", file);
EO_DBG_INFO_TEXT_APPEND(group, "Group", edje_group);
EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
Edje_Load_Error error;
eo_do(eo_obj, edje_obj_load_error_get(&error));
if (error != EDJE_LOAD_ERROR_NONE)
{
EO_DBG_INFO_TEXT_APPEND(group, "Error",
EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
edje_load_error_str(error));
}
}

264
src/lib/eo/Eo.h
View File

@ -63,138 +63,6 @@ enum _Eo_Op_Type
*/
typedef enum _Eo_Op_Type Eo_Op_Type;
/* START - Eo Debug support */
/**
* @var Eo_Dbg_Info_Type
* #Eo_Dbg_Info_Type - tells what type of info in union.
*/
enum _Eo_Dbg_Info_Type
{ /* Public */
EO_DBG_INFO_TYPE_UNKNOWN,
EO_DBG_INFO_TYPE_STRING, /**< info is string */
EO_DBG_INFO_TYPE_INT, /**< Single int, enum */
EO_DBG_INFO_TYPE_BOOL, /**< Single Eina_Bool */
EO_DBG_INFO_TYPE_PTR, /**< Single PTR value */
EO_DBG_INFO_TYPE_DOUBLE, /**< Single DBL value */
EO_DBG_INFO_TYPE_LIST /**< Eina_List * of structs */
};
typedef enum _Eo_Dbg_Info_Type Eo_Dbg_Info_Type;
union _Eo_Dbg_Info_Union
{
const char *text;
int i;
Eina_Bool b;
void *ptr;
double dbl;
Eina_List *list; /* Sub-List of (Eo_Dbg_Info *) if needed */
};
typedef union _Eo_Dbg_Info_Union Eo_Dbg_Info_Union;
/* Private */
typedef struct _Eo_Dbg_Info Eo_Dbg_Info;
/**
* @def EO_DBG_INFO_TEXT_APPEND
* Append a parameter into debug info list.
* @param[in] LIST list where to append
* @param[in] NAME name of the parameter
* @param[in] VALUE text
*
*/
#define EO_DBG_INFO_TEXT_APPEND(LIST, NAME, VALUE) \
do { \
Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_STRING); \
un->text = VALUE; \
} while (0);
/**
* @def EO_DBG_INFO_INTEGER_APPEND
* Append a parameter into debug info list.
* @param[in] LIST list where to append
* @param[in] NAME name of the parameter
* @param[in] VALUE integer
*
*/
#define EO_DBG_INFO_INTEGER_APPEND(LIST, NAME, VALUE) \
do { \
Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_INT); \
un->i = VALUE; \
} while (0);
/**
* @def EO_DBG_INFO_BOOLEAN_APPEND
* Append a parameter into debug info list.
* @param[in] LIST list where to append
* @param[in] NAME name of the parameter
* @param[in] VALUE boolean
*
*/
#define EO_DBG_INFO_BOOLEAN_APPEND(LIST, NAME, VALUE) \
do { \
Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_BOOL); \
un->b = VALUE; \
} while (0);
/**
* @def EO_DBG_INFO_PTR_APPEND
* Append a parameter into debug info list.
* @param[in] LIST list where to append
* @param[in] NAME name of the parameter
* @param[in] VALUE pointer
*
*/
#define EO_DBG_INFO_PTR_APPEND(LIST, NAME, VALUE) \
do { \
Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_PTR); \
un->ptr = VALUE; \
} while (0);
/**
* @def EO_DBG_INFO_DOUBLE_APPEND
* Append a parameter into debug info list.
* @param[in] LIST list where to append
* @param[in] NAME name of the parameter
* @param[in] VALUE double
*
*/
#define EO_DBG_INFO_DOUBLE_APPEND(LIST, NAME, VALUE) \
do { \
Eo_Dbg_Info_Union *un = EO_DBG_INFO_APPEND(LIST, NAME, EO_DBG_INFO_TYPE_DOUBLE); \
un->dbl = VALUE; \
} while (0);
/**
* @def EO_DBG_INFO_DOUBLE_APPEND
* Creates a list inside debug info list.
* @param[in] LIST list where to append
* @param[in] NAME name of the list
* @return the new list
*
*/
#define EO_DBG_INFO_LIST_APPEND(LIST, NAME) \
( \
eo_dbg_info_append(LIST, NAME, EO_DBG_INFO_TYPE_LIST) \
)
/**
* @def EO_DBG_INFO_APPEND
* Creates a new debug info into a list
* @param[in] LIST list where to append
* @param[in] NAME name of the parameter
* @param[in] TYPE type of the parameter
* @return a pointer to the debug info union where to store the value
* @return the new list
*
*/
#define EO_DBG_INFO_APPEND(LIST, NAME, TYPE) \
({ \
Eo_Dbg_Info *_node = eo_dbg_info_append(LIST, NAME, TYPE); \
eo_dbg_union_get(_node); })
/* END - Eo Debug support */
/**
* @page eo_main Eo
*
@ -255,6 +123,84 @@ typedef struct _Eo_Dbg_Info Eo_Dbg_Info;
* @{
*/
/**
* @addtogroup Eo_Debug_Information Eo's Debug information helper.
* @{
*/
/**
* @struct _Eo_Dbg_Info
* The structure for the debug info used by Eo.
*/
struct _Eo_Dbg_Info
{
Eina_Stringshare *name; /**< The name of the part (stringshare). */
Eina_Value value; /**< The value. */
};
/**
* @var EO_DBG_INFO_TYPE
* The Eina_Value_Type for the debug info.
*/
EAPI extern const Eina_Value_Type *EO_DBG_INFO_TYPE;
/**
* @typedef Eo_Dbg_Info
* A convenience typedef for #_Eo_Dbg_Info
*/
typedef struct _Eo_Dbg_Info Eo_Dbg_Info;
/**
* @def EO_DBG_INFO_LIST_APPEND
* Creates a list inside debug info list.
* @param[in] LIST list where to append
* @param[in] NAME name of the list
* @return the new list
*/
#define EO_DBG_INFO_LIST_APPEND(LIST, NAME) \
({ \
Eo_Dbg_Info *List = LIST; \
Eo_Dbg_Info *Tmp = calloc(1, sizeof(*Tmp)); \
Tmp->name = eina_stringshare_add(NAME); \
eina_value_list_setup(&(Tmp->value), EO_DBG_INFO_TYPE); \
if (List) \
{ \
eina_value_list_pappend(&(List->value), Tmp); \
} \
Tmp; \
})
/**
* @def EO_DBG_INFO_APPEND
* Creates a new debug info into a list
* @param[in] LIST list where to append (Eo_Dbg_Info *)
* @param[in] NAME name of the parameter (const char *)
* @param[in] TYPE type of the parameter (Eina_Value_Type *)
* @param[in] VALUE value of the parameter
*/
#define EO_DBG_INFO_APPEND(LIST, NAME, TYPE, VALUE) \
do { \
Eo_Dbg_Info *List = LIST; \
Eo_Dbg_Info *Tmp = calloc(1, sizeof(*Tmp)); \
Tmp->name = eina_stringshare_add(NAME); \
eina_value_setup(&(Tmp->value), TYPE); \
eina_value_set(&(Tmp->value), VALUE); \
if (List) \
{ \
eina_value_list_pappend(&(List->value), Tmp); \
} \
} while (0)
/**
* Frees the Eo_Dbg_Info tree. (The whole tree recursively).
* @param[in] info The tree to delete.
*/
EAPI void eo_dbg_info_free(Eo_Dbg_Info *info);
/**
* @}
*/
/**
* @def EO_TYPECHECK(type, x)
*
@ -976,57 +922,6 @@ EAPI void eo_composite_detach(Eo *comp_obj, Eo *parent);
*/
EAPI Eina_Bool eo_composite_is(const Eo *comp_obj);
/**
* @brief Allocates Eo_Dbg_Info node
* @param root - tree to where we append allocated node.
* @param name - Name (title) of info.
* @param type - type of info.
* Use this function to allocate Eo_Dbg_Info node.
* Use dbg_info_free to free this node.
*
* @return a pointer to the newly allocated Eo_Dbg_Info.
* @see eo_dbg_info_free, eo_dbg_type_get, eo_dbg_information_get
*/
EAPI Eo_Dbg_Info *eo_dbg_info_append(Eo_Dbg_Info *root, const char *name, Eo_Dbg_Info_Type type);
/**
* @brief Free list of Eo_Dbg_Info node (including children)
* @param node - node to free.
*
* @see eo_dbg_type_get, eo_dbg_information_get
*/
EAPI void eo_dbg_info_free(Eo_Dbg_Info *node);
/**
* @brief Get a pointer to Eo_Dbg_Info union
* @param node - pointer to Eo_Dbg_Info node
*
* @return Pointer to struct union (public data).
* @see eo_dbg_info_free, eo_dbg_type_get, eo_dbg_information_get
*/
EAPI Eo_Dbg_Info_Union *eo_dbg_union_get(Eo_Dbg_Info *node);
/**
* @brief Returns name of dbg-info.
* @param node - pointer to info struct.
* Use this function to retrieve the name field of debug info.
*
* @see eo_dbg_info_free
* @see eo_dbg_type_get, eo_dbg_information_get
*/
EAPI const char *eo_dbg_name_get(Eo_Dbg_Info *node);
/**
* @brief Returns type of dbg-info.
* @param node - pointer to info struct.
* Use this function to retrieve the type field of debug info.
*
* @return name (title) of info.
* @see eo_dbg_info_free
* @see eo_dbg_name_get, eo_dbg_information_get
*/
EAPI Eo_Dbg_Info_Type eo_dbg_type_get(Eo_Dbg_Info *node);
/**
* @}
*/
@ -1114,9 +1009,8 @@ enum {
/**
* @def eo_dbg_info_get(root_node)
* Get generic data from object.
* Get dbg information from the object.
* @param[in] root node of the tree
*
*/
#define eo_dbg_info_get(root_node) EO_BASE_ID(EO_BASE_SUB_ID_DBG_INFO_GET), EO_TYPECHECK(Eo_Dbg_Info *, root_node)

102
src/lib/eo/eo.c
View File

@ -55,16 +55,6 @@ struct _Eo {
Eina_Bool manual_free:1;
};
/* START - EO Debug structs */
struct _Eo_Dbg_Info
{ /* Debug info composed of a list of Eo_Dbg_Info */
const char *name;
Eo_Dbg_Info_Type type;
Eo_Dbg_Info_Union un_dbg_info;
};
/* END - EO Debug structs */
/* Start of Dich */
/* How we search and store the implementations in classes. */
@ -1592,51 +1582,73 @@ eo_manual_free(Eo *obj)
_eo_free(obj);
}
EAPI Eo_Dbg_Info *
eo_dbg_info_append(Eo_Dbg_Info *root, const char *name, Eo_Dbg_Info_Type type)
{
if (root && EO_DBG_INFO_TYPE_LIST != root->type)
return NULL;
Eo_Dbg_Info *st = calloc(1, sizeof(Eo_Dbg_Info));
if (!st) return NULL;
st->name = name;
st->type = type;
if (root)
root->un_dbg_info.list = eina_list_append(root->un_dbg_info.list, st);
return st;
}
/* Eo_Dbg */
EAPI void
eo_dbg_info_free(Eo_Dbg_Info *root)
eo_dbg_info_free(Eo_Dbg_Info *info)
{
if (EO_DBG_INFO_TYPE_LIST == root->type)
{
Eo_Dbg_Info *eo;
EINA_LIST_FREE(root->un_dbg_info.list, eo)
eo_dbg_info_free(eo);
}
free(root);
eina_value_flush(&(info->value));
free(info);
}
EAPI const char *
eo_dbg_name_get(Eo_Dbg_Info *node)
static Eina_Bool
_eo_dbg_info_setup(const Eina_Value_Type *type, void *mem)
{
return ((node) ? node->name : NULL);
memset(mem, 0, type->value_size);
return EINA_TRUE;
}
EAPI Eo_Dbg_Info_Union *
eo_dbg_union_get(Eo_Dbg_Info *node)
static Eina_Bool
_eo_dbg_info_flush(const Eina_Value_Type *type EINA_UNUSED, void *_mem)
{
return ((node) ? &node->un_dbg_info : NULL);
Eo_Dbg_Info *mem = *(Eo_Dbg_Info **) _mem;
eina_stringshare_del(mem->name);
eina_value_flush(&(mem->value));
free(mem);
return EINA_TRUE;
}
EAPI Eo_Dbg_Info_Type
eo_dbg_type_get(Eo_Dbg_Info *node)
static Eina_Bool
_eo_dbg_info_copy(const Eina_Value_Type *type EINA_UNUSED, const void *_src, void *_dst)
{
return ((node) ? node->type : EO_DBG_INFO_TYPE_UNKNOWN);
const Eo_Dbg_Info **src = (const Eo_Dbg_Info **) _src;
Eo_Dbg_Info **dst = _dst;
*dst = calloc(1, sizeof(*dst));
(*dst)->name = eina_stringshare_ref((*src)->name);
eina_value_copy(&((*src)->value), &((*dst)->value));
return EINA_TRUE;
}
static Eina_Bool
_eo_dbg_info_pset(const Eina_Value_Type *type EINA_UNUSED, void *_mem, const void *_ptr)
{
Eo_Dbg_Info **mem = _mem;
if (*mem)
free(*mem);
*mem = (void *) _ptr;
return EINA_TRUE;
}
static Eina_Bool
_eo_dbg_info_pget(const Eina_Value_Type *type EINA_UNUSED, const void *_mem, void *_ptr)
{
Eo_Dbg_Info **ptr = _ptr;
*ptr = (void *) _mem;
return EINA_TRUE;
}
static const Eina_Value_Type _EO_DBG_INFO_TYPE = {
EINA_VALUE_TYPE_VERSION,
sizeof(Eo_Dbg_Info *),
"Eo_Dbg_Info_Ptr",
_eo_dbg_info_setup,
_eo_dbg_info_flush,
_eo_dbg_info_copy,
NULL,
NULL,
NULL,
NULL,
_eo_dbg_info_pset,
_eo_dbg_info_pget
};
EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = &_EO_DBG_INFO_TYPE;

10
src/lib/evas/canvas/evas_object_image.c
View File

@ -775,16 +775,16 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
const char *file, *key;
eo_do(eo_obj, evas_obj_image_file_get(&file, &key));
EO_DBG_INFO_TEXT_APPEND(group, "Image File", file);
EO_DBG_INFO_TEXT_APPEND(group, "Key", key);
EO_DBG_INFO_PTR_APPEND(group, "Source",
(void *) evas_object_image_source_get(eo_obj));
EO_DBG_INFO_APPEND(group, "Image File", EINA_VALUE_TYPE_STRING, file);
EO_DBG_INFO_APPEND(group, "Key", EINA_VALUE_TYPE_STRING, key);
EO_DBG_INFO_APPEND(group, "Source", EINA_VALUE_TYPE_UINT64,
(uint64_t) (uintptr_t *) evas_object_image_source_get(eo_obj));
if (evas_object_image_load_error_get(eo_obj) != EVAS_LOAD_ERROR_NONE)
{
Evas_Load_Error error;
eo_do(eo_obj, evas_obj_image_load_error_get(&error));
EO_DBG_INFO_TEXT_APPEND(group, "Load Error",
EO_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING,
evas_load_error_str(error));
}
}

60
src/lib/evas/canvas/evas_object_main.c
View File

@ -1867,66 +1867,66 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
Eina_Bool visible;
eo_do(eo_obj, evas_obj_visibility_get(&visible));
EO_DBG_INFO_BOOLEAN_APPEND(group, "Visibility", visible);
EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible);
short layer;
eo_do(eo_obj, evas_obj_layer_get(&layer));
EO_DBG_INFO_INTEGER_APPEND(group, "Layer", layer);
EO_DBG_INFO_APPEND(group, "Layer", EINA_VALUE_TYPE_INT, layer);
int x, y;
eo_do(eo_obj, evas_obj_position_get(&x, &y));
node = EO_DBG_INFO_LIST_APPEND(group, "Position");
EO_DBG_INFO_INTEGER_APPEND(node, "x", x);
EO_DBG_INFO_INTEGER_APPEND(node, "y", y);
EO_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, x);
EO_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, y);
int w, h;
eo_do(eo_obj, evas_obj_size_get(&w, &h));
node = EO_DBG_INFO_LIST_APPEND(group, "Size");
EO_DBG_INFO_INTEGER_APPEND(node, "w", w);
EO_DBG_INFO_INTEGER_APPEND(node, "h", h);
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
double scale;
eo_do(eo_obj, evas_obj_scale_get(&scale));
EO_DBG_INFO_DOUBLE_APPEND(group, "Scale", scale);
EO_DBG_INFO_APPEND(group, "Scale", EINA_VALUE_TYPE_DOUBLE, scale);
eo_do(eo_obj, evas_obj_size_hint_min_get(&w, &h));
node = EO_DBG_INFO_LIST_APPEND(group, "Min size");
EO_DBG_INFO_INTEGER_APPEND(node, "w", w);
EO_DBG_INFO_INTEGER_APPEND(node, "h", h);
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
eo_do(eo_obj, evas_obj_size_hint_max_get(&w, &h));
node = EO_DBG_INFO_LIST_APPEND(group, "Max size");
EO_DBG_INFO_INTEGER_APPEND(node, "w", w);
EO_DBG_INFO_INTEGER_APPEND(node, "h", h);
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
eo_do(eo_obj, evas_obj_size_hint_request_get(&w, &h));
node = EO_DBG_INFO_LIST_APPEND(group, "Request size");
EO_DBG_INFO_INTEGER_APPEND(node, "w", w);
EO_DBG_INFO_INTEGER_APPEND(node, "h", h);
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
double dblx, dbly;
eo_do(eo_obj, evas_obj_size_hint_align_get(&dblx, &dbly));
node = EO_DBG_INFO_LIST_APPEND(group, "Align");
EO_DBG_INFO_INTEGER_APPEND(node, "x", dblx);
EO_DBG_INFO_INTEGER_APPEND(node, "y", dbly);
EO_DBG_INFO_APPEND(node, "x", EINA_VALUE_TYPE_INT, dblx);
EO_DBG_INFO_APPEND(node, "y", EINA_VALUE_TYPE_INT, dbly);
double dblw, dblh;
eo_do(eo_obj, evas_obj_size_hint_weight_get(&dblw, &dblh));
node = EO_DBG_INFO_LIST_APPEND(group, "Weight");
EO_DBG_INFO_INTEGER_APPEND(node, "w", dblw);
EO_DBG_INFO_INTEGER_APPEND(node, "h", dblh);
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, dblw);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, dblh);
int r, g, b, a;
eo_do(eo_obj, evas_obj_color_get(&r, &g, &b, &a));
node = EO_DBG_INFO_LIST_APPEND(group, "Color");
EO_DBG_INFO_INTEGER_APPEND(node, "r", r);
EO_DBG_INFO_INTEGER_APPEND(node, "g", g);
EO_DBG_INFO_INTEGER_APPEND(node, "b", b);
EO_DBG_INFO_INTEGER_APPEND(node, "a", a);
EO_DBG_INFO_APPEND(node, "r", EINA_VALUE_TYPE_INT, r);
EO_DBG_INFO_APPEND(node, "g", EINA_VALUE_TYPE_INT, g);
EO_DBG_INFO_APPEND(node, "b", EINA_VALUE_TYPE_INT, b);
EO_DBG_INFO_APPEND(node, "a", EINA_VALUE_TYPE_INT, a);
Eina_Bool focus;
eo_do(eo_obj, evas_obj_focus_get(&focus));
EO_DBG_INFO_BOOLEAN_APPEND(group, "Has focus", focus);
EO_DBG_INFO_APPEND(group, "Has focus", EINA_VALUE_TYPE_CHAR, focus);
unsigned int m;
eo_do(eo_obj, evas_obj_pointer_mode_get(&m));
@ -1939,21 +1939,21 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
text = "EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN";
if (text)
EO_DBG_INFO_TEXT_APPEND(group, "Pointer Mode", text);
EO_DBG_INFO_APPEND(group, "Pointer Mode", EINA_VALUE_TYPE_STRING, text);
Eina_Bool event;
eo_do(eo_obj, evas_obj_pass_events_get(&event));
EO_DBG_INFO_BOOLEAN_APPEND(group, "Pass Events", event);
EO_DBG_INFO_APPEND(group, "Pass Events", EINA_VALUE_TYPE_CHAR, event);
eo_do(eo_obj, evas_obj_repeat_events_get(&event));
EO_DBG_INFO_BOOLEAN_APPEND(group, "Repeat Events", event);
EO_DBG_INFO_APPEND(group, "Repeat Events", EINA_VALUE_TYPE_CHAR, event);
eo_do(eo_obj, evas_obj_propagate_events_get(&event));
EO_DBG_INFO_BOOLEAN_APPEND(group, "Propagate Events", event);
EO_DBG_INFO_APPEND(group, "Propagate Events", EINA_VALUE_TYPE_CHAR, event);
const Eina_List *clipees;
eo_do(eo_obj, evas_obj_clipees_get(&clipees));
EO_DBG_INFO_BOOLEAN_APPEND(group, "Has clipees", (Eina_Bool) (!!clipees));
EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, (Eina_Bool) (!!clipees));
const Evas_Map *map = evas_object_map_get(eo_obj);
if (map)
@ -1965,9 +1965,9 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
Evas_Coord px, py, pz;
evas_map_point_coord_get(map, i, &px, &py, &pz);
Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(node, "Coords");
EO_DBG_INFO_INTEGER_APPEND(point, "x", px);
EO_DBG_INFO_INTEGER_APPEND(point, "y", py);
EO_DBG_INFO_INTEGER_APPEND(point, "z", pz);
EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px);
EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py);
EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz);
}
}
}

8
src/lib/evas/canvas/evas_object_text.c
View File

@ -953,14 +953,14 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
const char *text;
int size;
eo_do(eo_obj, evas_obj_text_font_get(&text, &size));
EO_DBG_INFO_TEXT_APPEND(group, "Font", text);
EO_DBG_INFO_INTEGER_APPEND(group, "Text size", size);
EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
eo_do(eo_obj, evas_obj_text_font_source_get(&text));
EO_DBG_INFO_TEXT_APPEND(group, "Font source", text);
EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
eo_do(eo_obj, evas_obj_text_text_get(&text));
EO_DBG_INFO_TEXT_APPEND(group, "Text", text);
EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, text);
}
EAPI void

4
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -10038,8 +10038,8 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
if (shorttext[37])
strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */
EO_DBG_INFO_TEXT_APPEND(group, "Style", style);
EO_DBG_INFO_TEXT_APPEND(group, "Text", shorttext);
EO_DBG_INFO_APPEND(group, "Style", EINA_VALUE_TYPE_STRING, style);
EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, shorttext);
}
/** @internal