Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
separate x & y relative "to" params. the old .edc format is still supported
where "to" implies both x & y. to_x == only in x dir, to_y == only in y dir :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- edje_cc_handlers.c 5 Aug 2003 14:33:35 -0000 1.19
+++ edje_cc_handlers.c 14 Aug 2003 03:22:37 -0000 1.20
@@ -39,9 +39,13 @@
static void st_collections_group_parts_part_description_rel1_relative(void);
static void st_collections_group_parts_part_description_rel1_offset(void);
static void st_collections_group_parts_part_description_rel1_to(void);
+static void st_collections_group_parts_part_description_rel1_to_x(void);
+static void st_collections_group_parts_part_description_rel1_to_y(void);
static void st_collections_group_parts_part_description_rel2_relative(void);
static void st_collections_group_parts_part_description_rel2_offset(void);
static void st_collections_group_parts_part_description_rel2_to(void);
+static void st_collections_group_parts_part_description_rel2_to_x(void);
+static void st_collections_group_parts_part_description_rel2_to_y(void);
static void st_collections_group_parts_part_description_image_normal(void);
static void st_collections_group_parts_part_description_image_tween(void);
static void st_collections_group_parts_part_description_border(void);
@@ -103,9 +107,13 @@
{"collections.group.parts.part.description.rel1.relative",
st_collections_group_parts_part_description_rel1_relative},
{"collections.group.parts.part.description.rel1.offset",
st_collections_group_parts_part_description_rel1_offset},
{"collections.group.parts.part.description.rel1.to",
st_collections_group_parts_part_description_rel1_to},
+ {"collections.group.parts.part.description.rel1.to_x",
st_collections_group_parts_part_description_rel1_to_x},
+ {"collections.group.parts.part.description.rel1.to_y",
st_collections_group_parts_part_description_rel1_to_y},
{"collections.group.parts.part.description.rel2.relative",
st_collections_group_parts_part_description_rel2_relative},
{"collections.group.parts.part.description.rel2.offset",
st_collections_group_parts_part_description_rel2_offset},
{"collections.group.parts.part.description.rel2.to",
st_collections_group_parts_part_description_rel2_to},
+ {"collections.group.parts.part.description.rel2.to_x",
st_collections_group_parts_part_description_rel2_to_x},
+ {"collections.group.parts.part.description.rel2.to_y",
st_collections_group_parts_part_description_rel2_to_y},
{"collections.group.parts.part.description.image.normal",
st_collections_group_parts_part_description_image_normal},
{"collections.group.parts.part.description.image.tween",
st_collections_group_parts_part_description_image_tween},
{"collections.group.parts.part.description.border",
st_collections_group_parts_part_description_border},
@@ -527,12 +535,14 @@
ed->rel1.relative_y = 0.0;
ed->rel1.offset_x = 0;
ed->rel1.offset_x = 0;
- ed->rel1.id = -1;
+ ed->rel1.id_x = -1;
+ ed->rel1.id_y = -1;
ed->rel2.relative_x = 1.0;
ed->rel2.relative_y = 1.0;
ed->rel2.offset_x = -1;
ed->rel2.offset_x = -1;
- ed->rel2.id = -1;
+ ed->rel2.id_x = -1;
+ ed->rel2.id_y = -1;
ed->image.id = -1;
ed->fill.smooth = 1;
ed->fill.pos_rel_x = 0.0;
@@ -708,7 +718,48 @@
char *name;
name = parse_str(0);
- data_queue_part_lookup(pc, name, &(ed->rel1.id));
+ data_queue_part_lookup(pc, name, &(ed->rel1.id_x));
+ data_queue_part_lookup(pc, name, &(ed->rel1.id_y));
+ free(name);
+ }
+}
+
+static void
+st_collections_group_parts_part_description_rel1_to_x(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));
+ ed = ep->default_desc;
+ 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);
+ }
+}
+
+static void
+st_collections_group_parts_part_description_rel1_to_y(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));
+ ed = ep->default_desc;
+ 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);
}
}
@@ -758,7 +809,48 @@
char *name;
name = parse_str(0);
- data_queue_part_lookup(pc, name, &(ed->rel2.id));
+ data_queue_part_lookup(pc, name, &(ed->rel2.id_x));
+ data_queue_part_lookup(pc, name, &(ed->rel2.id_y));
+ free(name);
+ }
+}
+
+static void
+st_collections_group_parts_part_description_rel2_to_x(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));
+ ed = ep->default_desc;
+ 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);
+ }
+}
+
+static void
+st_collections_group_parts_part_description_rel2_to_y(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));
+ ed = ep->default_desc;
+ 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);
}
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs