From: Enlightenment S. <no-...@en...> - 2009-08-07 09:06:17
|
Log: Patch from Victor <vic...@gm...> to fix typo in edje_real_part_swallow. Thanks :) Author: devilhorns Date: 2009-08-07 02:06:04 -0700 (Fri, 07 Aug 2009) New Revision: 41630 Modified: trunk/edje/src/lib/edje_util.c Modified: trunk/edje/src/lib/edje_util.c =================================================================== --- trunk/edje/src/lib/edje_util.c 2009-08-07 01:35:16 UTC (rev 41629) +++ trunk/edje/src/lib/edje_util.c 2009-08-07 09:06:04 UTC (rev 41630) @@ -3,23 +3,20 @@ */ #include <string.h> - #include "edje_private.h" - +typedef struct _Edje_Box_Layout Edje_Box_Layout; struct _Edje_Box_Layout { - EINA_RBTREE; - Evas_Object_Box_Layout func; - void *(*layout_data_get)(void *); - void (*layout_data_free)(void *); - void *data; - void (*free_data)(void *); - char name[]; + EINA_RBTREE; + Evas_Object_Box_Layout func; + void *(*layout_data_get)(void *); + void (*layout_data_free)(void *); + void *data; + void (*free_data)(void *); + char name[]; }; -typedef struct _Edje_Box_Layout Edje_Box_Layout; - static Eina_Hash *_edje_color_class_hash = NULL; static Eina_Hash *_edje_color_class_member_hash = NULL; @@ -34,7 +31,6 @@ int _edje_freeze_calc_count = 0; typedef struct _Edje_List_Foreach_Data Edje_List_Foreach_Data; - struct _Edje_List_Foreach_Data { Eina_List *list; @@ -47,7 +43,8 @@ /************************** API Routines **************************/ -/* FIXDOC: These all need to be looked over, Verified/Expanded upon. I just got lazy and stopped putting FIXDOC next to each function in this file. */ +/* FIXDOC: These all need to be looked over, Verified/Expanded upon. + I just got lazy and stopped putting FIXDOC next to each function in this file. */ //#define FASTFREEZE 1 @@ -103,6 +100,7 @@ edje_thaw(void) { Evas_Object *data; + #ifdef FASTFREEZE _edje_freeze_val--; printf("fr -- ->%i\n", _edje_freeze_val); @@ -270,6 +268,7 @@ for (i = 0; i < ed->table_parts_size; i++) { Edje_Real_Part *rp; + rp = ed->table_parts[i]; if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object) edje_object_thaw(rp->swallowed_object); @@ -320,7 +319,8 @@ free(cc); return; } - if (!_edje_color_class_hash) _edje_color_class_hash = eina_hash_string_superfast_new(NULL); + if (!_edje_color_class_hash) + _edje_color_class_hash = eina_hash_string_superfast_new(NULL); eina_hash_add(_edje_color_class_hash, color_class, cc); } @@ -519,9 +519,12 @@ for (i = 0; i < ed->table_parts_size; i++) { Edje_Real_Part *rp; + rp = ed->table_parts[i]; if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object) - edje_object_color_class_set(rp->swallowed_object, color_class, r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3); + edje_object_color_class_set(rp->swallowed_object, color_class, + r, g, b, a, r2, g2, b2, a2, r3, g3, b3, + a3); } _edje_recalc(ed); @@ -558,6 +561,7 @@ for (i = 0; i < ed->table_parts_size; i++) { Edje_Real_Part *rp; + rp = ed->table_parts[i]; if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object) edje_object_color_class_del(rp->swallowed_object, color_class); @@ -681,7 +685,6 @@ memset(&fdata, 0, sizeof(Edje_List_Foreach_Data)); eina_hash_foreach(_edje_text_class_member_hash, _edje_text_class_list_foreach, &fdata); - return fdata.list; } @@ -756,9 +759,11 @@ for (i = 0; i < ed->table_parts_size; i++) { Edje_Real_Part *rp; + rp = ed->table_parts[i]; if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object) - edje_object_text_class_set(rp->swallowed_object, text_class, font, size); + edje_object_text_class_set(rp->swallowed_object, text_class, + font, size); } /* Add to edje's text class list */ @@ -878,6 +883,7 @@ for (i = 0; i < ed->table_parts_size; i++) { Edje_Real_Part *rp; + rp = ed->table_parts[i]; if (rp->part->type == EDJE_PART_TYPE_GROUP && rp->swallowed_object) edje_object_text_change_cb_set(rp->swallowed_object, func, data); @@ -1045,6 +1051,7 @@ { size_t len; const char *str; + if (last) { len = text - last; @@ -1070,6 +1077,7 @@ size_t len; const char *str = evas_textblock_escape_string_range_get (escape_start, text); + if (str) len = strlen(str); else @@ -1126,6 +1134,7 @@ else if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK) { char *text = _edje_text_escape(text_to_escape); + _edje_object_part_text_raw_set(obj, rp, part, text); free(text); } @@ -1172,7 +1181,6 @@ return NULL; } - /** Returns the selection text of the object part * @param obj A valid Evas_Object handle * @param part The part name @@ -2416,6 +2424,7 @@ void _edje_box_init(void) { + } void @@ -2619,6 +2628,7 @@ _edje_box_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__) { Edje_Real_Part *rp = data; + rp->edje->dirty = 1; _edje_recalc(rp->edje); } @@ -2725,9 +2735,8 @@ _edje_real_part_box_remove_all(Edje_Real_Part *rp, Eina_Bool clear) { Eina_List *children; - int i; + int i = 0; - i = 0; children = evas_object_box_children_get(rp->object); while (children) { @@ -2751,6 +2760,7 @@ _edje_table_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__) { Edje_Real_Part *rp = data; + rp->edje->dirty = 1; _edje_recalc(rp->edje); } @@ -2890,7 +2900,8 @@ Eina_Bool _edje_real_part_table_pack(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) { - Eina_Bool ret = evas_object_table_pack(rp->object, child_obj, col, row, colspan, rowspan); + Eina_Bool ret = + evas_object_table_pack(rp->object, child_obj, col, row, colspan, rowspan); _edje_table_child_add(rp, child_obj); @@ -2917,6 +2928,7 @@ while (children) { Evas_Object *child_obj = children->data; + _edje_table_child_remove(rp, child_obj); if (!evas_object_data_get(child_obj, "\377 edje.table_item")) { @@ -2933,6 +2945,7 @@ { Edje_Real_Part *rp; char **path; + path = ecore_str_split(part, EDJE_PART_PATH_SEPARATOR_STRING, 0); if (!path) return NULL; @@ -2948,6 +2961,7 @@ _edje_real_part_recursive_get_helper(Edje *ed, char **path) { Edje_Real_Part *rp; + //printf(" lookup: %s on %s\n", path[0], ed->parent ? ed->parent : "-"); rp = _edje_real_part_get(ed, path[0]); if (path[1] == NULL) return rp; @@ -3011,9 +3025,7 @@ if ((!ed) || (!color_class)) return; members = eina_hash_find(_edje_color_class_member_hash, color_class); if (members) - { - eina_hash_del(_edje_color_class_member_hash, color_class, members); - } + eina_hash_del(_edje_color_class_member_hash, color_class, members); members = eina_list_prepend(members, ed); if (!_edje_color_class_member_hash) _edje_color_class_member_hash = eina_hash_string_superfast_new(NULL); @@ -3032,9 +3044,7 @@ eina_hash_del(_edje_color_class_member_hash, color_class, members); members = eina_list_remove(members, ed); if (members) - { - eina_hash_add(_edje_color_class_member_hash, color_class, members); - } + eina_hash_add(_edje_color_class_member_hash, color_class, members); } /** @@ -3115,15 +3125,14 @@ /* Remove members list */ if (members) - { - eina_hash_del(_edje_text_class_member_hash, text_class, members); - } + eina_hash_del(_edje_text_class_member_hash, text_class, members); /* Update the member list */ members = eina_list_prepend(members, ed); /* Add the member list back */ - if (!_edje_text_class_member_hash) _edje_text_class_member_hash = eina_hash_string_superfast_new(NULL); + if (!_edje_text_class_member_hash) + _edje_text_class_member_hash = eina_hash_string_superfast_new(NULL); eina_hash_add(_edje_text_class_member_hash, text_class, members); } @@ -3140,9 +3149,7 @@ members = eina_list_remove(members, ed); if (members) - { - eina_hash_add(_edje_text_class_member_hash, text_class, members); - } + eina_hash_add(_edje_text_class_member_hash, text_class, members); } void @@ -3226,6 +3233,7 @@ _edje_unblock(Edje *ed) { int ret = 0; + if (!ed) return ret; ed->block--; @@ -3289,7 +3297,7 @@ rp->edje->obj); type = (char *)evas_object_type_get(obj_swallow); rp->swallow_params.min.w = 0; - rp->swallow_params.min.w = 0; + rp->swallow_params.min.h = 0; rp->swallow_params.max.w = -1; rp->swallow_params.max.h = -1; if ((type) && (!strcmp(type, "edje"))) @@ -3327,12 +3335,23 @@ if (h2 > 0) rp->swallow_params.max.h = h2; switch (am) { - case EVAS_ASPECT_CONTROL_NONE: rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NONE; break; - case EVAS_ASPECT_CONTROL_NEITHER: rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NEITHER; break; - case EVAS_ASPECT_CONTROL_HORIZONTAL: rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_HORIZONTAL; break; - case EVAS_ASPECT_CONTROL_VERTICAL: rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_VERTICAL; break; - case EVAS_ASPECT_CONTROL_BOTH: rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_BOTH; break; - default: break; + case EVAS_ASPECT_CONTROL_NONE: + rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NONE; + break; + case EVAS_ASPECT_CONTROL_NEITHER: + rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NEITHER; + break; + case EVAS_ASPECT_CONTROL_HORIZONTAL: + rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_HORIZONTAL; + break; + case EVAS_ASPECT_CONTROL_VERTICAL: + rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_VERTICAL; + break; + case EVAS_ASPECT_CONTROL_BOTH: + rp->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_BOTH; + break; + default: + break; } rp->swallow_params.aspect.w = aw; rp->swallow_params.aspect.h = ah; |
From: Enlightenment S. <no-...@en...> - 2009-09-02 15:48:53
|
Log: Formatting. Author: devilhorns Date: 2009-09-02 08:48:34 -0700 (Wed, 02 Sep 2009) New Revision: 42185 Modified: trunk/edje/src/lib/edje_textblock_styles.c Modified: trunk/edje/src/lib/edje_textblock_styles.c =================================================================== --- trunk/edje/src/lib/edje_textblock_styles.c 2009-09-02 14:33:11 UTC (rev 42184) +++ trunk/edje/src/lib/edje_textblock_styles.c 2009-09-02 15:48:34 UTC (rev 42185) @@ -40,8 +40,7 @@ static void _edje_format_param_parse(char *item, char **key, char **val) { - char *p; - char *k, *v; + char *p, *k, *v; p = strchr(item, '='); k = malloc(p - item + 1); @@ -57,8 +56,7 @@ _edje_format_parse(const char **s) { char *item, *ds; - const char *p; - const char *ss; + const char *p, *ss; const char *s1 = NULL; const char *s2 = NULL; @@ -111,8 +109,7 @@ static char * _edje_strbuf_append(char *s, const char *s2, int *len, int *alloc) { - int l2; - int tlen; + int l2, tlen; if (!s2) return s; l2 = strlen(s2); @@ -139,8 +136,7 @@ char *tmp; tmp = _edje_str_escape(unescaped_s); - if (!tmp) - return s; + if (!tmp) return s; s = _edje_strbuf_append(s, tmp, len, alloc); free(tmp); @@ -151,8 +147,7 @@ static char * _edje_format_reparse(Edje_File *edf, const char *str, Edje_Style_Tag **tag_ret) { - char *s2; - char *item; + char *s2, *item; char *newstr = NULL; const char *s; int newlen = 0, newalloc = 0; @@ -185,12 +180,13 @@ { if (_edje_font_is_embedded(edf, val)) { - char *tmpstr = NULL; - int tmplen = 0; - int tmpalloc = 0; + char *tmpstr = NULL; + int tmplen = 0, tmpalloc = 0; - tmpstr = _edje_strbuf_append(tmpstr, "fonts/", &tmplen, &tmpalloc); - tmpstr = _edje_strbuf_append(tmpstr, val, &tmplen, &tmpalloc); + tmpstr = _edje_strbuf_append(tmpstr, "fonts/", + &tmplen, &tmpalloc); + tmpstr = _edje_strbuf_append(tmpstr, val, + &tmplen, &tmpalloc); (*tag_ret)->font = eina_stringshare_add(tmpstr); free(tmpstr); } @@ -237,22 +233,17 @@ EINA_LIST_FOREACH(ed->file->styles, l, stl) { - Edje_Style_Tag *tag; Edje_Text_Class *tc; - char *buf = NULL; - int bufalloc = 0; - int buflen = 0; - int found = 0; - char *fontset = NULL, *fontsource = NULL; + int bufalloc = 0, buflen = 0, found = 0; + char *buf = NULL, *fontset = NULL, *fontsource = NULL; /* Make sure the style is already defined */ if (!stl->style) break; /* Make sure the style contains a text_class */ EINA_LIST_FOREACH(stl->tags, ll, tag) - if (tag->text_class) - found = 1; + if (tag->text_class) found = 1; /* No text classes , goto next style */ if (!found) continue; |
From: Enlightenment S. <no-...@en...> - 2009-12-30 02:07:06
|
Log: Fix printing of size_t value(s). (removes compiler warning). Author: devilhorns Date: 2009-12-29 18:06:59 -0800 (Tue, 29 Dec 2009) New Revision: 44776 Modified: trunk/edje/src/lib/edje_match.c Modified: trunk/edje/src/lib/edje_match.c =================================================================== --- trunk/edje/src/lib/edje_match.c 2009-12-30 01:36:14 UTC (rev 44775) +++ trunk/edje/src/lib/edje_match.c 2009-12-30 02:06:59 UTC (rev 44776) @@ -262,7 +262,7 @@ \ r = malloc(sizeof (Edje_Patterns) + \ eina_list_count(lst) \ - * sizeof (*r->finals) \ + * sizeof(*r->finals) \ * sizeof(*r->patterns)); \ if (!r) return NULL; \ \ @@ -288,7 +288,7 @@ r->patterns[i] = str; \ \ if (Show) \ - INF("%li [%s]", i, str); \ + INF("%lu [%s]", (unsigned long)i, str); \ \ r->finals[i] = 0; \ for (j = 0; str[j]; ++j) \ |
From: Enlightenment S. <no-...@en...> - 2010-02-26 06:01:16
|
Log: Fix FALSE...should be EINA_FALSE. Author: devilhorns Date: 2010-02-25 22:01:09 -0800 (Thu, 25 Feb 2010) New Revision: 46504 Modified: trunk/edje/src/lib/edje_util.c Modified: trunk/edje/src/lib/edje_util.c =================================================================== --- trunk/edje/src/lib/edje_util.c 2010-02-26 05:56:49 UTC (rev 46503) +++ trunk/edje/src/lib/edje_util.c 2010-02-26 06:01:09 UTC (rev 46504) @@ -900,7 +900,7 @@ { eina_hash_del(_edje_text_class_hash, text_class, tc); free(tc); - return FALSE; + return EINA_FALSE; } tc->size = size; |
From: Enlightenment S. <no-...@en...> - 2010-07-22 18:42:51
|
Log: Fix use of __UNUSED__ and fix some formatting. Author: devilhorns Date: 2010-07-22 11:42:44 -0700 (Thu, 22 Jul 2010) New Revision: 50437 Modified: trunk/edje/src/lib/edje_callbacks.c Modified: trunk/edje/src/lib/edje_callbacks.c =================================================================== --- trunk/edje/src/lib/edje_callbacks.c 2010-07-22 18:28:00 UTC (rev 50436) +++ trunk/edje/src/lib/edje_callbacks.c 2010-07-22 18:42:44 UTC (rev 50437) @@ -5,7 +5,7 @@ #include "edje_private.h" static void -_edje_hold_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) +_edje_hold_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Hold *ev; Edje *ed; @@ -24,7 +24,7 @@ } static void -_edje_focus_in_signal_cb(void *data, Evas * e, Evas_Object * obj, __UNUSED__ void *event_info) +_edje_focus_in_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__) { Edje *ed; Edje_Real_Part *rp; @@ -40,7 +40,7 @@ } static void -_edje_focus_out_signal_cb(void *data, Evas * e, Evas_Object * obj, __UNUSED__ void *event_info) +_edje_focus_out_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__) { Edje *ed; Edje_Real_Part *rp; @@ -56,7 +56,7 @@ } static void -_edje_mouse_in_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) +_edje_mouse_in_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_In *ev; Edje *ed; @@ -74,7 +74,7 @@ } static void -_edje_mouse_out_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) +_edje_mouse_out_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Out *ev; Edje *ed; @@ -92,7 +92,7 @@ } static void -_edje_mouse_down_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) +_edje_mouse_down_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Down *ev; Edje *ed; @@ -208,7 +208,7 @@ } static void -_edje_mouse_up_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) +_edje_mouse_up_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Up *ev; Edje *ed; @@ -276,7 +276,7 @@ } static void -_edje_mouse_move_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) +_edje_mouse_move_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Move *ev; Edje *ed; @@ -355,7 +355,7 @@ } static void -_edje_mouse_wheel_signal_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) +_edje_mouse_wheel_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Wheel *ev; Edje *ed; @@ -376,7 +376,7 @@ } Eina_Bool -_edje_timer_cb(__UNUSED__ void *data) +_edje_timer_cb(void *data __UNUSED__) { double t; Eina_List *l; |
From: Enlightenment S. <no-...@en...> - 2010-07-24 02:28:30
|
Log: Don't need 2 of the same variables. Author: devilhorns Date: 2010-07-23 19:28:24 -0700 (Fri, 23 Jul 2010) New Revision: 50473 Modified: trunk/edje/src/lib/edje_module.c Modified: trunk/edje/src/lib/edje_module.c =================================================================== --- trunk/edje/src/lib/edje_module.c 2010-07-24 02:17:08 UTC (rev 50472) +++ trunk/edje/src/lib/edje_module.c 2010-07-24 02:28:24 UTC (rev 50473) @@ -108,8 +108,6 @@ void _edje_module_shutdown(void) { - const char *data; - eina_module_list_free(_available_modules); if (_available_modules) { @@ -126,6 +124,7 @@ if (_modules_name) { const char *data; + EINA_LIST_FREE(_modules_name, data) { eina_stringshare_del(data); |
From: Enlightenment S. <no-...@en...> - 2010-07-31 01:21:37
|
Log: Don't use the same macro name in each file, gives nasty compiler warnings when using amalgamation. Author: devilhorns Date: 2010-07-30 18:21:30 -0700 (Fri, 30 Jul 2010) New Revision: 50696 Modified: trunk/edje/src/lib/edje_convert.c trunk/edje/src/lib/edje_edit.c Modified: trunk/edje/src/lib/edje_convert.c =================================================================== --- trunk/edje/src/lib/edje_convert.c 2010-07-30 22:40:41 UTC (rev 50695) +++ trunk/edje/src/lib/edje_convert.c 2010-07-31 01:21:30 UTC (rev 50696) @@ -402,7 +402,7 @@ result = eina_mempool_malloc(ce->mp.GROUP, sizeof (Edje_Part_Description_Common)); break; -#define ALLOC_POOL(Short, Type, Name) \ +#define CONVERT_ALLOC_POOL(Short, Type, Name) \ case EDJE_PART_TYPE_##Short: \ { \ Edje_Part_Description_##Type *Name; \ @@ -413,12 +413,12 @@ break; \ } - ALLOC_POOL(IMAGE, Image, image); - ALLOC_POOL(TEXT, Text, text); - ALLOC_POOL(TEXTBLOCK, Text, text); - ALLOC_POOL(BOX, Box, box); - ALLOC_POOL(TABLE, Table, table); - ALLOC_POOL(EXTERNAL, External, external_params); + CONVERT_ALLOC_POOL(IMAGE, Image, image); + CONVERT_ALLOC_POOL(TEXT, Text, text); + CONVERT_ALLOC_POOL(TEXTBLOCK, Text, text); + CONVERT_ALLOC_POOL(BOX, Box, box); + CONVERT_ALLOC_POOL(TABLE, Table, table); + CONVERT_ALLOC_POOL(EXTERNAL, External, external_params); } *result = oed->common; Modified: trunk/edje/src/lib/edje_edit.c =================================================================== --- trunk/edje/src/lib/edje_edit.c 2010-07-30 22:40:41 UTC (rev 50695) +++ trunk/edje/src/lib/edje_edit.c 2010-07-31 01:21:30 UTC (rev 50696) @@ -2654,7 +2654,7 @@ pd = eina_mempool_malloc(ce->mp.GROUP, sizeof (Edje_Part_Description_Common)); break; -#define ALLOC_POOL(Short, Type, Name) \ +#define EDIT_ALLOC_POOL(Short, Type, Name) \ case EDJE_PART_TYPE_##Short: \ { \ Edje_Part_Description_##Type *Name; \ @@ -2665,12 +2665,12 @@ break; \ } - ALLOC_POOL(IMAGE, Image, image); - ALLOC_POOL(TEXT, Text, text); - ALLOC_POOL(TEXTBLOCK, Text, text); - ALLOC_POOL(BOX, Box, box); - ALLOC_POOL(TABLE, Table, table); - ALLOC_POOL(EXTERNAL, External, external_params); + EDIT_ALLOC_POOL(IMAGE, Image, image); + EDIT_ALLOC_POOL(TEXT, Text, text); + EDIT_ALLOC_POOL(TEXTBLOCK, Text, text); + EDIT_ALLOC_POOL(BOX, Box, box); + EDIT_ALLOC_POOL(TABLE, Table, table); + EDIT_ALLOC_POOL(EXTERNAL, External, external_params); } return pd; |
From: Enlightenment S. <no-...@en...> - 2010-08-02 19:06:15
|
Log: Rename 'same named' macros. NB - Please use different macro names in the future for stuff like this (ie: not the same macro name in each file) as it spits nasty compiler warnings when compiling w/ amalgamation. Author: devilhorns Date: 2010-08-02 12:06:07 -0700 (Mon, 02 Aug 2010) New Revision: 50748 Modified: trunk/edje/src/lib/edje_convert.c trunk/edje/src/lib/edje_edit.c Modified: trunk/edje/src/lib/edje_convert.c =================================================================== --- trunk/edje/src/lib/edje_convert.c 2010-08-02 18:54:27 UTC (rev 50747) +++ trunk/edje/src/lib/edje_convert.c 2010-08-02 19:06:07 UTC (rev 50748) @@ -281,19 +281,19 @@ } ce->count.part = eina_list_count(oedc->parts); -#define EMN(Tp, Sz, Ce) \ +#define CONVERT_EMN(Tp, Sz, Ce) \ Ce->mp.Tp = eina_mempool_add("one_big", #Tp, NULL, sizeof (Sz), Ce->count.Tp); - EMN(RECTANGLE, Edje_Part_Description_Common, ce); - EMN(TEXT, Edje_Part_Description_Text, ce); - EMN(IMAGE, Edje_Part_Description_Image, ce); - EMN(SWALLOW, Edje_Part_Description_Common, ce); - EMN(TEXTBLOCK, Edje_Part_Description_Text, ce); - EMN(GROUP, Edje_Part_Description_Common, ce); - EMN(BOX, Edje_Part_Description_Box, ce); - EMN(TABLE, Edje_Part_Description_Table, ce); - EMN(EXTERNAL, Edje_Part_Description_External, ce); - EMN(part, Edje_Part, ce); + CONVERT_EMN(RECTANGLE, Edje_Part_Description_Common, ce); + CONVERT_EMN(TEXT, Edje_Part_Description_Text, ce); + CONVERT_EMN(IMAGE, Edje_Part_Description_Image, ce); + CONVERT_EMN(SWALLOW, Edje_Part_Description_Common, ce); + CONVERT_EMN(TEXTBLOCK, Edje_Part_Description_Text, ce); + CONVERT_EMN(GROUP, Edje_Part_Description_Common, ce); + CONVERT_EMN(BOX, Edje_Part_Description_Box, ce); + CONVERT_EMN(TABLE, Edje_Part_Description_Table, ce); + CONVERT_EMN(EXTERNAL, Edje_Part_Description_External, ce); + CONVERT_EMN(part, Edje_Part, ce); /* Change structure layout */ edc = calloc(1, sizeof (Edje_Part_Collection)); Modified: trunk/edje/src/lib/edje_edit.c =================================================================== --- trunk/edje/src/lib/edje_edit.c 2010-08-02 18:54:27 UTC (rev 50747) +++ trunk/edje/src/lib/edje_edit.c 2010-08-02 19:06:07 UTC (rev 50748) @@ -917,19 +917,19 @@ //cd = _alloc(sizeof(Code)); //codes = eina_list_append(codes, cd); -#define EMN(Tp, Sz, Ce) \ +#define EDIT_EMN(Tp, Sz, Ce) \ Ce->mp.Tp = eina_mempool_add("chained_mempool", #Tp, NULL, sizeof (Sz), 10); - EMN(RECTANGLE, Edje_Part_Description_Common, de); - EMN(TEXT, Edje_Part_Description_Text, de); - EMN(IMAGE, Edje_Part_Description_Image, de); - EMN(SWALLOW, Edje_Part_Description_Common, de); - EMN(TEXTBLOCK, Edje_Part_Description_Text, de); - EMN(GROUP, Edje_Part_Description_Common, de); - EMN(BOX, Edje_Part_Description_Box, de); - EMN(TABLE, Edje_Part_Description_Table, de); - EMN(EXTERNAL, Edje_Part_Description_External, de); - EMN(part, Edje_Part, de); + EDIT_EMN(RECTANGLE, Edje_Part_Description_Common, de); + EDIT_EMN(TEXT, Edje_Part_Description_Text, de); + EDIT_EMN(IMAGE, Edje_Part_Description_Image, de); + EDIT_EMN(SWALLOW, Edje_Part_Description_Common, de); + EDIT_EMN(TEXTBLOCK, Edje_Part_Description_Text, de); + EDIT_EMN(GROUP, Edje_Part_Description_Common, de); + EDIT_EMN(BOX, Edje_Part_Description_Box, de); + EDIT_EMN(TABLE, Edje_Part_Description_Table, de); + EDIT_EMN(EXTERNAL, Edje_Part_Description_External, de); + EDIT_EMN(part, Edje_Part, de); ed->file->collection_cache = eina_list_prepend(ed->file->collection_cache, pc); _edje_cache_coll_clean(ed->file); |
From: Enlightenment S. <no-...@en...> - 2010-08-18 16:51:16
|
Log: Fix 'may be used uninitialized' warnings. Author: devilhorns Date: 2010-08-18 09:51:10 -0700 (Wed, 18 Aug 2010) New Revision: 51292 Modified: trunk/edje/src/lib/edje_calc.c Modified: trunk/edje/src/lib/edje_calc.c =================================================================== --- trunk/edje/src/lib/edje_calc.c 2010-08-18 16:28:36 UTC (rev 51291) +++ trunk/edje/src/lib/edje_calc.c 2010-08-18 16:51:10 UTC (rev 51292) @@ -2099,7 +2099,7 @@ (desc1->map.rot.id_center >= 0) && (desc1->map.rot.id_center != ep->part->id)) { - Evas_Coord cx1, cy1, cz1, cx2, cy2, cz2; + Evas_Coord cx1 = 0, cy1 = 0, cz1 = 0, cx2 = 0, cy2 = 0, cz2 = 0; Edje_Real_Part *ep2 = ed->table_parts[desc1->map.rot.id_center % ed->table_parts_size]; @@ -2165,15 +2165,13 @@ (desc2->map.id_light >= 0) && (desc2->map.id_light != ep->part->id))) { - Evas_Coord lx, ly, lz; - int lr, lg, lb, lar, lag, lab; - Evas_Coord lx1, ly1, lz1; - int lr1, lg1, lb1, lar1, lag1, lab1, do1; - Evas_Coord lx2, ly2, lz2; - int lr2, lg2, lb2, lar2, lag2, lab2, do2; + Evas_Coord lx = 0, ly = 0, lz = 0; + int lr = 0, lg = 0, lb = 0, lar = 0, lag = 0, lab = 0; + Evas_Coord lx1 = 0, ly1 = 0, lz1 = 0; + int lr1 = 0, lg1 = 0, lb1 = 0, lar1 = 0, lag1 = 0, lab1 = 0, do1 = 0; + Evas_Coord lx2 = 0, ly2 = 0, lz2 = 0; + int lr2 = 0, lg2 = 0, lb2 = 0, lar2 = 0, lag2 = 0, lab2 = 0, do2 = 0; - do1 = do2 = 0; - if ((desc1) && (desc1->map.id_light >= 0) && (desc1->map.id_light != ep->part->id)) @@ -2329,13 +2327,11 @@ // calculate perspective point if (chosen_desc->map.persp_on) { - Evas_Coord px, py, zplane, foc; - Evas_Coord px1, py1, zplane1, foc1; - Evas_Coord px2, py2, zplane2, foc2; - int do1, do2; + Evas_Coord px = 0, py = 0, zplane = 0, foc = 0; + Evas_Coord px1 = 0, py1 = 0, zplane1 = 0, foc1 = 0; + Evas_Coord px2 = 0, py2 = 0, zplane2 = 0, foc2 = 0; + int do1 = 0, do2 = 0; - do1 = do2 = 0; - // default perspective point px = ed->x + (ed->w / 2); py = ed->y + (ed->h / 2); |
From: Enlightenment S. <no-...@en...> - 2010-08-18 16:51:33
|
Log: Remove unused variable. Author: devilhorns Date: 2010-08-18 09:51:27 -0700 (Wed, 18 Aug 2010) New Revision: 51293 Modified: trunk/edje/src/lib/edje_lua2.c Modified: trunk/edje/src/lib/edje_lua2.c =================================================================== --- trunk/edje/src/lib/edje_lua2.c 2010-08-18 16:51:10 UTC (rev 51292) +++ trunk/edje/src/lib/edje_lua2.c 2010-08-18 16:51:27 UTC (rev 51293) @@ -696,7 +696,6 @@ void _edje_lua2_script_func_move(Edje *ed) { - Eina_List *l; int err; // FIXME: move all objects created by script |
From: Enlightenment S. <no-...@en...> - 2010-08-18 16:55:55
|
Log: Fix more 'may be used uninitialized' & 'unused variable' warnings. Author: devilhorns Date: 2010-08-18 09:55:49 -0700 (Wed, 18 Aug 2010) New Revision: 51295 Modified: trunk/edje/src/lib/edje_lua2.c Modified: trunk/edje/src/lib/edje_lua2.c =================================================================== --- trunk/edje/src/lib/edje_lua2.c 2010-08-18 16:53:36 UTC (rev 51294) +++ trunk/edje/src/lib/edje_lua2.c 2010-08-18 16:55:49 UTC (rev 51295) @@ -873,8 +873,7 @@ { Edje_Lua_Timer *elt = data; lua_State *L; - int ret = 0; - int err; + int ret = 0, err = 0; if (!elt->obj.ed) return 0; L = elt->obj.ed->L; @@ -940,8 +939,7 @@ { Edje_Lua_Animator *ela = data; lua_State *L; - int ret = 0; - int err; + int ret = 0, err = 0; if (!ela->obj.ed) return 0; L = ela->obj.ed->L; @@ -1005,10 +1003,9 @@ { Edje_Lua_Transition *elt = data; lua_State *L; - int ret = 0; - int err; + int ret = 0, err = 0; double t; - + if (!elt->obj.ed) return 0; L = elt->obj.ed->L; if (!L) return 0; @@ -1200,7 +1197,7 @@ else if (!strcmp(type, "strset")) { Edje_Message_String_Set *emsg; - int i, n, len; + int i, n; const char *str; luaL_checktype(L, 3, LUA_TTABLE); n = lua_objlen(L, 3); @@ -1564,7 +1561,8 @@ { Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1); Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj; - int n, x, y; + int x, y; + if (!obj) return 0; if (!obj->is_evas_obj) return 0; if (_elua_2_int_get(L, 2, EINA_TRUE, "x", &x, "y", &y) > 0) @@ -1588,7 +1586,8 @@ { Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1); Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj; - int n, w, h; + int w, h; + if (!obj) return 0; if (!obj->is_evas_obj) return 0; if (_elua_2_int_get(L, 2, EINA_TRUE, "w", &w, "h", &h) > 0) @@ -1622,7 +1621,8 @@ { Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1); Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj; - int n, x, y, w, h; + int x, y, w, h; + if (!obj) return 0; if (!obj->is_evas_obj) return 0; if (_elua_4_int_get(L, 2, EINA_TRUE, "x", &x, "y", &y, "w", &w, "h", &h) > 0) @@ -1753,7 +1753,8 @@ { Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1); Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj; - int n, r, g, b, a; + int r, g, b, a; + if (!obj) return 0; if (!obj->is_evas_obj) return 0; if (_elua_4_int_get(L, 2, EINA_TRUE, "r", &r, "g", &g, "b", &b, "a", &a) > 0) |
From: Enlightenment S. <no-...@en...> - 2010-08-19 14:57:34
|
Log: Add UNUSED where needed. Cleanup some formatting. Author: devilhorns Date: 2010-08-19 07:57:23 -0700 (Thu, 19 Aug 2010) New Revision: 51398 Modified: trunk/edje/src/lib/edje_entry.c trunk/edje/src/lib/edje_external.c trunk/edje/src/lib/edje_lua2.c Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2010-08-19 14:41:24 UTC (rev 51397) +++ trunk/edje/src/lib/edje_entry.c 2010-08-19 14:57:23 UTC (rev 51398) @@ -921,22 +921,20 @@ static void -_range_del(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o, Entry *en) +_range_del(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o __UNUSED__, Entry *en) { evas_textblock_cursor_range_delete(en->sel_start, en->sel_end); } static void -_backspace(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) +_backspace(Evas_Textblock_Cursor *c, Evas_Object *o __UNUSED__, Entry *en __UNUSED__) { if (evas_textblock_cursor_char_prev(c)) - { - evas_textblock_cursor_char_delete(c); - } + evas_textblock_cursor_char_delete(c); } static void -_delete(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) +_delete(Evas_Textblock_Cursor *c, Evas_Object *o __UNUSED__, Entry *en __UNUSED__) { evas_textblock_cursor_char_delete(c); } Modified: trunk/edje/src/lib/edje_external.c =================================================================== --- trunk/edje/src/lib/edje_external.c 2010-08-19 14:41:24 UTC (rev 51397) +++ trunk/edje/src/lib/edje_external.c 2010-08-19 14:57:23 UTC (rev 51398) @@ -655,38 +655,34 @@ } void -_edje_external_recalc_apply(Edje *ed, Edje_Real_Part *ep, - Edje_Calc_Params *params, - Edje_Part_Description_Common *chosen_desc) +_edje_external_recalc_apply(Edje *ed __UNUSED__, Edje_Real_Part *ep, + Edje_Calc_Params *params __UNUSED__, + Edje_Part_Description_Common *chosen_desc __UNUSED__) { Edje_External_Type *type; Edje_Part_Description_External *ext; void *params1, *params2 = NULL; - if (!ep->swallowed_object) return; + if (!ep->swallowed_object) return; type = evas_object_data_get(ep->swallowed_object, "Edje_External_Type"); - if (!type) return; + if ((!type) || (!type->state_set)) return; - if (!type->state_set) return; - ext = (Edje_Part_Description_External*) ep->param1.description; params1 = ep->param1.external_params ? - ep->param1.external_params : - ext->external_params; + ep->param1.external_params : ext->external_params; if (ep->param2 && ep->param2->description) { ext = (Edje_Part_Description_External*) ep->param2->description; params2 = ep->param2->external_params ? - ep->param2->external_params : - ext->external_params; + ep->param2->external_params : ext->external_params; } type->state_set(type->data, ep->swallowed_object, - params1, params2, ep->description_pos); + params1, params2, ep->description_pos); } void * Modified: trunk/edje/src/lib/edje_lua2.c =================================================================== --- trunk/edje/src/lib/edje_lua2.c 2010-08-19 14:41:24 UTC (rev 51397) +++ trunk/edje/src/lib/edje_lua2.c 2010-08-19 14:57:23 UTC (rev 51398) @@ -451,7 +451,7 @@ } static int -_elua_custom_panic(lua_State *L) +_elua_custom_panic(lua_State *L __UNUSED__) { ERR("Lua Panic!!!!"); return 1; @@ -615,7 +615,7 @@ } static void -_elua_obj_free(lua_State *L, Edje_Lua_Obj *obj) +_elua_obj_free(lua_State *L __UNUSED__, Edje_Lua_Obj *obj) { if (!obj->free_func) return; obj->free_func(obj); @@ -2037,15 +2037,16 @@ } void -_edje_lua2_script_load(Edje_Part_Collection *edc, void *data, int size) +_edje_lua2_script_load(Edje_Part_Collection *edc __UNUSED__, void *data __UNUSED__, int size __UNUSED__) { _elua_init(); } void -_edje_lua2_script_unload(Edje_Part_Collection *edc) +_edje_lua2_script_unload(Edje_Part_Collection *edc __UNUSED__) { lua_State *L; + if (!lstate) return; L = lstate; lua_gc(L, LUA_GCCOLLECT, 0); |
From: Enlightenment S. <no-...@en...> - 2010-08-19 15:03:38
|
Log: Fix fat-finger copy-paste error. (Edje amalgamation would generate an eina_amalgamation file). Author: devilhorns Date: 2010-08-19 08:03:28 -0700 (Thu, 19 Aug 2010) New Revision: 51399 Modified: trunk/edje/src/lib/Makefile.am Modified: trunk/edje/src/lib/Makefile.am =================================================================== --- trunk/edje/src/lib/Makefile.am 2010-08-19 14:57:23 UTC (rev 51398) +++ trunk/edje/src/lib/Makefile.am 2010-08-19 15:03:28 UTC (rev 51399) @@ -56,9 +56,9 @@ @echo "# include \"config.h\"" >> edje_amalgamation.c @echo "#endif" >> edje_amalgamation.c - @echo "#ifndef _WIN32" >> eina_amalgamation.c - @echo "#define _GNU_SOURCE" >> eina_amalgamation.c - @echo "#endif" >> eina_amalgamation.c + @echo "#ifndef _WIN32" >> edje_amalgamation.c + @echo "#define _GNU_SOURCE" >> edje_amalgamation.c + @echo "#endif" >> edje_amalgamation.c @echo "#ifdef HAVE_ALLOCA_H" >> edje_amalgamation.c @echo "# include <alloca.h>" >> edje_amalgamation.c |
From: Enlightenment S. <no-...@en...> - 2010-09-28 00:24:50
|
Log: Fix edje entry callback to use Eina_Bool like ecore_imf is expecting. Author: devilhorns Date: 2010-09-27 17:24:44 -0700 (Mon, 27 Sep 2010) New Revision: 52832 Modified: trunk/edje/src/lib/edje_entry.c Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2010-09-28 00:21:48 UTC (rev 52831) +++ trunk/edje/src/lib/edje_entry.c 2010-09-28 00:24:44 UTC (rev 52832) @@ -2,7 +2,7 @@ #ifdef HAVE_ECORE_IMF -static int _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos); +static Eina_Bool _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos); static Eina_Bool _edje_entry_imf_event_commit_cb(void *data, int type, void *event); static Eina_Bool _edje_entry_imf_event_changed_cb(void *data, int type, void *event); static Eina_Bool _edje_entry_imf_event_delete_surrounding_cb(void *data, int type, void *event); @@ -1733,7 +1733,8 @@ ecore_imf_context_client_window_set(en->imf_context, rp->object); ecore_imf_context_client_canvas_set(en->imf_context, rp->edje->evas); - ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context, _edje_entry_imf_retrieve_surrounding_cb, rp); + ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context, + _edje_entry_imf_retrieve_surrounding_cb, rp); en->imf_ee_handler_commit = ecore_event_handler_add(ECORE_IMF_EVENT_COMMIT, _edje_entry_imf_event_commit_cb, rp->edje); en->imf_ee_handler_delete = ecore_event_handler_add(ECORE_IMF_EVENT_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb, rp); en->imf_ee_handler_changed = ecore_event_handler_add(ECORE_IMF_EVENT_PREEDIT_CHANGED, _edje_entry_imf_event_changed_cb, rp->edje); @@ -2450,7 +2451,7 @@ } #ifdef HAVE_ECORE_IMF -static int +static Eina_Bool _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx __UNUSED__, char **text, int *cursor_pos) { Edje_Real_Part *rp = data; |
From: Enlightenment S. <no-...@en...> - 2010-09-28 00:26:00
|
Log: And use Eina_Bool return values too. Author: devilhorns Date: 2010-09-27 17:25:54 -0700 (Mon, 27 Sep 2010) New Revision: 52833 Modified: trunk/edje/src/lib/edje_entry.c Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2010-09-28 00:24:44 UTC (rev 52832) +++ trunk/edje/src/lib/edje_entry.c 2010-09-28 00:25:54 UTC (rev 52833) @@ -2458,11 +2458,11 @@ Entry *en; const char *str; - if (!rp) return 0; + if (!rp) return EINA_FALSE; en = rp->entry_data; if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE)) - return 0; + return EINA_FALSE; if (text) { @@ -2471,11 +2471,9 @@ } if (cursor_pos) - { - *cursor_pos = evas_textblock_cursor_pos_get(en->cursor); - } + *cursor_pos = evas_textblock_cursor_pos_get(en->cursor); - return 1; + return EINA_TRUE; } static Eina_Bool |
From: Enlightenment S. <no-...@en...> - 2011-03-24 20:22:24
|
Log: Edje: Remove unused variable & fix formatting. Author: devilhorns Date: 2011-03-24 13:22:16 -0700 (Thu, 24 Mar 2011) New Revision: 58073 Trac: http://trac.enlightenment.org/e/changeset/58073 Modified: trunk/edje/src/lib/edje_smart.c Modified: trunk/edje/src/lib/edje_smart.c =================================================================== --- trunk/edje/src/lib/edje_smart.c 2011-03-24 16:05:49 UTC (rev 58072) +++ trunk/edje/src/lib/edje_smart.c 2011-03-24 20:22:16 UTC (rev 58073) @@ -28,13 +28,14 @@ EAPI Evas_Object * edje_object_add(Evas *evas) { - Edje *ed; Evas_Object *e; + if (!_edje_smart) { memset(&_edje_smart_parent, 0, sizeof(_edje_smart_parent)); _edje_object_smart_set(&_edje_smart_class); - _edje_smart = evas_smart_class_new((Evas_Smart_Class *)&_edje_smart_class); + _edje_smart = + evas_smart_class_new((Evas_Smart_Class *)&_edje_smart_class); } e = evas_object_smart_add(evas, _edje_smart); |
From: Enlightenment S. <no-...@en...> - 2011-04-09 05:48:53
|
Log: Edje: Edje_Text: Don't segfault on _edje_text_part_on_del if there is not 'part' Don't ask me how I found this one, but it happened :/ so trap for valid part before trying to use it. Author: devilhorns Date: 2011-04-08 22:48:47 -0700 (Fri, 08 Apr 2011) New Revision: 58516 Trac: http://trac.enlightenment.org/e/changeset/58516 Modified: trunk/edje/src/lib/edje_text.c Modified: trunk/edje/src/lib/edje_text.c =================================================================== --- trunk/edje/src/lib/edje_text.c 2011-04-09 05:44:18 UTC (rev 58515) +++ trunk/edje/src/lib/edje_text.c 2011-04-09 05:48:47 UTC (rev 58516) @@ -60,6 +60,7 @@ Edje_Part_Description_Text *desc; unsigned int i; + if (!pt) return; if (pt->type != EDJE_PART_TYPE_TEXT && pt->type != EDJE_PART_TYPE_TEXTBLOCK) return ; |
From: Enlightenment S. <no-...@en...> - 2011-06-10 16:41:51
|
Log: Edje: Fix 'variable may be used uninitialized' warning. Fix some formatting. Author: devilhorns Date: 2011-06-10 09:41:45 -0700 (Fri, 10 Jun 2011) New Revision: 60196 Trac: http://trac.enlightenment.org/e/changeset/60196 Modified: trunk/edje/src/lib/edje_entry.c Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2011-06-10 16:40:25 UTC (rev 60195) +++ trunk/edje/src/lib/edje_entry.c 2011-06-10 16:41:45 UTC (rev 60196) @@ -712,7 +712,7 @@ static void _anchors_update(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o, Entry *en) { - Eina_List *l, *ll, *range; + Eina_List *l, *ll, *range = NULL; Evas_Coord x, y, w, h; Evas_Object *smart, *clip; Sel *sel; @@ -734,8 +734,10 @@ while (an->sel) { sel = an->sel->data; - en->rp->edje->subobjs = eina_list_remove(en->rp->edje->subobjs, sel->obj_bg); - en->rp->edje->subobjs = eina_list_remove(en->rp->edje->subobjs, sel->obj_fg); + en->rp->edje->subobjs = + eina_list_remove(en->rp->edje->subobjs, sel->obj_bg); + en->rp->edje->subobjs = + eina_list_remove(en->rp->edje->subobjs, sel->obj_fg); if (sel->obj_bg) evas_object_del(sel->obj_bg); if (sel->obj_fg) evas_object_del(sel->obj_fg); if (sel->obj) evas_object_del(sel->obj); @@ -749,8 +751,8 @@ if (en->rp->edje->item_provider.func) { ob = en->rp->edje->item_provider.func - (en->rp->edje->item_provider.data, smart, - en->rp->part->name, an->name); + (en->rp->edje->item_provider.data, smart, + en->rp->part->name, an->name); evas_object_smart_member_add(ob, smart); evas_object_stack_above(ob, o); evas_object_clip_set(ob, clip); @@ -763,7 +765,8 @@ // for link anchors else { - range = evas_textblock_cursor_range_geometry_get(an->start, an->end); + range = + evas_textblock_cursor_range_geometry_get(an->start, an->end); if (eina_list_count(range) != eina_list_count(an->sel)) { while (an->sel) |
From: Enlightenment S. <no-...@en...> - 2011-07-23 23:00:21
|
Log: Edje: Add UNUSED where needed on the edje_entry obj. Author: devilhorns Date: 2011-07-23 16:00:14 -0700 (Sat, 23 Jul 2011) New Revision: 61621 Trac: http://trac.enlightenment.org/e/changeset/61621 Modified: trunk/edje/src/lib/edje_entry.c Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2011-07-23 19:25:06 UTC (rev 61620) +++ trunk/edje/src/lib/edje_entry.c 2011-07-23 23:00:14 UTC (rev 61621) @@ -316,7 +316,7 @@ } static void -_curs_end(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) +_curs_end(Evas_Textblock_Cursor *c, Evas_Object *o __UNUSED__, Entry *en __UNUSED__) { evas_textblock_cursor_paragraph_last(c); } |
From: Enlightenment S. <no-...@en...> - 2011-09-22 07:19:57
|
Log: Edje: if _edje_fetch fails and we are returning from here, then no need to fetch evas_object_evas_get. Use eina_stringshare_replace rather than del & add. Fix a little formatting. Author: devilhorns Date: 2011-09-22 00:19:50 -0700 (Thu, 22 Sep 2011) New Revision: 63533 Trac: http://trac.enlightenment.org/e/changeset/63533 Modified: trunk/edje/src/lib/edje_load.c Modified: trunk/edje/src/lib/edje_load.c =================================================================== --- trunk/edje/src/lib/edje_load.c 2011-09-22 07:00:10 UTC (rev 63532) +++ trunk/edje/src/lib/edje_load.c 2011-09-22 07:19:50 UTC (rev 63533) @@ -261,20 +261,21 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *group, const char *parent, Eina_List *group_path) { Edje *ed; + Evas *tev; + Eina_List *old_swallows; unsigned int n; Eina_List *parts = NULL; - Eina_List *old_swallows; int group_path_started = 0; - Evas *tev = evas_object_evas_get(obj); ed = _edje_fetch(obj); if (!ed) return 0; if (!file) file = ""; if (!group) group = ""; if (((ed->path) && (!strcmp(file, ed->path))) && - (ed->group) && (!strcmp(group, ed->group))) + (ed->group) && (!strcmp(group, ed->group))) return 1; + tev = evas_object_evas_get(obj); evas_event_freeze(tev); old_swallows = _edje_swallows_collect(ed); @@ -282,10 +283,9 @@ if (_edje_lua_script_only(ed)) _edje_lua_script_only_shutdown(ed); _edje_file_del(ed); - if (ed->path) eina_stringshare_del(ed->path); - if (ed->group) eina_stringshare_del(ed->group); - ed->path = eina_stringshare_add(file); - ed->group = eina_stringshare_add(group); + eina_stringshare_replace(&ed->path, file); + eina_stringshare_replace(&ed->group, group); + ed->parent = eina_stringshare_add(parent); ed->load_error = EDJE_LOAD_ERROR_NONE; @@ -308,7 +308,7 @@ { if (ed->collection->prop.orientation != EDJE_ORIENTATION_AUTO) ed->is_rtl = (ed->collection->prop.orientation == - EDJE_ORIENTATION_RTL); + EDJE_ORIENTATION_RTL); if (ed->collection->script_only) { @@ -387,8 +387,8 @@ _edje_ref(rp->edje); rp->part = ep; parts = eina_list_append(parts, rp); - rp->param1.description = _edje_part_description_find(ed, - rp, "default", 0.0); + rp->param1.description = + _edje_part_description_find(ed, rp, "default", 0.0); rp->chosen_description = rp->param1.description; if (!rp->param1.description) ERR("no default part description!"); @@ -773,7 +773,7 @@ } } } - + if (group_path_started) { const char *str; @@ -781,7 +781,7 @@ EINA_LIST_FREE(group_path, str) eina_stringshare_del(str); } - + /* reswallow any swallows that existed before setting the file */ if (old_swallows) { |
From: Enlightenment S. <no-...@en...> - 2012-05-26 08:34:32
|
Log: Edje: Fix compiler warnings for edje_entry_input_panel functions when Ecore is built without IMF support. Author: devilhorns Date: 2012-05-26 01:34:25 -0700 (Sat, 26 May 2012) New Revision: 71435 Trac: http://trac.enlightenment.org/e/changeset/71435 Modified: trunk/edje/src/lib/edje_entry.c Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2012-05-26 00:10:56 UTC (rev 71434) +++ trunk/edje/src/lib/edje_entry.c 2012-05-26 08:34:25 UTC (rev 71435) @@ -2751,8 +2751,13 @@ return en->input_panel_lang; } +#ifdef HAVE_ECORE_IMF void _edje_entry_input_panel_imdata_set(Edje_Real_Part *rp, const void *data, int len) +#else +void +_edje_entry_input_panel_imdata_set(Edje_Real_Part *rp, const void *data __UNUSED__, int len __UNUSED__) +#endif { Entry *en = rp->entry_data; if (!en) return; @@ -2762,8 +2767,13 @@ #endif } +#ifdef HAVE_ECORE_IMF void _edje_entry_input_panel_imdata_get(Edje_Real_Part *rp, void *data, int *len) +#else +void +_edje_entry_input_panel_imdata_get(Edje_Real_Part *rp, void *data __UNUSED__, int *len __UNUSED__) +#endif { Entry *en = rp->entry_data; if (!en) return; @@ -2773,8 +2783,13 @@ #endif } +#ifdef HAVE_ECORE_IMF void _edje_entry_input_panel_return_key_type_set(Edje_Real_Part *rp, Edje_Input_Panel_Return_Key_Type return_key_type) +#else +void +_edje_entry_input_panel_return_key_type_set(Edje_Real_Part *rp, Edje_Input_Panel_Return_Key_Type return_key_type __UNUSED__) +#endif { Entry *en = rp->entry_data; if (!en) return; @@ -2796,8 +2811,13 @@ return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT; } +#ifdef HAVE_ECORE_IMF void _edje_entry_input_panel_return_key_disabled_set(Edje_Real_Part *rp, Eina_Bool disabled) +#else +void +_edje_entry_input_panel_return_key_disabled_set(Edje_Real_Part *rp, Eina_Bool disabled __UNUSED__) +#endif { Entry *en = rp->entry_data; if (!en) return; |
From: Enlightenment S. <no-...@en...> - 2012-08-03 13:56:08
|
Log: Edje: Remove erroneous return. Really ? A return at the end of a function ?? Would the function actually return without this or would it just sit inside this function forever ? ;) </joke> Author: devilhorns Date: 2012-08-03 06:56:01 -0700 (Fri, 03 Aug 2012) New Revision: 74848 Trac: http://trac.enlightenment.org/e/changeset/74848 Modified: trunk/edje/src/lib/edje_util.c Modified: trunk/edje/src/lib/edje_util.c =================================================================== --- trunk/edje/src/lib/edje_util.c 2012-08-03 13:27:05 UTC (rev 74847) +++ trunk/edje/src/lib/edje_util.c 2012-08-03 13:56:01 UTC (rev 74848) @@ -1663,7 +1663,6 @@ if (x) *x -= rp->edje->x; if (y) *y -= rp->edje->y; } - return; } EAPI void |
From: Enlightenment S. <no-...@en...> - 2012-08-13 06:45:04
|
Log: Edje: Remove unused variable. Author: devilhorns Date: 2012-08-12 23:44:56 -0700 (Sun, 12 Aug 2012) New Revision: 75185 Trac: http://trac.enlightenment.org/e/changeset/75185 Modified: trunk/edje/src/lib/edje_main.c Modified: trunk/edje/src/lib/edje_main.c =================================================================== --- trunk/edje/src/lib/edje_main.c 2012-08-13 02:55:41 UTC (rev 75184) +++ trunk/edje/src/lib/edje_main.c 2012-08-13 06:44:56 UTC (rev 75185) @@ -206,7 +206,6 @@ Edje_Running_Program *runp; Edje_Pending_Program *pp; Edje_Signal_Callback *escb; - Edje_Color_Class *cc; Edje_Text_Class *tc; Edje_Text_Insert_Filter_Callback *cb; |
From: Enlightenment S. <no-...@en...> - 2012-08-31 06:12:50
|
Log: Edje: Remove unused variable. Author: devilhorns Date: 2012-08-30 23:12:43 -0700 (Thu, 30 Aug 2012) New Revision: 75915 Trac: http://trac.enlightenment.org/e/changeset/75915 Modified: trunk/edje/src/lib/edje_message_queue.c Modified: trunk/edje/src/lib/edje_message_queue.c =================================================================== --- trunk/edje/src/lib/edje_message_queue.c 2012-08-31 04:19:36 UTC (rev 75914) +++ trunk/edje/src/lib/edje_message_queue.c 2012-08-31 06:12:43 UTC (rev 75915) @@ -58,7 +58,6 @@ Edje_Message *em; Eina_List *groups = NULL; int gotos = 0; - unsigned int i; ed = _edje_fetch(obj); if (!ed) return; |
From: Enlightenment S. <no-...@en...> - 2012-09-10 08:01:08
|
Log: Edje: edje_fetch can return NULL so we should check that we have a valid edje from the parent before trying to use it. Author: devilhorns Date: 2012-09-10 01:00:59 -0700 (Mon, 10 Sep 2012) New Revision: 76371 Trac: http://trac.enlightenment.org/e/changeset/76371 Modified: trunk/edje/src/lib/edje_util.c Modified: trunk/edje/src/lib/edje_util.c =================================================================== --- trunk/edje/src/lib/edje_util.c 2012-09-10 07:58:58 UTC (rev 76370) +++ trunk/edje/src/lib/edje_util.c 2012-09-10 08:00:59 UTC (rev 76371) @@ -2499,7 +2499,7 @@ Edje *ed; parent = evas_object_smart_parent_get(obj); - ed = _edje_fetch(parent); + if (!(ed = _edje_fetch(parent))) return; ed->dirty = EINA_TRUE; ed->recalc_call = EINA_TRUE; // ZZZ: ??? |