From: Enlightenment C. <no...@cv...> - 2007-01-14 21:11:39
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c engrave_part_state.c Log Message: * Make the text part draw better * Mod engrave_part_state_color|2|3_set so that user can change only one color a time =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- engrave_canvas.c 14 Jan 2007 15:48:53 -0000 1.7 +++ engrave_canvas.c 15 Jan 2007 03:11:34 -0000 1.8 @@ -437,28 +437,60 @@ static void engrave_canvas_part_state_text_setup(Engrave_Part_State *eps) { - int r, g, b, a; - const char *font_key; - const char *font_name; - Engrave_Part *ep = (eps ? eps->parent : NULL); - Engrave_Group *eg = (ep ? ep->parent : NULL); - Engrave_File *ef = (eg ? eg->parent : NULL); - // XXX this needs a lot of work ... - if (ef) { - Engrave_Font * efont; - - font_key = engrave_part_state_text_font_get(eps); - efont = engrave_file_font_by_name_find(ef, font_key); - font_name = engrave_font_path_get(efont); - - } else - font_name = "Vera.ttf"; - - evas_object_text_text_set(ep->object, engrave_part_state_text_text_get(eps)); - evas_object_text_font_set(ep->object, font_name, - engrave_part_state_text_size_get(eps)); - engrave_part_state_color_get(eps, &r, &g, &b, &a); - evas_object_color_set(ep->object, r, g, b, a); + int r, g, b, a; + const char *font_key; + const char *font_name; + Engrave_Part *ep = (eps ? eps->parent : NULL); + Engrave_Group *eg = (ep ? ep->parent : NULL); + Engrave_File *ef = (eg ? eg->parent : NULL); + + if (ef) { + Engrave_Font * efont; + + font_key = engrave_part_state_text_font_get(eps); + efont = engrave_file_font_by_name_find(ef, font_key); + font_name = engrave_font_path_get(efont); + + }else + font_name = "Vera.ttf"; + + evas_object_text_text_set(ep->object, + engrave_part_state_text_text_get(eps)); + evas_object_text_font_set(ep->object, font_name, + engrave_part_state_text_size_get(eps)); + engrave_part_state_color_get(eps, &r, &g, &b, &a); + evas_object_color_set(ep->object, r, g, b, a); + + engrave_part_state_color2_get(eps, &r, &g, &b, &a); + evas_object_text_shadow_color_set(ep->object, r, g, b, a); + + engrave_part_state_color3_get(eps, &r, &g, &b, &a); + evas_object_text_outline_color_set(ep->object, r, g, b, a); + + switch (engrave_part_effect_get(ep)) + { + case ENGRAVE_TEXT_EFFECT_OUTLINE: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_OUTLINE); + break; + case ENGRAVE_TEXT_EFFECT_SOFT_OUTLINE: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_SOFT_OUTLINE); + break; + case ENGRAVE_TEXT_EFFECT_SHADOW: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_SHADOW); + break; + case ENGRAVE_TEXT_EFFECT_SOFT_SHADOW: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_SOFT_SHADOW); + break; + case ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_OUTLINE_SHADOW); + break; + case ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW); + break; + default: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_PLAIN); + break; + } } static void @@ -485,8 +517,6 @@ Engrave_Part *ep = (eps ? eps->parent : NULL); Engrave_Group *eg = (ep ? ep->parent : NULL); - - if (!ep || !eg) return; if ((ei = engrave_part_state_image_normal_get(eps))) @@ -496,16 +526,17 @@ engrave_image_name_get(ei)); evas_object_image_file_set(ep->object, path, NULL); } - - + engrave_part_state_fill_origin_relative_get(eps, &pos_rel_x, &pos_rel_y); engrave_part_state_fill_size_relative_get(eps, &rel_x, &rel_y); engrave_part_state_fill_origin_offset_get(eps, &pos_abs_x, &pos_abs_y); engrave_part_state_fill_size_offset_get(eps, &abs_x, &abs_y); + fill_x = pos_abs_x + (ep->pos.w * pos_rel_x); fill_y = pos_abs_y + (ep->pos.w * pos_rel_y); fill_w = abs_x + (ep->pos.w * rel_x); fill_h = abs_y + (ep->pos.h * rel_y); + evas_object_image_fill_set(ep->object, fill_x, fill_y, fill_w, fill_h); evas_object_image_smooth_scale_set(ep->object, engrave_part_state_fill_smooth_get(eps)); =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_part_state.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- engrave_part_state.c 14 Jan 2007 15:48:57 -0000 1.21 +++ engrave_part_state.c 15 Jan 2007 03:11:34 -0000 1.22 @@ -483,10 +483,10 @@ /** * engrave_part_state_color_set - Set the colour of the state. * @param eps: The Engrave_Part_State to set the value too. - * @param r: The red value. - * @param g: The green value. - * @param b: the blue value. - * @param a: The alpha value. + * @param r: The red value (set -1 to keep the current value). + * @param g: The green value (set -1 to keep the current value). + * @param b: the blue value (set -1 to keep the current value). + * @param a: The alpha value (set -1 to keep the current value). * * @return Returns no value */ @@ -495,19 +495,19 @@ int r, int g, int b, int a) { if (!eps) return; - eps->color.r = r; - eps->color.g = g; - eps->color.b = b; - eps->color.a = a; + if (r >= 0) eps->color.r = r; + if (g >= 0) eps->color.g = g; + if (b >= 0) eps->color.b = b; + if (a >= 0) eps->color.a = a; } /** * engrave_part_state_color2_set - Set the colour2 of the state * @param eps: The Engrave_Part_State to set the value too. - * @param r: The red value. - * @param g: The green value. - * @param b: the blue value. - * @param a: The alpha value. + * @param r: The red value (set -1 to keep the current value). + * @param g: The green value (set -1 to keep the current value). + * @param b: the blue value (set -1 to keep the current value). + * @param a: The alpha value (set -1 to keep the current value). * * @return Returns no value */ @@ -516,19 +516,19 @@ int r, int g, int b, int a) { if (!eps) return; - eps->color2.r = r; - eps->color2.g = g; - eps->color2.b = b; - eps->color2.a = a; + if (r >= 0) eps->color2.r = r; + if (g >= 0) eps->color2.g = g; + if (b >= 0) eps->color2.b = b; + if (a >= 0) eps->color2.a = a; } /** * engrave_part_state_color3_set - Set the colour 3 of the state. * @param eps: The Engrave_Part_State to set the value too. - * @param r: The red value. - * @param g: The green value. - * @param b: the blue value. - * @param a: The alpha value. + * @param r: The red value (set -1 to keep the current value). + * @param g: The green value (set -1 to keep the current value). + * @param b: the blue value (set -1 to keep the current value). + * @param a: The alpha value (set -1 to keep the current value). * * @return Returns no value */ @@ -537,10 +537,10 @@ int r, int g, int b, int a) { if (!eps) return; - eps->color3.r = r; - eps->color3.g = g; - eps->color3.b = b; - eps->color3.a = a; + if (r >= 0) eps->color3.r = r; + if (g >= 0) eps->color3.g = g; + if (b >= 0) eps->color3.b = b; + if (a >= 0) eps->color3.a = a; } /** |
From: Enlightenment C. <no...@cv...> - 2007-01-19 02:45:00
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c Log Message: * premul colors befor passing to evas =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- engrave_canvas.c 15 Jan 2007 10:46:34 -0000 1.9 +++ engrave_canvas.c 19 Jan 2007 08:44:59 -0000 1.10 @@ -461,13 +461,17 @@ engrave_part_state_text_text_get(eps)); evas_object_text_font_set(ep->object, font_name, engrave_part_state_text_size_get(eps)); + engrave_part_state_color_get(eps, &r, &g, &b, &a); + evas_color_argb_premul(a,&r,&g,&b); evas_object_color_set(ep->object, r, g, b, a); engrave_part_state_color2_get(eps, &r, &g, &b, &a); + evas_color_argb_premul(a,&r,&g,&b); evas_object_text_shadow_color_set(ep->object, r, g, b, a); engrave_part_state_color3_get(eps, &r, &g, &b, &a); + evas_color_argb_premul(a,&r,&g,&b); evas_object_text_outline_color_set(ep->object, r, g, b, a); switch (engrave_part_effect_get(ep)) @@ -505,6 +509,7 @@ if (!ep) return; engrave_part_state_color_get(eps, &r, &g, &b, &a); + evas_color_argb_premul(a,&r,&g,&b); evas_object_color_set(ep->object, r, g, b, a); } |
From: Enlightenment C. <no...@cv...> - 2007-02-05 04:10:02
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_load.c Log Message: Open the more common default.edc. This will work in tandem with the edje_decc patch in mailinglist =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_load.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- engrave_load.c 6 Sep 2006 07:31:31 -0000 1.18 +++ engrave_load.c 5 Feb 2007 10:09:58 -0000 1.19 @@ -11,7 +11,7 @@ #include <sys/stat.h> #endif -#define MAIN_EDC_NAME "main_edje_source.edc" +#define MAIN_EDC_NAME "default.edc" char *engrave_filename = NULL; |
From: Enlightenment C. <no...@cv...> - 2007-02-24 13:45:17
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave.y Log Message: Make engrave parse styles. =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave.y,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- engrave.y 1 Jan 2007 12:25:23 -0000 1.21 +++ engrave.y 24 Feb 2007 19:45:13 -0000 1.22 @@ -72,6 +72,7 @@ | images edjes | fonts edjes | spectra edjes + | styles edjes | collections edjes | data edjes | error { |
From: Enlightenment C. <no...@cv...> - 2007-03-02 11:04:11
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_load.c Log Message: Make the load of edj file work well now! We use the edje_decc -main-edc switch to force the source name. =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_load.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- engrave_load.c 5 Feb 2007 10:09:58 -0000 1.19 +++ engrave_load.c 2 Mar 2007 17:04:10 -0000 1.20 @@ -11,7 +11,7 @@ #include <sys/stat.h> #endif -#define MAIN_EDC_NAME "default.edc" +#define MAIN_EDC_NAME "main_edje_source.edc" char *engrave_filename = NULL; @@ -135,9 +135,9 @@ return 0; } - len = strlen(work_dir) + strlen(ptr) + 12; + len = strlen(work_dir) + strlen(ptr) + strlen(MAIN_EDC_NAME) + 23; cmd = (char *)calloc(len, sizeof(char)); - snprintf(cmd, len, "edje_decc %s/%s", work_dir, ptr); + snprintf(cmd, len, "edje_decc %s/%s -main-out "MAIN_EDC_NAME, work_dir, ptr); ret = system(cmd); FREE(cmd); |
From: Enlightenment C. <no...@cv...> - 2007-03-12 15:13:27
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c Log Message: Make engrave change font again =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- engrave_canvas.c 19 Jan 2007 08:44:59 -0000 1.10 +++ engrave_canvas.c 12 Mar 2007 21:13:26 -0000 1.11 @@ -442,7 +442,7 @@ { int r, g, b, a; const char *font_key; - const char *font_name; + char font_name[4096]; Engrave_Part *ep = (eps ? eps->parent : NULL); Engrave_Group *eg = (ep ? ep->parent : NULL); Engrave_File *ef = (eg ? eg->parent : NULL); @@ -452,10 +452,9 @@ font_key = engrave_part_state_text_font_get(eps); efont = engrave_file_font_by_name_find(ef, font_key); - font_name = engrave_font_path_get(efont); - - }else - font_name = "Vera.ttf"; + snprintf(font_name,4096,"%s/%s",engrave_file_font_dir_get(ef), + engrave_font_path_get(efont)); + } evas_object_text_text_set(ep->object, engrave_part_state_text_text_get(eps)); |
From: Enlightenment C. <no...@cv...> - 2007-03-12 21:54:00
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c Log Message: Better solaris compatibility =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- engrave_canvas.c 12 Mar 2007 21:13:26 -0000 1.11 +++ engrave_canvas.c 13 Mar 2007 03:53:55 -0000 1.12 @@ -442,18 +442,21 @@ { int r, g, b, a; const char *font_key; - char font_name[4096]; + char font_name[PATH_MAX]; Engrave_Part *ep = (eps ? eps->parent : NULL); Engrave_Group *eg = (ep ? ep->parent : NULL); Engrave_File *ef = (eg ? eg->parent : NULL); - if (ef) { - Engrave_Font * efont; + if (ef) + { + Engrave_Font * efont = NULL; font_key = engrave_part_state_text_font_get(eps); efont = engrave_file_font_by_name_find(ef, font_key); - snprintf(font_name,4096,"%s/%s",engrave_file_font_dir_get(ef), + snprintf(font_name,PATH_MAX,"%s/%s",engrave_file_font_dir_get(ef), engrave_font_path_get(efont)); + }else{ + strcpy(font_name,"Vera.ttf"); } evas_object_text_text_set(ep->object, |
From: Enlightenment C. <no...@cv...> - 2007-07-03 00:54:44
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c Log Message: Fix part position error. =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- engrave_canvas.c 14 Mar 2007 01:44:06 -0000 1.13 +++ engrave_canvas.c 3 Jul 2007 00:54:41 -0000 1.14 @@ -261,7 +261,7 @@ if (rel2_to_x) ep->pos.w = eps->rel2.offset.x + ((Engrave_Part*)(rel2_to_x->parent))->pos.x - + (eps->rel2.relative.x * ((Engrave_Part*)(rel2_to_x->parent))->pos.y) + + (eps->rel2.relative.x * ((Engrave_Part*)(rel2_to_x->parent))->pos.w) - ep->pos.x + 1; else ep->pos.w = eps->rel2.offset.x + (eps->rel2.relative.x * ec->w) |
From: Enlightenment C. <no...@cv...> - 2007-07-03 01:48:10
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_out.c Log Message: In this way you can have a to_x without a to_y. Also fix a segv. =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_out.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- engrave_out.c 28 May 2007 09:35:49 -0000 1.37 +++ engrave_out.c 3 Jul 2007 01:48:07 -0000 1.38 @@ -465,7 +465,7 @@ tmp = engrave_part_state_rel1_to_x_get(state); tmp2 = engrave_part_state_rel1_to_y_get(state); - if (tmp && (!tmp2 || !strcmp(tmp, tmp2))) + if (tmp && tmp2 && (!strcmp(tmp, tmp2))) engrave_out_data(out, "to", "\"%s\"", tmp); else { @@ -486,7 +486,7 @@ tmp = engrave_part_state_rel2_to_x_get(state); tmp2 = engrave_part_state_rel2_to_y_get(state); - if (tmp && (!tmp2 || !strcmp(tmp, tmp2))) + if (tmp && tmp2 && (!strcmp(tmp, tmp2))) engrave_out_data(out, "to", "\"%s\"", tmp); else { |
From: Enlightenment C. <no...@cv...> - 2007-08-03 19:05:51
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c Log Message: ...and also display missing text effect =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- engrave_canvas.c 3 Jul 2007 00:54:41 -0000 1.14 +++ engrave_canvas.c 3 Aug 2007 19:05:47 -0000 1.15 @@ -470,11 +470,13 @@ engrave_part_state_color2_get(eps, &r, &g, &b, &a); evas_color_argb_premul(a,&r,&g,&b); evas_object_text_shadow_color_set(ep->object, r, g, b, a); + evas_object_text_glow_color_set(ep->object, r, g, b, a); engrave_part_state_color3_get(eps, &r, &g, &b, &a); evas_color_argb_premul(a,&r,&g,&b); evas_object_text_outline_color_set(ep->object, r, g, b, a); - + evas_object_text_glow2_color_set(ep->object, r, g, b, a); + switch (engrave_part_effect_get(ep)) { case ENGRAVE_TEXT_EFFECT_OUTLINE: @@ -494,6 +496,15 @@ break; case ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW); + break; + case ENGRAVE_TEXT_EFFECT_FAR_SHADOW: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_FAR_SHADOW); + break; + case ENGRAVE_TEXT_EFFECT_FAR_SOFT_SHADOW: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); + break; + case ENGRAVE_TEXT_EFFECT_GLOW: + evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_GLOW); break; default: evas_object_text_style_set(ep->object, EVAS_TEXT_STYLE_PLAIN); |
From: Enlightenment C. <no...@cv...> - 2007-08-11 17:30:55
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c Log Message: use evas_smart_class_new() =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- engrave_canvas.c 3 Aug 2007 19:05:47 -0000 1.15 +++ engrave_canvas.c 11 Aug 2007 17:30:52 -0000 1.16 @@ -17,11 +17,6 @@ static Evas_Object *engrave_canvas_object_new(Evas *evas); static void engrave_canvas_object_add(Evas_Object *o); static void engrave_canvas_object_del(Evas_Object *o); -static void engrave_canvas_object_layer_set(Evas_Object *o, int l); -static void engrave_canvas_object_raise(Evas_Object *o); -static void engrave_canvas_object_lower(Evas_Object *o); -static void engrave_canvas_object_stack_above(Evas_Object *o, Evas_Object *above); -static void engrave_canvas_object_stack_below(Evas_Object *o, Evas_Object *below); static void engrave_canvas_object_move(Evas_Object *o, Evas_Coord x, Evas_Coord y); static void engrave_canvas_object_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h); static void engrave_canvas_object_show(Evas_Object *o); @@ -583,24 +578,24 @@ static Evas_Smart *smrt = NULL; if (smrt) return smrt; - smrt = evas_smart_new("engrave_canvas_object", - engrave_canvas_object_add, - engrave_canvas_object_del, - engrave_canvas_object_layer_set, - engrave_canvas_object_raise, - engrave_canvas_object_lower, - engrave_canvas_object_stack_above, - engrave_canvas_object_stack_below, - engrave_canvas_object_move, - engrave_canvas_object_resize, - engrave_canvas_object_show, - engrave_canvas_object_hide, - engrave_canvas_object_color_set, - engrave_canvas_object_clip_set, - engrave_canvas_object_clip_unset, - NULL - ); - return smrt; + static const Evas_Smart_Class sc = + { + "engrave_canvas_object", + EVAS_SMART_CLASS_VERSION, + engrave_canvas_object_add, + engrave_canvas_object_del, + engrave_canvas_object_move, + engrave_canvas_object_resize, + engrave_canvas_object_show, + engrave_canvas_object_hide, + engrave_canvas_object_color_set, + engrave_canvas_object_clip_set, + engrave_canvas_object_clip_unset, + NULL + }; + smrt = evas_smart_class_new(&sc); + + return smrt; } static void @@ -627,51 +622,6 @@ FREE(ec); } -} - -static void -engrave_canvas_object_layer_set(Evas_Object *o, int l) -{ - Engrave_Canvas *ec; - - if ((ec = evas_object_smart_data_get(o))) - evas_object_layer_set(ec->clip, l); -} - -static void -engrave_canvas_object_raise(Evas_Object *o) -{ - Engrave_Canvas *ec; - - if ((ec = evas_object_smart_data_get(o))) - evas_object_raise(ec->clip); -} - -static void -engrave_canvas_object_lower(Evas_Object *o) -{ - Engrave_Canvas *ec; - - if ((ec = evas_object_smart_data_get(o))) - evas_object_lower(ec->clip); -} - -static void -engrave_canvas_object_stack_above(Evas_Object *o, Evas_Object *above) -{ - Engrave_Canvas *ec; - - if ((ec = evas_object_smart_data_get(o))) - evas_object_stack_above(ec->clip, above); -} - -static void -engrave_canvas_object_stack_below(Evas_Object *o, Evas_Object *below) -{ - Engrave_Canvas *ec; - - if ((ec = evas_object_smart_data_get(o))) - evas_object_stack_below(ec->clip, below); } static void |
From: Enlightenment C. <no...@cv...> - 2007-08-21 05:42:30
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave.y engrave_load.c engrave_parse.c Log Message: * don't make exit(-1) on parse errors. instead return NULL * preprocess edc files as edje do, more portable. see edje code for more info =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave.y,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- engrave.y 2 Aug 2007 13:44:35 -0000 1.29 +++ engrave.y 21 Aug 2007 05:42:29 -0000 1.30 @@ -1072,7 +1072,6 @@ { fprintf(stderr, "file: %s, line: %d, column: %d\n\n", engrave_cur_file, engrave_lnum, engrave_col); - exit(-1); } =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_load.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- engrave_load.c 2 Mar 2007 17:04:10 -0000 1.20 +++ engrave_load.c 21 Aug 2007 05:42:29 -0000 1.21 @@ -49,11 +49,11 @@ path = strdup("."); } - snprintf(buf, sizeof(buf), "cat %s | cpp -E -I%s -o %s", file, path, tmpf); + snprintf(buf, sizeof(buf), "cat %s | cpp -I%s > %s", file, path, tmpf); ret = system(buf); if (ret < 0) { - snprintf(buf, sizeof(buf), "gcc -E -I %s -o %s %s", path, tmpf, file); + snprintf(buf, sizeof(buf), "gcc -E -I%s -o %s %s", path, tmpf, file); ret = system(buf); } FREE(path); =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_parse.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- engrave_parse.c 29 Jul 2007 14:48:30 -0000 1.23 +++ engrave_parse.c 21 Aug 2007 05:42:29 -0000 1.24 @@ -8,15 +8,19 @@ Engrave_File * engrave_parse(const char *file, const char *imdir, const char *fontdir) { + int ret; engrave_file = engrave_file_new(); engrave_file_image_dir_set(engrave_file, imdir); engrave_file_font_dir_set(engrave_file, fontdir); yyin = fopen(file, "r"); - yyparse(); + ret = yyparse(); fclose(yyin); - return (engrave_file); + if (ret == 0) + return (engrave_file); + + return (NULL); } void |
From: Enlightenment C. <no...@cv...> - 2007-11-26 03:06:58
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_out.c engrave_parse.c Log Message: Parse&output correctly also on locale that write floating point with ( , ) instead of ( . ) =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_out.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- engrave_out.c 9 Nov 2007 09:15:19 -0000 1.47 +++ engrave_out.c 26 Nov 2007 03:06:57 -0000 1.48 @@ -1,6 +1,7 @@ #include <errno.h> #include <unistd.h> #include <stdio.h> +#include <locale.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -191,6 +192,7 @@ engrave_edc_output(Engrave_File *engrave_file, const char *path) { FILE *out = NULL; + char locale[128]; if (!engrave_file) return 0; @@ -201,6 +203,10 @@ return 0; } + /* set locale posix compliant*/ + strncpy(locale, setlocale(LC_NUMERIC, NULL), sizeof(locale)); + setlocale(LC_NUMERIC, "C"); + /* fonts */ engrave_out_start(out, "fonts"); engrave_file_font_foreach(engrave_file, _engrave_output_font, out); @@ -237,6 +243,10 @@ engrave_out_end(out); fclose(out); + + /* reset locale to system default*/ + setlocale(LC_NUMERIC, locale); + return 1; } =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_parse.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- engrave_parse.c 21 Aug 2007 05:42:29 -0000 1.24 +++ engrave_parse.c 26 Nov 2007 03:06:57 -0000 1.25 @@ -1,4 +1,5 @@ #include "engrave_private.h" +#include <locale.h> #include <Engrave.h> static Engrave_File *engrave_file = 0; @@ -9,14 +10,22 @@ engrave_parse(const char *file, const char *imdir, const char *fontdir) { int ret; + char locale[128]; engrave_file = engrave_file_new(); engrave_file_image_dir_set(engrave_file, imdir); engrave_file_font_dir_set(engrave_file, fontdir); + /* set locale posix compliant*/ + strncpy(locale, setlocale(LC_NUMERIC, NULL), sizeof(locale)); + setlocale(LC_NUMERIC, "C"); + yyin = fopen(file, "r"); ret = yyparse(); fclose(yyin); + /* reset locale to system default*/ + setlocale(LC_NUMERIC, locale); + if (ret == 0) return (engrave_file); |
From: Enlightenment C. <no...@cv...> - 2007-11-27 01:31:49
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_canvas.c Log Message: Update objects stacking on every part redraw =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- engrave_canvas.c 11 Aug 2007 17:30:52 -0000 1.16 +++ engrave_canvas.c 27 Nov 2007 01:31:47 -0000 1.17 @@ -234,6 +234,7 @@ evas_object_show(ep_object); else evas_object_hide(ep_object); + evas_object_raise(ep_object); } static void |
From: Enlightenment C. <no...@cv...> - 2007-11-27 15:23:21
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_part_state.c Log Message: Can set only one text align =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_part_state.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- engrave_part_state.c 29 Jul 2007 15:05:51 -0000 1.24 +++ engrave_part_state.c 27 Nov 2007 15:23:15 -0000 1.25 @@ -840,8 +840,8 @@ /** * engrave_part_state_text_align_set - Set the text alignment of the state. * @param eps: The Engrave_Part_State to set the value too. - * @param x: The x alignment setting. - * @param y: the y alignment setting. + * @param x: The x alignment setting (set x < 0 to leave untouched). + * @param y: the y alignment setting (set y < 0 to leave untouched). * * @return Returns no value */ @@ -849,8 +849,8 @@ engrave_part_state_text_align_set(Engrave_Part_State *eps, double x, double y) { if (!eps) return; - eps->text.align.x = x; - eps->text.align.y = y; + if (x >= 0) eps->text.align.x = x; + if (y >= 0) eps->text.align.y = y; } /** |
From: Enlightenment C. <no...@cv...> - 2007-11-27 15:57:56
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave_part_state.c Log Message: Can set only one state align =================================================================== RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_part_state.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- engrave_part_state.c 27 Nov 2007 15:23:15 -0000 1.25 +++ engrave_part_state.c 27 Nov 2007 15:57:54 -0000 1.26 @@ -137,8 +137,8 @@ /** * engrave_part_state_align_set - Set the alignment of the state. * @param eps: The Engrave_Part_State to set the value too. - * @param x: The x alignment value to set - * @param y: The y alignment value to set + * @param x: The x alignment value to set (set x < 0 to leave untouched). + * @param y: The y alignment value to set (set y < 0 to leave untouched). * * @return Returns no value */ @@ -146,8 +146,8 @@ engrave_part_state_align_set(Engrave_Part_State *eps, double x, double y) { if (!eps) return; - eps->align.x = x; - eps->align.y = y; + if (x >= 0) eps->align.x = x; + if (y >= 0) eps->align.y = y; } /** |
From: Enlightenment C. <no...@cv...> - 2007-12-06 17:53:15
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/doc/images Added Files: _.gif Log Message: Update doxy style |
From: Enlightenment C. <no...@cv...> - 2007-12-06 17:53:49
|
Enlightenment CVS committal Author : davemds Project : e17 Module : libs/engrave Dir : e17/libs/engrave/doc Modified Files: head.html Log Message: Update doxy style =================================================================== RCS file: /cvs/e/e17/libs/engrave/doc/head.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- head.html 27 Mar 2007 02:10:36 -0000 1.2 +++ head.html 6 Dec 2007 17:53:13 -0000 1.3 @@ -12,14 +12,14 @@ <tr> <td class="t" width="50%" valign="top" align="left"> <table width="100px" height="100px" border="0" cellpadding="0" cellspacing="0"> - <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org">Main</a></td></tr> - <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=download">Download</a></td></tr> - <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?about">About</a></td></tr> - <tr><td class="rnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=news">News</a></td></tr> + <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=index">Home</a></td></tr> + <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=news">News</a></td></tr> + <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=about">About</a></td></tr> + <tr><td class="rnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=download">Download</a></td></tr> </table> </td> <td class="tl" width="612" height="250" valign="bottom" align="center"> - <img src="http://web.enlightenment.org/i/_.gif" width="612" height="1" /> + <img src="images/_.gif" width="612" height="1" /> <table border="0" cellpadding="0" cellspacing="4px"> <tr> <td class='nav'><a class='nav' href="index.html">Main Page</a></td> @@ -31,11 +31,11 @@ <hr /> </td> <td class="t" width="50%" valign="top" align="right"> - <table width="100px" height="100px" border="0" cellpadding="0" cellspacing="0"> - <tr><td class="rnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=docs">Documentation</a></td></tr> - <tr><td class="lnav"><a class="nav" href="http://bugs.enlightenment.org">Bugs</a></td></tr> - <tr><td class="lnav"><a class="nav" href="http://forum.enlightenment.org">Forum</a></td></tr> - <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=sponsors">Sponsors</a></td></tr> + <table width="100px" height="100px" border="0" cellpadding="0" cellspacing="0"> + <tr><td class="rnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=support">Support</a></td></tr> + <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=contribute">Contribute</a></td></tr> + <tr><td class="lnav"><a class="nav" href="http://web.enlightenment.org/p.php?p=contact">Contact</a></td></tr> + <tr><td class="lnav"><a class="nav" href="http://trac.enlightenment.org/e">Tracker</a></td></tr> </table> </td> </tr> |