Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
Edje reference patch one (from dresb)
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- edje_cc_handlers.c 24 Jul 2007 14:20:07 -0000 1.77
+++ edje_cc_handlers.c 23 Nov 2007 16:40:38 -0000 1.78
@@ -1074,6 +1074,31 @@
}
static void
+st_collections_group_parts_part_effect(void)
+{
+ Edje_Part_Collection *pc;
+ 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->effect = parse_enum(0,
+ "NONE", EDJE_TEXT_EFFECT_NONE,
+ "PLAIN", EDJE_TEXT_EFFECT_PLAIN,
+ "OUTLINE", EDJE_TEXT_EFFECT_OUTLINE,
+ "SOFT_OUTLINE", EDJE_TEXT_EFFECT_SOFT_OUTLINE,
+ "SHADOW", EDJE_TEXT_EFFECT_SHADOW,
+ "SOFT_SHADOW", EDJE_TEXT_EFFECT_SOFT_SHADOW,
+ "OUTLINE_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SHADOW,
+ "OUTLINE_SOFT_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW,
+ "FAR_SHADOW", EDJE_TEXT_EFFECT_FAR_SHADOW,
+ "FAR_SOFT_SHADOW", EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW,
+ "GLOW", EDJE_TEXT_EFFECT_GLOW,
+ NULL);
+}
+
+static void
st_collections_group_parts_part_dragable_x(void)
{
Edje_Part_Collection *pc;
@@ -1505,6 +1530,79 @@
}
static void
+st_collections_group_parts_part_description_color_class(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ 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;
+ if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
+ ed->color_class = parse_str(0);
+}
+
+static void
+st_collections_group_parts_part_description_color(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(4);
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ 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->color.r = parse_int_range(0, 0, 255);
+ ed->color.g = parse_int_range(1, 0, 255);
+ ed->color.b = parse_int_range(2, 0, 255);
+ ed->color.a = parse_int_range(3, 0, 255);
+}
+
+static void
+st_collections_group_parts_part_description_color2(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(4);
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ 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->color2.r = parse_int_range(0, 0, 255);
+ ed->color2.g = parse_int_range(1, 0, 255);
+ ed->color2.b = parse_int_range(2, 0, 255);
+ ed->color2.a = parse_int_range(3, 0, 255);
+}
+
+static void
+st_collections_group_parts_part_description_color3(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(4);
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ 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->color3.r = parse_int_range(0, 0, 255);
+ ed->color3.g = parse_int_range(1, 0, 255);
+ ed->color3.b = parse_int_range(2, 0, 255);
+ ed->color3.a = parse_int_range(3, 0, 255);
+}
+
+static void
st_collections_group_parts_part_description_rel1_relative(void)
{
Edje_Part_Collection *pc;
@@ -1850,72 +1948,72 @@
}
static void
-st_collections_group_parts_part_description_fill_origin_relative(void)
+st_collections_group_parts_part_description_fill_spread(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
- check_arg_count(2);
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
- if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
+ /* XXX this will need to include IMAGES when spread support is added to
evas images */
+ if (ep->type != EDJE_PART_TYPE_GRADIENT)
{
fprintf(stderr, "%s: Error. parse error %s:%i. "
- "fill attributes in non-IMAGE part.\n",
+ "gradient attributes in non-GRADIENT part.\n",
progname, file_in, line - 1);
exit(-1);
}
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.spread = parse_int_range(0, 0, 1);
}
static void
-st_collections_group_parts_part_description_fill_origin_offset(void)
+st_collections_group_parts_part_description_fill_angle(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
- check_arg_count(2);
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
- if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
+ /* XXX this will need to include IMAGES when angle support is added to evas
images */
+ if (ep->type != EDJE_PART_TYPE_GRADIENT)
{
fprintf(stderr, "%s: Error. parse error %s:%i. "
- "fill attributes in non-IMAGE part.\n",
+ "gradient attributes in non-GRADIENT part.\n",
progname, file_in, line - 1);
exit(-1);
}
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
- ed->fill.pos_abs_x = parse_int(0);
- ed->fill.pos_abs_y = parse_int(1);
+ ed->fill.angle = parse_int_range(0, 0, 360);
}
static void
-st_collections_group_parts_part_description_fill_size_relative(void)
+st_collections_group_parts_part_description_fill_type(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
- check_arg_count(2);
+ 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;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
- if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
{
fprintf(stderr, "%s: Error. parse error %s:%i. "
"fill attributes in non-IMAGE part.\n",
@@ -1923,12 +2021,14 @@
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.type = parse_enum(0,
+ "SCALE", EDJE_FILL_TYPE_SCALE,
+ "TILE", EDJE_FILL_TYPE_TILE,
+ NULL);
}
static void
-st_collections_group_parts_part_description_fill_size_offset(void)
+st_collections_group_parts_part_description_fill_origin_relative(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
@@ -1938,8 +2038,6 @@
pc = evas_list_data(evas_list_last(edje_collections));
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));
if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
{
@@ -1949,81 +2047,88 @@
exit(-1);
}
- ed->fill.abs_x = parse_int(0);
- ed->fill.abs_y = parse_int(1);
-}
-
-static void
-st_collections_group_parts_part_description_color_class(void)
-{
- Edje_Part_Collection *pc;
- Edje_Part *ep;
- 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;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
- ed->color_class = parse_str(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);
}
static void
-st_collections_group_parts_part_description_color(void)
+st_collections_group_parts_part_description_fill_origin_offset(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
- check_arg_count(4);
+ check_arg_count(2);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line - 1);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
- ed->color.r = parse_int_range(0, 0, 255);
- ed->color.g = parse_int_range(1, 0, 255);
- ed->color.b = parse_int_range(2, 0, 255);
- ed->color.a = parse_int_range(3, 0, 255);
+ ed->fill.pos_abs_x = parse_int(0);
+ ed->fill.pos_abs_y = parse_int(1);
}
static void
-st_collections_group_parts_part_description_color2(void)
+st_collections_group_parts_part_description_fill_size_relative(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
- check_arg_count(4);
+ check_arg_count(2);
pc = evas_list_data(evas_list_last(edje_collections));
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->color2.r = parse_int_range(0, 0, 255);
- ed->color2.g = parse_int_range(1, 0, 255);
- ed->color2.b = parse_int_range(2, 0, 255);
- ed->color2.a = parse_int_range(3, 0, 255);
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line - 1);
+ 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);
}
static void
-st_collections_group_parts_part_description_color3(void)
+st_collections_group_parts_part_description_fill_size_offset(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
- check_arg_count(4);
+ check_arg_count(2);
pc = evas_list_data(evas_list_last(edje_collections));
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->color3.r = parse_int_range(0, 0, 255);
- ed->color3.g = parse_int_range(1, 0, 255);
- ed->color3.b = parse_int_range(2, 0, 255);
- ed->color3.a = parse_int_range(3, 0, 255);
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line - 1);
+ exit(-1);
+ }
+
+ ed->fill.abs_x = parse_int(0);
+ ed->fill.abs_y = parse_int(1);
}
static void
@@ -2168,31 +2273,6 @@
}
static void
-st_collections_group_parts_part_effect(void)
-{
- Edje_Part_Collection *pc;
- 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->effect = parse_enum(0,
- "NONE", EDJE_TEXT_EFFECT_NONE,
- "PLAIN", EDJE_TEXT_EFFECT_PLAIN,
- "OUTLINE", EDJE_TEXT_EFFECT_OUTLINE,
- "SOFT_OUTLINE", EDJE_TEXT_EFFECT_SOFT_OUTLINE,
- "SHADOW", EDJE_TEXT_EFFECT_SHADOW,
- "SOFT_SHADOW", EDJE_TEXT_EFFECT_SOFT_SHADOW,
- "OUTLINE_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SHADOW,
- "OUTLINE_SOFT_SHADOW",
EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW,
- "FAR_SHADOW", EDJE_TEXT_EFFECT_FAR_SHADOW,
- "FAR_SOFT_SHADOW", EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW,
- "GLOW", EDJE_TEXT_EFFECT_GLOW,
- NULL);
-}
-
-static void
st_collections_group_parts_part_description_text_fit(void)
{
Edje_Part_Collection *pc;
@@ -2363,58 +2443,6 @@
}
static void
-st_collections_group_parts_part_description_fill_angle(void)
-{
- Edje_Part_Collection *pc;
- Edje_Part *ep;
- 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));
-
- /* XXX this will need to include IMAGES when angle support is added to evas
images */
- if (ep->type != EDJE_PART_TYPE_GRADIENT)
- {
- fprintf(stderr, "%s: Error. parse error %s:%i. "
- "gradient attributes in non-GRADIENT part.\n",
- progname, file_in, line - 1);
- exit(-1);
- }
-
- ed = ep->default_desc;
- if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
- ed->fill.angle = parse_int_range(0, 0, 360);
-}
-
-static void
-st_collections_group_parts_part_description_fill_spread(void)
-{
- Edje_Part_Collection *pc;
- Edje_Part *ep;
- 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));
-
- /* XXX this will need to include IMAGES when spread support is added to
evas images */
- if (ep->type != EDJE_PART_TYPE_GRADIENT)
- {
- fprintf(stderr, "%s: Error. parse error %s:%i. "
- "gradient attributes in non-GRADIENT part.\n",
- progname, file_in, line - 1);
- exit(-1);
- }
-
- ed = ep->default_desc;
- if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
- ed->fill.spread = parse_int_range(0, 0, 1);
-}
-
-static void
st_collections_group_parts_part_description_text_elipsis(void)
{
Edje_Part_Collection *pc;
@@ -2697,34 +2725,6 @@
ep = evas_list_data(evas_list_last(pc->programs));
ep->in.from = parse_float_range(0, 0.0, 999999999.0);
ep->in.range = parse_float_range(1, 0.0, 999999999.0);
-}
-
-static void
-st_collections_group_parts_part_description_fill_type(void)
-{
- Edje_Part_Collection *pc;
- Edje_Part *ep;
- 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;
- if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
-
- if (ep->type != EDJE_PART_TYPE_IMAGE)
- {
- fprintf(stderr, "%s: Error. parse error %s:%i. "
- "fill attributes in non-IMAGE part.\n",
- progname, file_in, line - 1);
- exit(-1);
- }
-
- ed->fill.type = parse_enum(0,
- "SCALE", EDJE_FILL_TYPE_SCALE,
- "TILE", EDJE_FILL_TYPE_TILE,
- NULL);
}
static void
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
