From 8e386e3f7375e95c35a71b7289fa5570154a0cf2 Mon Sep 17 00:00:00 2001 From: doursse Date: Mon, 24 Mar 2008 08:22:01 +0000 Subject: [PATCH] remove trailing spaces SVN revision: 34101 --- legacy/edje/src/bin/edje_cc.h | 12 +- legacy/edje/src/bin/edje_cc_handlers.c | 222 ++++++++++++------------- legacy/edje/src/bin/edje_cc_mem.c | 4 +- legacy/edje/src/bin/edje_cc_sources.c | 22 +-- legacy/edje/src/bin/edje_decc.h | 2 +- legacy/edje/src/bin/edje_recc | 8 +- legacy/edje/src/lib/Edje_Edit.h | 150 ++++++++--------- legacy/edje/src/lib/edje_calc.c | 2 +- legacy/edje/src/lib/edje_edit.c | 8 +- legacy/edje/src/lib/edje_load.c | 16 +- legacy/edje/src/lib/edje_main.c | 2 +- legacy/edje/src/lib/edje_private.h | 2 +- legacy/edje/src/lib/edje_text.c | 2 +- legacy/edje/src/lib/edje_util.c | 52 +++--- 14 files changed, 252 insertions(+), 252 deletions(-) diff --git a/legacy/edje/src/bin/edje_cc.h b/legacy/edje/src/bin/edje_cc.h index 11f0097d3c..e61631881f 100644 --- a/legacy/edje/src/bin/edje_cc.h +++ b/legacy/edje/src/bin/edje_cc.h @@ -40,7 +40,7 @@ struct _Code { int l1, l2; char *shared; - Evas_List *programs; + Evas_List *programs; }; struct _Code_Program @@ -74,17 +74,17 @@ void data_queue_spectrum_slave_lookup(int *master, int *slave); void data_process_lookups(void); void data_process_scripts(void); void data_process_script_lookups(void); - + int is_verbatim(void); void track_verbatim(int on); void set_verbatim(char *s, int l1, int l2); char *get_verbatim(void); -int get_verbatim_line1(void); -int get_verbatim_line2(void); +int get_verbatim_line1(void); +int get_verbatim_line2(void); void compile(void); int is_param(int n); -int is_num(int n); +int is_num(int n); char *parse_str(int n); int parse_enum(int n, ...); int parse_int(int n); @@ -103,7 +103,7 @@ int source_append(Eet_File *ef); SrcFile_List *source_load(Eet_File *ef); int source_fontmap_save(Eet_File *ef, Evas_List *fonts); Font_List *source_fontmap_load(Eet_File *ef); - + void *mem_alloc(size_t size); char *mem_strdup(const char *s); #define SZ sizeof diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c index abecc51ef2..4b7ab9c542 100644 --- a/legacy/edje/src/bin/edje_cc_handlers.c +++ b/legacy/edje/src/bin/edje_cc_handlers.c @@ -186,10 +186,10 @@ New_Statement_Handler statement_handlers[] = {"collections.styles.style.name", st_styles_style_name}, /* dup */ {"collections.styles.style.base", st_styles_style_base}, /* dup */ {"collections.styles.style.tag", st_styles_style_tag}, /* dup */ - {"collections.color_classes.color_class.name", st_color_class_name}, /* dup */ - {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ - {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ - {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ + {"collections.color_classes.color_class.name", st_color_class_name}, /* dup */ + {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ + {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ + {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ {"collections.group.name", st_collections_group_name}, {"collections.group.alias", st_collections_group_alias}, {"collections.group.min", st_collections_group_min}, @@ -202,10 +202,10 @@ New_Statement_Handler statement_handlers[] = {"collections.group.styles.style.name", st_styles_style_name}, /* dup */ {"collections.group.styles.style.base", st_styles_style_base}, /* dup */ {"collections.group.styles.style.tag", st_styles_style_tag}, /* dup */ - {"collections.group.color_classes.color_class.name", st_color_class_name}, /* dup */ - {"collections.group.color_classes.color_class.color", st_color_class_color}, /* dup */ - {"collections.group.color_classes.color_class.color2", st_color_class_color2}, /* dup */ - {"collections.group.color_classes.color_class.color3", st_color_class_color3}, /* dup */ + {"collections.group.color_classes.color_class.name", st_color_class_name}, /* dup */ + {"collections.group.color_classes.color_class.color", st_color_class_color}, /* dup */ + {"collections.group.color_classes.color_class.color2", st_color_class_color2}, /* dup */ + {"collections.group.color_classes.color_class.color3", st_color_class_color3}, /* dup */ {"collections.group.parts.image", st_images_image}, /* dup */ {"collections.group.parts.images.image", st_images_image}, /* dup */ {"collections.group.parts.font", st_fonts_font}, /* dup */ @@ -213,10 +213,10 @@ New_Statement_Handler statement_handlers[] = {"collections.group.parts.styles.style.name", st_styles_style_name}, /* dup */ {"collections.group.parts.styles.style.base", st_styles_style_base}, /* dup */ {"collections.group.parts.styles.style.tag", st_styles_style_tag}, /* dup */ - {"collections.group.parts.color_classes.color_class.name", st_color_class_name}, /* dup */ - {"collections.group.parts.color_classes.color_class.color", st_color_class_color}, /* dup */ - {"collections.group.parts.color_classes.color_class.color2", st_color_class_color2}, /* dup */ - {"collections.group.parts.color_classes.color_class.color3", st_color_class_color3}, /* dup */ + {"collections.group.parts.color_classes.color_class.name", st_color_class_name}, /* dup */ + {"collections.group.parts.color_classes.color_class.color", st_color_class_color}, /* dup */ + {"collections.group.parts.color_classes.color_class.color2", st_color_class_color2}, /* dup */ + {"collections.group.parts.color_classes.color_class.color3", st_color_class_color3}, /* dup */ {"collections.group.parts.part.name", st_collections_group_parts_part_name}, {"collections.group.parts.part.type", st_collections_group_parts_part_type}, {"collections.group.parts.part.effect", st_collections_group_parts_part_effect}, @@ -238,10 +238,10 @@ New_Statement_Handler statement_handlers[] = {"collections.group.parts.part.styles.style.name", st_styles_style_name}, /* dup */ {"collections.group.parts.part.styles.style.base", st_styles_style_base}, /* dup */ {"collections.group.parts.part.styles.style.tag", st_styles_style_tag}, /* dup */ - {"collections.group.parts.part.color_classes.color_class.name", st_color_class_name}, /* dup */ - {"collections.group.parts.part.color_classes.color_class.color", st_color_class_color}, /* dup */ - {"collections.group.parts.part.color_classes.color_class.color2", st_color_class_color2}, /* dup */ - {"collections.group.parts.part.color_classes.color_class.color3", st_color_class_color3}, /* dup */ + {"collections.group.parts.part.color_classes.color_class.name", st_color_class_name}, /* dup */ + {"collections.group.parts.part.color_classes.color_class.color", st_color_class_color}, /* dup */ + {"collections.group.parts.part.color_classes.color_class.color2", st_color_class_color2}, /* dup */ + {"collections.group.parts.part.color_classes.color_class.color3", st_color_class_color3}, /* dup */ {"collections.group.parts.part.description.inherit", st_collections_group_parts_part_description_inherit}, {"collections.group.parts.part.description.state", st_collections_group_parts_part_description_state}, {"collections.group.parts.part.description.visible", st_collections_group_parts_part_description_visible}, @@ -306,10 +306,10 @@ New_Statement_Handler statement_handlers[] = {"collections.group.parts.part.description.styles.style.name", st_styles_style_name}, /* dup */ {"collections.group.parts.part.description.styles.style.base", st_styles_style_base}, /* dup */ {"collections.group.parts.part.description.styles.style.tag", st_styles_style_tag}, /* dup */ - {"collections.group.parts.part.description.color_classes.color_class.name", st_color_class_name}, /* dup */ - {"collections.group.parts.part.description.color_classes.color_class.color", st_color_class_color}, /* dup */ - {"collections.group.parts.part.description.color_classes.color_class.color2", st_color_class_color2}, /* dup */ - {"collections.group.parts.part.description.color_classes.color_class.color3", st_color_class_color3}, /* dup */ + {"collections.group.parts.part.description.color_classes.color_class.name", st_color_class_name}, /* dup */ + {"collections.group.parts.part.description.color_classes.color_class.color", st_color_class_color}, /* dup */ + {"collections.group.parts.part.description.color_classes.color_class.color2", st_color_class_color2}, /* dup */ + {"collections.group.parts.part.description.color_classes.color_class.color3", st_color_class_color3}, /* dup */ {"collections.group.parts.part.description.programs.image", st_images_image}, /* dup */ {"collections.group.parts.part.description.programs.images.image", st_images_image}, /* dup */ {"collections.group.parts.part.description.programs.font", st_fonts_font}, /* dup */ @@ -541,18 +541,18 @@ st_images_image(void) { Edje_Image_Directory_Entry *img; int v; - + if (!edje_file->image_dir) edje_file->image_dir = mem_alloc(SZ(Edje_Image_Directory)); img = mem_alloc(SZ(Edje_Image_Directory_Entry)); img->entry = parse_str(0); { Evas_List *l; - + for (l = edje_file->image_dir->entries; l; l = l->next) { Edje_Image_Directory_Entry *limg; - + limg = l->data; if (!strcmp(limg->entry, img->entry)) { @@ -632,20 +632,20 @@ st_fonts_font(void) Edje_Font_Directory_Entry *fnt; check_arg_count(2); - + if (!edje_file->font_dir) edje_file->font_dir = mem_alloc(SZ(Edje_Font_Directory)); - + fn = mem_alloc(SZ(Font)); fn->file = parse_str(0); fn->name = parse_str(1); { Evas_List *l; - + for (l = fonts; l; l = l->next) { Font *lfn; - + lfn = l->data; if (!strcmp(lfn->name, fn->name)) { @@ -657,7 +657,7 @@ st_fonts_font(void) } } fonts = evas_list_append(fonts, fn); - + if (edje_file->font_dir) { fnt = mem_alloc(SZ(Edje_Font_Directory_Entry)); @@ -696,7 +696,7 @@ st_data_item(void) Edje_Data *di; check_arg_count(2); - + di = mem_alloc(SZ(Edje_Data)); di->key = parse_str(0); di->value = parse_str(1); @@ -849,7 +849,7 @@ st_color_class_name(void) { Edje_Color_Class *cc, *tcc; Evas_List *l; - + cc = evas_list_data(evas_list_last(edje_file->color_classes)); cc->name = parse_str(0); for (l = edje_file->color_classes; l; l = l->next) @@ -878,7 +878,7 @@ static void st_color_class_color(void) { Edje_Color_Class *cc; - + check_arg_count(4); cc = evas_list_data(evas_list_last(edje_file->color_classes)); @@ -902,7 +902,7 @@ static void st_color_class_color2(void) { Edje_Color_Class *cc; - + check_arg_count(4); cc = evas_list_data(evas_list_last(edje_file->color_classes)); @@ -926,7 +926,7 @@ static void st_color_class_color3(void) { Edje_Color_Class *cc; - + check_arg_count(4); cc = evas_list_data(evas_list_last(edje_file->color_classes)); @@ -1045,7 +1045,7 @@ static void ob_styles_style(void) { Edje_Style *stl; - + stl = mem_alloc(SZ(Edje_Style)); edje_file->styles = evas_list_append(edje_file->styles, stl); } @@ -1065,7 +1065,7 @@ st_styles_style_name(void) { Edje_Style *stl, *tstl; Evas_List *l; - + stl = evas_list_data(evas_list_last(edje_file->styles)); stl->name = parse_str(0); for (l = edje_file->styles; l; l = l->next) @@ -1096,7 +1096,7 @@ st_styles_style_base(void) { Edje_Style *stl; Edje_Style_Tag *tag; - + stl = evas_list_data(evas_list_last(edje_file->styles)); if (stl->tags) { @@ -1118,14 +1118,14 @@ st_styles_style_base(void) [tag name] [style properties string] @effect Style to be applied only to text between style \..\. - @endproperty + @endproperty */ static void st_styles_style_tag(void) { Edje_Style *stl; Edje_Style_Tag *tag; - + stl = evas_list_data(evas_list_last(edje_file->styles)); tag = mem_alloc(SZ(Edje_Style_Tag)); tag->key = parse_str(0); @@ -1188,15 +1188,15 @@ ob_collections_group(void) Edje_Part_Collection_Directory_Entry *de; Edje_Part_Collection *pc; Code *cd; - + de = mem_alloc(SZ(Edje_Part_Collection_Directory_Entry)); edje_file->collection_dir->entries = evas_list_append(edje_file->collection_dir->entries, de); de->id = evas_list_count(edje_file->collection_dir->entries) - 1; - + pc = mem_alloc(SZ(Edje_Part_Collection)); edje_collections = evas_list_append(edje_collections, pc); pc->id = evas_list_count(edje_collections) - 1; - + cd = mem_alloc(SZ(Code)); codes = evas_list_append(codes, cd); } @@ -1218,7 +1218,7 @@ st_collections_group_name(void) Edje_Part_Collection_Directory_Entry *de; check_arg_count(1); - + de = evas_list_data(evas_list_last(edje_file->collection_dir->entries)); de->entry = parse_str(0); } @@ -1241,7 +1241,7 @@ st_collections_group_alias(void) check_arg_count(1); de = evas_list_data(evas_list_last(edje_file->collection_dir->entries)); - + alias = mem_alloc(SZ(Edje_Part_Collection_Directory_Entry)); alias->id = de->id; alias->entry = parse_str(0); @@ -1266,7 +1266,7 @@ st_collections_group_min(void) Edje_Part_Collection *pc; check_arg_count(2); - + pc = evas_list_data(evas_list_last(edje_collections)); pc->prop.min.w = parse_int_range(0, 0, 0x7fffffff); pc->prop.min.h = parse_int_range(1, 0, 0x7fffffff); @@ -1289,7 +1289,7 @@ st_collections_group_max(void) Edje_Part_Collection *pc; check_arg_count(2); - + pc = evas_list_data(evas_list_last(edje_collections)); pc->prop.max.w = parse_int_range(0, 0, 0x7fffffff); pc->prop.max.h = parse_int_range(1, 0, 0x7fffffff); @@ -1328,15 +1328,15 @@ ob_collections_group_script(void) { Edje_Part_Collection *pc; Code *cd; - + pc = evas_list_data(evas_list_last(edje_collections)); cd = evas_list_data(evas_list_last(codes)); - + if (!is_verbatim()) track_verbatim(1); else { char *s; - + s = get_verbatim(); if (s) { @@ -1361,7 +1361,7 @@ st_collections_group_data_item(void) Edje_Data *di; check_arg_count(2); - + pc = evas_list_data(evas_list_last(edje_collections)); di = mem_alloc(SZ(Edje_Data)); di->key = parse_str(0); @@ -1401,10 +1401,10 @@ st_collections_group_data_item(void) */ static void ob_collections_group_parts_part(void) -{ +{ Edje_Part_Collection *pc; Edje_Part *ep; - + ep = mem_alloc(SZ(Edje_Part)); pc = evas_list_data(evas_list_last(edje_collections)); pc->parts = evas_list_append(pc->parts, ep); @@ -1439,18 +1439,18 @@ st_collections_group_parts_part_name(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); ep->name = parse_str(0); { Evas_List *l; - + for (l = pc->parts; l; l = l->next) { Edje_Part *lep; - + lep = l->data; if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name))) { @@ -1487,10 +1487,10 @@ st_collections_group_parts_part_type(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); - ep->type = parse_enum(0, + ep->type = parse_enum(0, "NONE", EDJE_PART_TYPE_NONE, "RECT", EDJE_PART_TYPE_RECTANGLE, "TEXT", EDJE_PART_TYPE_TEXT, @@ -1521,7 +1521,7 @@ st_collections_group_parts_part_mouse_events(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); ep->mouse_events = parse_bool(0); @@ -1545,7 +1545,7 @@ st_collections_group_parts_part_repeat_events(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); ep->repeat_events = parse_bool(0); @@ -1565,7 +1565,7 @@ st_collections_group_parts_part_repeat_events(void) signals emitted, even outside the object, until the button is released. @li NOGRAB, the effect will be limited to the part's container. - container. + container. @endproperty */ static void @@ -1602,7 +1602,7 @@ st_collections_group_parts_part_precise_is_inside(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); ep->precise_is_inside = parse_bool(0); @@ -1627,7 +1627,7 @@ st_collections_group_parts_part_use_alternate_font_metrics(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); ep->use_alternate_font_metrics = parse_bool(0); @@ -1651,12 +1651,12 @@ st_collections_group_parts_part_clip_to_id(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ep->clip_to_id)); free(name); @@ -1681,7 +1681,7 @@ st_collections_group_parts_part_source(void) Edje_Part *ep; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); @@ -1728,7 +1728,7 @@ st_collections_group_parts_part_effect(void) pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); - ep->effect = parse_enum(0, + ep->effect = parse_enum(0, "NONE", EDJE_TEXT_EFFECT_NONE, "PLAIN", EDJE_TEXT_EFFECT_PLAIN, "OUTLINE", EDJE_TEXT_EFFECT_OUTLINE, @@ -1760,8 +1760,8 @@ st_collections_group_parts_part_effect(void) } @description When this block is used the resulting part can be dragged around the - interface, do not confuse with external drag & drop. By default Edje - (and most applications) will attempt to use the minimal size possible + interface, do not confuse with external drag & drop. By default Edje + (and most applications) will attempt to use the minimal size possible for a dragable part. If the min property is not set in the description the part will be (most likely) set to 0px width and 0px height, thus invisible. @@ -1848,7 +1848,7 @@ st_collections_group_parts_part_dragable_confine(void) ep = evas_list_data(evas_list_last(pc->parts)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ep->dragable.confine_id)); free(name); @@ -1878,7 +1878,7 @@ st_collections_group_parts_part_dragable_events(void) ep = evas_list_data(evas_list_last(pc->parts)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ep->dragable.events_id)); free(name); @@ -1921,9 +1921,9 @@ ob_collections_group_parts_part_description(void) Edje_Part_Collection *pc; Edje_Part *ep; Edje_Part_Description *ed; - + pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + ep = evas_list_data(evas_list_last(pc->parts)); ed = mem_alloc(SZ(Edje_Part_Description)); if (!ep->default_desc) ep->default_desc = ed; @@ -2105,7 +2105,7 @@ st_collections_group_parts_part_description_inherit(void) for (l = parent->image.tween_list; l; l = l->next) { Edje_Part_Image_Id *iid, *iid_new; - + iid = l->data; iid_new = mem_alloc(SZ(Edje_Part_Image_Id)); data_queue_image_slave_lookup(&(iid->id), &(iid_new->id)); @@ -2147,9 +2147,9 @@ st_collections_group_parts_part_description_state(void) char *s; check_arg_count(2); - + pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + ep = evas_list_data(evas_list_last(pc->parts)); ed = ep->default_desc; if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); @@ -2185,9 +2185,9 @@ st_collections_group_parts_part_description_visible(void) Edje_Part_Description *ed; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); - ep = evas_list_data(evas_list_last(pc->parts)); + ep = evas_list_data(evas_list_last(pc->parts)); ed = ep->default_desc; if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); ed->visible = parse_bool(0); @@ -2388,7 +2388,7 @@ st_collections_group_parts_part_description_aspect_preference(void) ep = evas_list_data(evas_list_last(pc->parts)); ed = ep->default_desc; if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); - ed->aspect.prefer = parse_enum(0, + ed->aspect.prefer = parse_enum(0, "NONE", EDJE_ASPECT_PREFER_NONE, "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL, "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL, @@ -2416,7 +2416,7 @@ st_collections_group_parts_part_description_color_class(void) Edje_Part_Description *ed; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); ed = ep->default_desc; @@ -2615,7 +2615,7 @@ st_collections_group_parts_part_description_rel1_to(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->rel1.id_x)); data_queue_part_lookup(pc, name, &(ed->rel1.id_y)); @@ -2649,7 +2649,7 @@ st_collections_group_parts_part_description_rel1_to_x(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->rel1.id_x)); free(name); @@ -2683,7 +2683,7 @@ st_collections_group_parts_part_description_rel1_to_y(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->rel1.id_y)); free(name); @@ -2739,7 +2739,7 @@ st_collections_group_parts_part_description_rel2_to(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->rel2.id_x)); data_queue_part_lookup(pc, name, &(ed->rel2.id_y)); @@ -2762,7 +2762,7 @@ st_collections_group_parts_part_description_rel2_to_x(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->rel2.id_x)); free(name); @@ -2784,7 +2784,7 @@ st_collections_group_parts_part_description_rel2_to_y(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->rel2.id_y)); free(name); @@ -2845,7 +2845,7 @@ st_collections_group_parts_part_description_image_normal(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_image_lookup(name, &(ed->image.id)); free(name); @@ -2889,7 +2889,7 @@ st_collections_group_parts_part_description_image_tween(void) { char *name; Edje_Part_Image_Id *iid; - + iid = mem_alloc(SZ(Edje_Part_Image_Id)); ed->image.tween_list = evas_list_append(ed->image.tween_list, iid); name = parse_str(0); @@ -2935,7 +2935,7 @@ st_collections_group_parts_part_description_image_border(void) ed->border.l = parse_int_range(0, 0, 0x7fffffff); ed->border.r = parse_int_range(1, 0, 0x7fffffff); ed->border.t = parse_int_range(2, 0, 0x7fffffff); - ed->border.b = parse_int_range(3, 0, 0x7fffffff); + ed->border.b = parse_int_range(3, 0, 0x7fffffff); } /** @@ -3200,8 +3200,8 @@ st_collections_group_parts_part_description_fill_origin_relative(void) ed = ep->default_desc; if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); - ed->fill.pos_rel_x = parse_float_range(0, -999999999.0, 999999999.0); - ed->fill.pos_rel_y = parse_float_range(1, -999999999.0, 999999999.0); + ed->fill.pos_rel_x = parse_float_range(0, -999999999.0, 999999999.0); + ed->fill.pos_rel_y = parse_float_range(1, -999999999.0, 999999999.0); } /** @@ -3295,8 +3295,8 @@ st_collections_group_parts_part_description_fill_size_relative(void) exit(-1); } - ed->fill.rel_x = parse_float_range(0, 0.0, 999999999.0); - ed->fill.rel_y = parse_float_range(1, 0.0, 999999999.0); + ed->fill.rel_x = parse_float_range(0, 0.0, 999999999.0); + ed->fill.rel_y = parse_float_range(1, 0.0, 999999999.0); } /** @@ -3381,7 +3381,7 @@ st_collections_group_parts_part_description_text_text(void) Edje_Part_Description *ed; char *str = NULL; int i; - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); @@ -3399,7 +3399,7 @@ st_collections_group_parts_part_description_text_text(void) for (i = 0; ;i++) { char *s; - + if (!is_param(i)) break; s = parse_str(i); if (!str) str = s; @@ -3433,7 +3433,7 @@ st_collections_group_parts_part_description_text_text_class(void) Edje_Part_Description *ed; check_arg_count(1); - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->parts)); @@ -3755,7 +3755,7 @@ st_collections_group_parts_part_description_text_source(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->text.id_source)); free(name); @@ -3799,7 +3799,7 @@ st_collections_group_parts_part_description_text_text_source(void) if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); { char *name; - + name = parse_str(0); data_queue_part_lookup(pc, name, &(ed->text.id_text_source)); free(name); @@ -3844,7 +3844,7 @@ st_collections_group_parts_part_description_text_elipsis(void) ed->text.elipsis = parse_float_range(0, 0.0, 1.0); } -static void +static void st_collections_group_parts_part_description_gradient_type(void) { Edje_Part_Collection *pc; @@ -3869,7 +3869,7 @@ st_collections_group_parts_part_description_gradient_type(void) ed->gradient.type = parse_str(0); } -static void +static void st_collections_group_parts_part_description_gradient_spectrum(void) { Edje_Part_Collection *pc; @@ -3894,7 +3894,7 @@ st_collections_group_parts_part_description_gradient_spectrum(void) { char *name; - + name = parse_str(0); data_queue_spectrum_lookup(name, &(ed->gradient.id)); free(name); @@ -4026,7 +4026,7 @@ ob_collections_group_programs_program(void) { Edje_Part_Collection *pc; Edje_Program *ep; - + pc = evas_list_data(evas_list_last(edje_collections)); ep = mem_alloc(SZ(Edje_Program)); pc->programs = evas_list_append(pc->programs, ep); @@ -4048,11 +4048,11 @@ st_collections_group_programs_program_name(void) ep->name = parse_str(0); { Evas_List *l; - + for (l = pc->programs; l; l = l->next) { Edje_Program *lep; - + lep = l->data; if ((lep != ep) && (lep->name) && (!strcmp(lep->name, ep->name))) { @@ -4191,10 +4191,10 @@ st_collections_group_programs_program_target(void) { Edje_Program_Target *et; char *name; - + et = mem_alloc(SZ(Edje_Program_Target)); ep->targets = evas_list_append(ep->targets, et); - + name = parse_str(0); if (ep->action == EDJE_ACTION_TYPE_STATE_SET) data_queue_part_lookup(pc, name, &(et->id)); @@ -4230,13 +4230,13 @@ st_collections_group_programs_program_after(void) { Edje_Program_After *pa; char *name; - + name = parse_str(0); - + pa = mem_alloc(SZ(Edje_Program_After)); pa->id = -1; ep->after = evas_list_append(ep->after, pa); - + data_queue_program_lookup(pc, name, &(pa->id)); free(name); } @@ -4248,21 +4248,21 @@ ob_collections_group_programs_program_script(void) Edje_Part_Collection *pc; Edje_Program *ep; Code *cd; - + pc = evas_list_data(evas_list_last(edje_collections)); ep = evas_list_data(evas_list_last(pc->programs)); cd = evas_list_data(evas_list_last(codes)); - + if (!is_verbatim()) track_verbatim(1); else { char *s; - + s = get_verbatim(); if (s) { Code_Program *cp; - + cp = mem_alloc(SZ(Code_Program)); cp->l1 = get_verbatim_line1(); cp->l2 = get_verbatim_line2(); diff --git a/legacy/edje/src/bin/edje_cc_mem.c b/legacy/edje/src/bin/edje_cc_mem.c index bbebeeb8f3..1691d64c65 100644 --- a/legacy/edje/src/bin/edje_cc_mem.c +++ b/legacy/edje/src/bin/edje_cc_mem.c @@ -4,7 +4,7 @@ void * mem_alloc(size_t size) { void *mem; - + mem = calloc(1, size); if (mem) return mem; fprintf(stderr, "%s: Error. %s:%i memory allocation of %i bytes failed. %s\n", @@ -17,7 +17,7 @@ char * mem_strdup(const char *s) { void *str; - + str = strdup(s); if (str) return str; fprintf(stderr, "%s: Error. %s:%i memory allocation of %i bytes failed. %s. string being duplicated: \"%s\"\n", diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c index 526fb6154b..31368f3d5d 100644 --- a/legacy/edje/src/bin/edje_cc_sources.c +++ b/legacy/edje/src/bin/edje_cc_sources.c @@ -30,7 +30,7 @@ void source_edd(void) { Eet_Data_Descriptor_Class eddc; - + eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION; eddc.func.mem_alloc = NULL; eddc.func.mem_free = NULL; @@ -45,21 +45,21 @@ source_edd(void) eddc.func.hash_free = evas_hash_free; eddc.func.str_direct_alloc = _edje_str_direct_alloc; eddc.func.str_direct_free = _edje_str_direct_free; - + NEWD("srcfile", SrcFile); _srcfile_edd = eet_data_descriptor3_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "name", name, EET_T_INLINED_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "file", file, EET_T_INLINED_STRING); - + NEWD("srcfile_list", SrcFile_List); _srcfile_list_edd = eet_data_descriptor3_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_srcfile_list_edd, SrcFile_List, "list", list, _srcfile_edd); - + NEWD("font", Font); _font_edd = eet_data_descriptor3_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "file", file, EET_T_INLINED_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "name", name, EET_T_INLINED_STRING); - + NEWD("font_list", Font_List); _font_list_edd = eet_data_descriptor3_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_font_list_edd, Font_List, "list", list, _font_edd); @@ -102,7 +102,7 @@ source_fetch_file(const char *fil, const char *filname) int forgetit = 0; int haveinclude = 0; char *file = NULL, *fname = NULL; - + p = buf; while ((!forgetit) && (*p)) { @@ -186,8 +186,8 @@ source_fetch_file(const char *fil, const char *filname) snprintf(file, l, "%s/%s", dir, p + 1); file[l - 1] = 0; } - - + + fname = strdup(p + 1); pp = strrchr(fname, end); if (pp) *pp = 0; @@ -238,7 +238,7 @@ SrcFile_List * source_load(Eet_File *ef) { SrcFile_List *s; - + s = eet_data_read(ef, _srcfile_list_edd, "edje_sources"); return s; } @@ -247,7 +247,7 @@ int source_fontmap_save(Eet_File *ef, Evas_List *fonts) { Font_List fl; - + fl.list = fonts; return eet_data_write(ef, _font_list_edd, "edje_source_fontmap", &fl, 0); } @@ -256,7 +256,7 @@ Font_List * source_fontmap_load(Eet_File *ef) { Font_List *fl; - + fl = eet_data_read(ef, _font_list_edd, "edje_source_fontmap"); return fl; } diff --git a/legacy/edje/src/bin/edje_decc.h b/legacy/edje/src/bin/edje_decc.h index 8fc6e941d6..9caacbb877 100644 --- a/legacy/edje/src/bin/edje_decc.h +++ b/legacy/edje/src/bin/edje_decc.h @@ -48,7 +48,7 @@ int source_append(Eet_File *ef); SrcFile_List *source_load(Eet_File *ef); int source_fontmap_save(Eet_File *ef, Evas_List *fonts); Font_List *source_fontmap_load(Eet_File *ef); - + void *mem_alloc(size_t size); char *mem_strdup(const char *s); #define SZ sizeof diff --git a/legacy/edje/src/bin/edje_recc b/legacy/edje/src/bin/edje_recc index da80d98136..2ae81ad277 100644 --- a/legacy/edje/src/bin/edje_recc +++ b/legacy/edje/src/bin/edje_recc @@ -28,19 +28,19 @@ if [ $# -ge 1 ]; then -h) usage ;; - + -help) usage ;; - + --help) usage ;; - + *.edj) IN=$I ;; - + *) OPT=$OPT" "$I ;; diff --git a/legacy/edje/src/lib/Edje_Edit.h b/legacy/edje/src/lib/Edje_Edit.h index 2c2f3712b3..92e5c0248e 100644 --- a/legacy/edje/src/lib/Edje_Edit.h +++ b/legacy/edje/src/lib/Edje_Edit.h @@ -24,30 +24,30 @@ # endif #endif -/** +/** * @file - * @brief Functions to deal with edje internal object. Don't use in standard - * situations. The use of any of the edje_edit_* functions can break your + * @brief Functions to deal with edje internal object. Don't use in standard + * situations. The use of any of the edje_edit_* functions can break your * theme ability, remember that the program must be separated from the interface! * * The API can be used to query or set every part of an edje object in real time. * You can manage every aspect of parts, part states, programs, script and whatever - * is contained in the edje file. For a reference of what all parameter means + * is contained in the edje file. For a reference of what all parameter means * look at the complete @ref edcref. - * + * * All the functions that deals with part states include the state value inside * the returned strings (ex: "defaut 0.00"). For this reason there aren't - * functions to set/get a state value, you have to pass the value inside the + * functions to set/get a state value, you have to pass the value inside the * name string (always in the form "state x.xx"). * * Don't forget to free all the strings and the lists returned by any edje_edit_*() * functions using edje_edit_string_free() and edje_edit_string_list_free() when * you don't need anymore. - * + * * Example: print all the part in a loaded edje_object * @code * Evas_List *parts, *l; - * + * * parts = edje_edit_parts_list_get(edje_object); * while(l = parts; l; l = l->next) * { @@ -59,7 +59,7 @@ * Example: Change the color of a rect inside an edje file * @code * Evas_Object *edje; - * + * * edje = edje_object_add(evas); * edje_object_file_set(edje,"edj/file/name", "group to load"); * edje_edit_state_color_set(edje, "MyRectName", "default 0.00", 255, 255, 0, 255); @@ -93,7 +93,7 @@ edje_edit_string_free( ); /**Save the modified edje object back to his file. - * Use this function when you are done with your editing, all the change made + * Use this function when you are done with your editing, all the change made * to the current loaded group will be saved back to the original file. * * NOTE: for now this as 2 limitations @@ -105,7 +105,7 @@ edje_edit_save( Evas_Object *obj ///< The edje object to save ); -/**Print on standard output many information about the internal status +/**Print on standard output many information about the internal status * of the edje object. * This is probably only usefull to debug. */ @@ -113,7 +113,7 @@ EAPI void edje_edit_print_internal_status( Evas_Object *obj ///< The edje object to inspect ); - + //@} /******************************************************************************/ /************************** GROUPS API ************************************/ @@ -133,19 +133,19 @@ edje_edit_group_add( /**Delete the current group from the given edje. * You can only delete the currently loaded group. - * All the parts and the programs inside the group will be deleted as well, + * All the parts and the programs inside the group will be deleted as well, * but not image or font embedded in the edje. */ EAPI unsigned char ///@return 1 on success, 0 on failure edje_edit_group_del( Evas_Object *obj ///< The edje object ); - + /**Check if a group with the given name exist in the edje. */ EAPI unsigned char ///< 1 if the group exist, 0 otherwise. edje_edit_group_exist( - Evas_Object *obj, ///< The edje object + Evas_Object *obj, ///< The edje object const char *group ///< The name of the group ); @@ -232,7 +232,7 @@ edje_edit_part_add( /**Delete the given part from the edje * All the reference to this part will be zeroed. - * A group must have at least one part, so it's not possible to + * A group must have at least one part, so it's not possible to * remove the last remaining part. */ EAPI unsigned char ///@return 1 on success, 0 if the part can't be removed @@ -245,7 +245,7 @@ edje_edit_part_del( */ EAPI unsigned char ///< 1 if the part exist, 0 otherwise. edje_edit_part_exist( - Evas_Object *obj, ///< The edje object + Evas_Object *obj, ///< The edje object const char *part ///< The name of the part ); @@ -359,13 +359,13 @@ edje_edit_part_mouse_events_get( ); /**Set mouse_events for part.*/ -EAPI void +EAPI void edje_edit_part_mouse_events_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part unsigned char mouse_events ///< If set to 1 part will accept mouse events, 0 to ignore all mouse events from part. ); - + /**Get repeat_events for part.*/ EAPI unsigned char ///@return 1 if part will pass all events to the other parts, 0 if not edje_edit_part_repeat_events_get( @@ -378,7 +378,7 @@ EAPI void edje_edit_part_repeat_events_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part - unsigned char repeat_events /**< If set to 1 part will repeat + unsigned char repeat_events /**< If set to 1 part will repeat * all the received mouse events to other parts. * If set to 0 the events received will not propagate to other parts.*/ ); @@ -388,11 +388,11 @@ edje_edit_part_repeat_events_set( /************************** STATES API ************************************/ /******************************************************************************/ /** @name States API - * Description of gen api 2. + * Description of gen api 2. */ //@{ /**Get the list of all the states in the given part.*/ -EAPI Evas_List * /**@return An Evas_List* of string (char *)containing all the states names found +EAPI Evas_List * /**@return An Evas_List* of string (char *)containing all the states names found * in part, including the float value (ex: "default 0.00"). * Use edje_edit_string_list_free() when you don't need it anymore. */ edje_edit_part_states_list_get( @@ -405,7 +405,7 @@ edje_edit_part_states_list_get( */ EAPI int edje_edit_state_name_set( - Evas_Object *obj, ///< The edje object + Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part that contain state const char *state, ///< The current name of the state const char *new_name ///< The new name to assign (including the value) @@ -424,7 +424,7 @@ edje_edit_state_add( */ EAPI void edje_edit_state_del( - Evas_Object *obj, ///< The edje object + Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part that contain state const char *state ///< The current name of the state (including the state value) ); @@ -433,7 +433,7 @@ edje_edit_state_del( */ EAPI unsigned char ///< 1 if the part state exist, 0 otherwise. edje_edit_state_exist( - Evas_Object *obj, ///< The edje object + Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part const char *state ///< The name of the state to check (including the state value) ); @@ -528,7 +528,7 @@ edje_edit_state_rel2_offset_y_get( const char *part, ///< The name of the part const char *state ///< The name of the 'part state' (ex. "default 0.00") ); - + /**Set the rel1 offset x value of state*/ EAPI void edje_edit_state_rel1_offset_x_set( @@ -560,7 +560,7 @@ edje_edit_state_rel2_offset_y_set( const char *part, ///< The name of the part const char *state, ///< The name of the 'part state' (ex. "default 0.00") double y ///< The new 'rel2 offset Y' value to set -); +); /**Get the part name rel1x is relative to. The function return NULL if the part is relative to the whole interface.*/ EAPI const char * ///@return The name of the part to apply the relativity @@ -830,13 +830,13 @@ edje_edit_state_aspect_pref_set( unsigned char pref ///< The new aspect preference to set (0=none, 1=vertical, 2=horizontal, 3=both) ); - + //@} /******************************************************************************/ /************************** TEXT API ************************************/ /******************************************************************************/ /** @name Text API - * Description of gen api 2. + * Description of gen api 2. */ //@{ /**Get the text of a part state. Remember to free the returned string with edje_edit_string_free(). */ @@ -846,7 +846,7 @@ edje_edit_state_text_get( const char *part, ///< The name of the part const char *state ///< The name of the 'part state' (ex. "default 0.00") ); - + /**Set the text of a part state.*/ EAPI void edje_edit_state_text_set( @@ -863,7 +863,7 @@ edje_edit_state_text_size_get( const char *part, ///< The name of the part const char *state ///< The name of the 'part state' (ex. "default 0.00") ); - + /**Set the text size of a part state.*/ EAPI void edje_edit_state_text_size_set( @@ -880,7 +880,7 @@ edje_edit_state_text_align_x_get( const char *part, ///< The name of the part const char *state ///< The name of the 'part state' (ex. "default 0.00") ); - + /**Get the text vertical align of a part state. The value range is from 0.0(top) to 1.0(bottom)*/ EAPI double ///@return The text align Y value edje_edit_state_text_align_y_get( @@ -888,7 +888,7 @@ edje_edit_state_text_align_y_get( const char *part, ///< The name of the part const char *state ///< The name of the 'part state' (ex. "default 0.00") ); - + /**Set the text horizontal align of a part state. The value range is from 0.0(right) to 1.0(left)*/ EAPI void edje_edit_state_text_align_x_set( @@ -897,7 +897,7 @@ edje_edit_state_text_align_x_set( const char *state, ///< The name of the 'part state' (ex. "default 0.00") double align ///< The new text align X value ); - + /**Set the text vertical align of a part state. The value range is from 0.0(top) to 1.0(bottom)*/ EAPI void edje_edit_state_text_align_y_set( @@ -908,7 +908,7 @@ edje_edit_state_text_align_y_set( ); /**Get the list of all the fonts in the given edje. - * @return An Evas_List* of string (char *)containing all the fonts names found + * @return An Evas_List* of string (char *)containing all the fonts names found * in the edje file. * Use edje_edit_string_list_free() when you don't need it anymore. */ @@ -934,7 +934,7 @@ edje_edit_state_font_get( const char *part, ///< The name of the part const char *state ///< The name of the 'part state' (ex. "default 0.00") ); - + /**Set font name for a given part state. */ EAPI void edje_edit_state_font_set( @@ -949,11 +949,11 @@ edje_edit_state_font_set( /************************** IMAGES API ************************************/ /******************************************************************************/ /** @name Images API - * Description of gen api 2. + * Description of gen api 2. */ //@{ /**Get the list of all the images in the given edje. - * @return An Evas_List* of string (char *)containing all the images names found + * @return An Evas_List* of string (char *)containing all the images names found * in the edje file. * Use edje_edit_string_list_free() when you don't need it anymore. */ @@ -965,12 +965,12 @@ edje_edit_images_list_get( /**Add an new image to the image collection * * This function add the given image inside the edje. Don't add a new image part - * but only put the image inside the edje file. It actually write directly to + * but only put the image inside the edje file. It actually write directly to * the file so you don't have to save (and you can't undo!). * After you have to create a new image_part that use this image. Note that all - * the parts in the edje share the same image collection, thus you can/must use + * the parts in the edje share the same image collection, thus you can/must use * the same image for different part. - * + * * The format of the image files that can be loaded depend on the evas engine on your system */ EAPI unsigned char ///@return TRUE on success or FALSE on failure @@ -978,7 +978,7 @@ edje_edit_image_add( Evas_Object *obj, ///< The edje object const char* path ///< The name of the image file to include in the edje ); - + /**Get normal image name for a given part state. Remember to free the returned string using edje_edit_string_free().*/ EAPI const char * ///@return The name of the image used by state edje_edit_state_image_get( @@ -986,7 +986,7 @@ edje_edit_state_image_get( const char *part, ///< The name of the part const char *state ///< The name of the 'part state' (ex. "default 0.00") ); - + /**Set normal image for a given part state.*/ EAPI void edje_edit_state_image_set( @@ -1014,7 +1014,7 @@ edje_edit_state_image_border_get( int *t, ///< A pointer to store the top value int *b ///< A pointer to store the bottom value ); - + /**Set the image border of a part state. Pass -1 to any of [l,r,t,b] to leave the value untouched.*/ EAPI void edje_edit_state_image_border_set( @@ -1026,7 +1026,7 @@ edje_edit_state_image_border_set( int t, ///< The new top border (or -1) int b ///< The new bottom border (or -1) ); - + /**Get the list of all the tweens images in the given part state. * Use edje_edit_string_list_free() when you don't need it anymore. */ @@ -1047,7 +1047,7 @@ edje_edit_state_tween_add( const char *state, ///< The name of the 'part state' (ex. "default 0.00") const char *tween ///< The name of the image to add. ); - + /**Remove the first tween with the given name. * If none is removed the function return 0. * The image is not removed from the edje. @@ -1063,9 +1063,9 @@ edje_edit_state_tween_del( //@} /******************************************************************************/ /************************* PROGRAMS API ***********************************/ -/******************************************************************************/ +/******************************************************************************/ /** @name Programs API - * Description of gen api 2. + * Description of gen api 2. */ //@{ /**Get the list of all the programs in the given edje object. @@ -1077,7 +1077,7 @@ EAPI Evas_List * ///@return A string list containing all the program na edje_edit_programs_list_get( Evas_Object *obj ///< The edje object ); - + /**Add a new program to the edje file * If a program with the same name just exist the function will fail. */ @@ -1086,20 +1086,20 @@ edje_edit_program_add( Evas_Object *obj, ///< The edje object const char *name ///< The name of the new program ); - + /**Remove the given program from the edje file. */ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_del( Evas_Object *obj, ///< The edje object const char *prog ///< The name of the program to remove -); +); /**Check if a program with the given name exist in the edje object. */ EAPI unsigned char ///< 1 if the program exist, 0 otherwise. edje_edit_program_exist( - Evas_Object *obj, ///< The edje object + Evas_Object *obj, ///< The edje object const char *prog ///< The name of the program ); @@ -1109,7 +1109,7 @@ edje_edit_program_run( Evas_Object *obj, ///< The edje object const char *prog ///< The name of the program to execute ); - + /**Set a new name for the given program */ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_name_set( @@ -1124,7 +1124,7 @@ edje_edit_program_source_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set source of the given program. */ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_source_set( @@ -1139,7 +1139,7 @@ edje_edit_program_signal_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set signal of the given program. */ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_signal_set( @@ -1149,12 +1149,12 @@ edje_edit_program_signal_set( ); /**Get in.from of a given program.*/ -EAPI double ///@return The delay +EAPI double ///@return The delay edje_edit_program_in_from_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set in.from of a given program.*/ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_in_from_set( @@ -1169,7 +1169,7 @@ edje_edit_program_in_range_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set in.range of a given program.*/ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_in_range_set( @@ -1186,7 +1186,7 @@ edje_edit_program_action_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set the action of a given program. * Action can be one of EDJE_ACTION_TYPE_NONE, _STATE_SET, ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, _DRAG_VAL_STEP, _DRAG_VAL_PAGE, _SCRIPT */ @@ -1206,7 +1206,7 @@ edje_edit_program_targets_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Add a new target name to the list of 'targets' in the given program. * If program action is EDJE_ACTION_TYPE_ACTION_STOP then 'target' must be an existing program name. * If action is EDJE_ACTION_TYPE_STATE_SET then 'target' must be an existing part name. @@ -1217,14 +1217,14 @@ edje_edit_program_target_add( const char *prog, ///< The program name const char *target ///< The name of another program or another part ); - + /**Clear the 'targets' list of the given program */ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_targets_clear( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Get the list of action that will be run after the give program * Return a list of program name. * Use edje_edit_string_list_free() when you don't need it anymore. @@ -1234,7 +1234,7 @@ edje_edit_program_afters_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Add a new program name to the list of 'afters' in the given program. * All the programs listed in 'afters' will be executed after program execution. */ @@ -1244,7 +1244,7 @@ edje_edit_program_after_add( const char *prog, ///< The program name const char *after ///< The name of another program to add to the afters list ); - + /**Clear the 'afters' list of the given program */ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_afters_clear( @@ -1261,7 +1261,7 @@ edje_edit_program_state_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set the state for the given program * In a STATE_SET action this is the name of state to set. * In a SIGNAL_EMIT action is the name of the signal to emit. @@ -1282,7 +1282,7 @@ edje_edit_program_value_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set the value of state for the given program. * In a STATE_SET action this is the value of state to set. * Not used on SIGNAL_EMIT action. @@ -1303,7 +1303,7 @@ edje_edit_program_state2_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set the state2 for the given program * In a STATE_SET action is not used * In a SIGNAL_EMIT action is the source of the emitted signal. @@ -1323,7 +1323,7 @@ edje_edit_program_value2_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set the value2 of state for the given program. * This is used in DRAG_ACTION */ @@ -1342,7 +1342,7 @@ edje_edit_program_transition_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set the type of transition to use when apply animations. * Can be one of: EDJE_TWEEN_MODE_NONE, EDJE_TWEEN_MODE_LINEAR, EDJE_TWEEN_MODE_SINUSOIDAL, EDJE_TWEEN_MODE_ACCELERATE or EDJE_TWEEN_MODE_DECELERATE. */ @@ -1352,14 +1352,14 @@ edje_edit_program_transition_set( const char *prog, ///< The program name int transition ///< The transition type to set ); - + /**Get the duration of the transition in seconds.*/ EAPI double ///@return The duration of the transition edje_edit_program_transition_time_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name ); - + /**Set the duration of the transition in seconds.*/ EAPI unsigned char ///@return 1 on success or 0 on errors edje_edit_program_transition_time_set( @@ -1367,18 +1367,18 @@ edje_edit_program_transition_time_set( const char *prog, ///< The program name double seconds ///< The duration of the transition (in seconds) ); - + //@} /******************************************************************************/ /************************** SCRIPTS API ***********************************/ /******************************************************************************/ /** @name Scripts API - * Description of gen api 2. + * Description of gen api 2. */ //@{ EAPI const char* edje_edit_script_get(Evas_Object *obj); - - + + #ifdef __cplusplus } #endif diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index c98ab11357..d0cc7a1e38 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -679,7 +679,7 @@ _edje_part_recalc_single(Edje *ed, { if (ep->text.text) text = ep->text.text; } - + if (ep->text.source) { if (ep->text.source->text.font) font = ep->text.source->text.font; diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c index 88f1eced7a..0497f566cc 100644 --- a/legacy/edje/src/lib/edje_edit.c +++ b/legacy/edje/src/lib/edje_edit.c @@ -236,7 +236,7 @@ _edje_import_image_file(Edje *ed, const char *path, int id) { fprintf(stderr, "Edje_Edit: Error. unable to load image \"%s\"." "Missing PNG or JPEG loader modules for Evas or " - "file does not exist, or is not readable.\n", path); + "file does not exist, or is not readable.\n", path); evas_object_del(im); im = NULL; return 0; @@ -277,8 +277,8 @@ _edje_import_image_file(Edje *ed, const char *path, int id) printf("*********** Writing images/%i to edj ******************\n", id); bytes = eet_data_image_write(eetf, buf, im_data, im_w, im_h, - im_alpha, - 0, 100, 1); + im_alpha, + 0, 100, 1); if (bytes <= 0) { fprintf(stderr, "Edje_Edit: Error. unable to write image part \"%s\" " @@ -702,7 +702,7 @@ edje_edit_group_del(Evas_Object *obj) if (e->id == g->id) { ed->file->collection_dir->entries = - evas_list_remove_list(ed->file->collection_dir->entries, l); + evas_list_remove_list(ed->file->collection_dir->entries, l); // free(e->entry); This should be right but cause a segv free(e); e = NULL; diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c index e0943e81af..cc659d9c74 100644 --- a/legacy/edje/src/lib/edje_load.c +++ b/legacy/edje/src/lib/edje_load.c @@ -160,7 +160,7 @@ edje_file_group_exists(const char *file, const char *glob) { Edje_Patterns *patterns; - patterns = + patterns = edje_match_collection_dir_init(edf->collection_dir->entries); if (edje_match_collection_dir_exec(patterns, glob)) { @@ -282,7 +282,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *p Edje_Part_Description *desc; desc = hist->data; - if (desc->color_class) + if (desc->color_class) _edje_color_class_member_add(ed, desc->color_class); } } @@ -665,7 +665,7 @@ _edje_file_del(Edje *ed) if (rp->part->mouse_events) _edje_callbacks_del(rp->swallowed_object); - /* Objects swallowed by the app do not get deleted, + /* Objects swallowed by the app do not get deleted, but those internally swallowed (GROUP type) do. */ if (rp->part->type == EDJE_PART_TYPE_GROUP) evas_object_del(rp->swallowed_object); @@ -728,7 +728,7 @@ _edje_file_del(Edje *ed) static Evas_Bool data_cache_free(const Evas_Hash *hash, const char *key, void *data, void *fdata) { Edje_File *edf; - + edf = fdata; if (edf->free_strings) evas_stringshare_del(data); return 1; @@ -792,7 +792,7 @@ _edje_file_free(Edje_File *edf) while (se->color_list) { free(se->color_list->data); - se->color_list = + se->color_list = evas_list_remove_list(se->color_list, se->color_list); } if (edf->free_strings) @@ -829,7 +829,7 @@ _edje_file_free(Edje_File *edf) Edje_Color_Class *ecc; ecc = edf->color_classes->data; - edf->color_classes = + edf->color_classes = evas_list_remove_list(edf->color_classes, edf->color_classes); if (edf->free_strings && ecc->name) evas_stringshare_del(ecc->name); free(ecc); @@ -848,7 +848,7 @@ _edje_file_free(Edje_File *edf) "before calling edje_shutdown().\n" "The following errors are the edje object files and parts that are still\n" "hanging around, with their reference counts\n"); - evas_hash_foreach(edf->collection_hash, + evas_hash_foreach(edf->collection_hash, _edje_file_collection_hash_foreach, edf); evas_hash_free(edf->collection_hash); } @@ -1009,7 +1009,7 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char * parent = data; ed = _edje_fetch(obj); if (!ed) return; - snprintf(new_src, sizeof(new_src), "%s%c%s", ed->parent, + snprintf(new_src, sizeof(new_src), "%s%c%s", ed->parent, EDJE_PART_PATH_SEPARATOR, source); edje_object_signal_emit(parent, signal, new_src); } diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c index bbe5ea294f..b5cf19c339 100644 --- a/legacy/edje/src/lib/edje_main.c +++ b/legacy/edje/src/lib/edje_main.c @@ -56,7 +56,7 @@ edje_shutdown(void) _edje_text_class_hash_free(); embryo_shutdown(); ecore_job_shutdown(); - + return 0; } diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h index 19233bb3c7..e8079b48de 100644 --- a/legacy/edje/src/lib/edje_private.h +++ b/legacy/edje/src/lib/edje_private.h @@ -937,7 +937,7 @@ typedef enum _Edje_Match_Error EDJE_MATCH_OK, EDJE_MATCH_ALLOC_ERROR, EDJE_MATCH_SYNTAX_ERROR - + } Edje_Match_Error; typedef struct _Edje_States Edje_States; diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c index 724800f58c..658d2e1d33 100644 --- a/legacy/edje/src/lib/edje_text.c +++ b/legacy/edje/src/lib/edje_text.c @@ -360,7 +360,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, if (ep->text.source->text.font) font = ep->text.source->text.font; if (ep->text.source->text.size > 0) size = ep->text.source->text.size; } - + if (!text) text = ""; if (!font) font = ""; diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index b3deee7eab..89cba4545c 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -211,7 +211,7 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2 free(cc); return; } - _edje_color_class_hash = + _edje_color_class_hash = evas_hash_add(_edje_color_class_hash, color_class, cc); if (evas_hash_alloc_error()) { @@ -278,7 +278,7 @@ edje_color_class_del(const char *color_class) cc = evas_hash_find(_edje_color_class_hash, color_class); if (!cc) return; - _edje_color_class_hash = + _edje_color_class_hash = evas_hash_del(_edje_color_class_hash, color_class, cc); evas_stringshare_del(cc->name); free(cc); @@ -307,7 +307,7 @@ edje_color_class_list(void) Edje_List_Foreach_Data fdata; memset(&fdata, 0, sizeof(Edje_List_Foreach_Data)); - evas_hash_foreach(_edje_color_class_member_hash, + evas_hash_foreach(_edje_color_class_member_hash, _edje_color_class_list_foreach, &fdata); return fdata.list; @@ -497,7 +497,7 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz free(tc); return; } - _edje_text_class_hash = + _edje_text_class_hash = evas_hash_add(_edje_text_class_hash, text_class, tc); if (evas_hash_alloc_error()) { @@ -520,7 +520,7 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz tc->font = evas_stringshare_add(font); if (!tc->font) { - _edje_text_class_hash = + _edje_text_class_hash = evas_hash_del(_edje_text_class_hash, text_class, tc); free(tc); return; @@ -557,7 +557,7 @@ edje_text_class_del(const char *text_class) tc = evas_hash_find(_edje_text_class_hash, text_class); if (!tc) return; - _edje_text_class_hash = + _edje_text_class_hash = evas_hash_del(_edje_text_class_hash, text_class, tc); evas_stringshare_del(tc->name); evas_stringshare_del(tc->font); @@ -588,7 +588,7 @@ edje_text_class_list(void) Edje_List_Foreach_Data fdata; memset(&fdata, 0, sizeof(Edje_List_Foreach_Data)); - evas_hash_foreach(_edje_text_class_member_hash, + evas_hash_foreach(_edje_text_class_member_hash, _edje_text_class_list_foreach, &fdata); return fdata.list; @@ -813,7 +813,7 @@ edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text) else rp->text.text = NULL; rp->edje->dirty = 1; _edje_recalc(rp->edje); - if (rp->edje->text_change.func) + if (rp->edje->text_change.func) rp->edje->text_change.func(rp->edje->text_change.data, obj, part); } @@ -1660,7 +1660,7 @@ _edje_real_part_recursive_get_helper(Edje *ed, char **path) rp = _edje_real_part_get(ed, path[0]); if (path[1] == NULL) return rp; - if ((!rp) || (rp->part->type != EDJE_PART_TYPE_GROUP) || + if ((!rp) || (rp->part->type != EDJE_PART_TYPE_GROUP) || (!rp->swallowed_object)) return NULL; ed = _edje_fetch(rp->swallowed_object); @@ -1724,14 +1724,14 @@ _edje_color_class_member_add(Edje *ed, const char *color_class) if ((!ed) || (!color_class)) return; members = evas_hash_find(_edje_color_class_member_hash, color_class); - if (members) + if (members) { - _edje_color_class_member_hash = + _edje_color_class_member_hash = evas_hash_del(_edje_color_class_member_hash, color_class, members); } - + members = evas_list_prepend(members, ed); - _edje_color_class_member_hash = + _edje_color_class_member_hash = evas_hash_add(_edje_color_class_member_hash, color_class, members); } @@ -1744,12 +1744,12 @@ _edje_color_class_member_del(Edje *ed, const char *color_class) members = evas_hash_find(_edje_color_class_member_hash, color_class); if (!members) return; - _edje_color_class_member_hash = + _edje_color_class_member_hash = evas_hash_del(_edje_color_class_member_hash, color_class, members); members = evas_list_remove(members, ed); - if (members) + if (members) { - _edje_color_class_member_hash = + _edje_color_class_member_hash = evas_hash_add(_edje_color_class_member_hash, color_class, members); } } @@ -1758,7 +1758,7 @@ _edje_color_class_member_del(Edje *ed, const char *color_class) * Used to free the member lists that are stored in the text_class * and color_class hashtables. */ -static Evas_Bool +static Evas_Bool member_list_free(const Evas_Hash *hash, const char *key, void *data, void *fdata) { evas_list_free(data); @@ -1774,7 +1774,7 @@ _edje_color_class_members_free(void) _edje_color_class_member_hash = NULL; } -static Evas_Bool +static Evas_Bool color_class_hash_list_free(const Evas_Hash *hash, const char *key, void *data, void *fdata) { Edje_Color_Class *cc; @@ -1839,17 +1839,17 @@ _edje_text_class_member_add(Edje *ed, const char *text_class) members = evas_hash_find(_edje_text_class_member_hash, text_class); /* Remove members list */ - if (members) + if (members) { - _edje_text_class_member_hash = + _edje_text_class_member_hash = evas_hash_del(_edje_text_class_member_hash, text_class, members); } - + /* Update the member list */ members = evas_list_prepend(members, ed); /* Add the member list back */ - _edje_text_class_member_hash = + _edje_text_class_member_hash = evas_hash_add(_edje_text_class_member_hash, text_class, members); } @@ -1862,13 +1862,13 @@ _edje_text_class_member_del(Edje *ed, const char *text_class) members = evas_hash_find(_edje_text_class_member_hash, text_class); if (!members) return; - _edje_text_class_member_hash = + _edje_text_class_member_hash = evas_hash_del(_edje_text_class_member_hash, text_class, members); members = evas_list_remove(members, ed); - if (members) + if (members) { - _edje_text_class_member_hash = + _edje_text_class_member_hash = evas_hash_add(_edje_text_class_member_hash, text_class, members); } } @@ -1882,7 +1882,7 @@ _edje_text_class_members_free(void) _edje_text_class_member_hash = NULL; } -static Evas_Bool +static Evas_Bool text_class_hash_list_free(const Evas_Hash *hash, const char *key, void *data, void *fdata) { Edje_Text_Class *tc;