Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc.h edje_cc_handlers.c edje_cc_out.c
Log Message:
add group aliases.
use as follows:
group {
name: "primary_name";
alias: "another_name";
alias: "one_more_name";
}
then you can refer to the group by any of these names.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_cc.h 6 Aug 2006 01:45:45 -0000 1.27
+++ edje_cc.h 12 Oct 2006 05:35:14 -0000 1.28
@@ -128,6 +128,7 @@
extern Evas_List *fonts;
extern Evas_List *codes;
extern Evas_List *defines;
+extern Evas_List *aliases;
extern New_Object_Handler object_handlers[];
extern New_Statement_Handler statement_handlers[];
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- edje_cc_handlers.c 9 Oct 2006 06:01:13 -0000 1.70
+++ edje_cc_handlers.c 12 Oct 2006 05:35:14 -0000 1.71
@@ -30,6 +30,7 @@
static void ob_collections_group(void);
static void st_collections_group_name(void);
+static void st_collections_group_alias(void);
static void st_collections_group_min(void);
static void st_collections_group_max(void);
static void st_collections_group_data_item(void);
@@ -144,6 +145,7 @@
{"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},
{"collections.group.max", st_collections_group_max},
{"collections.group.data.item", st_collections_group_data_item},
@@ -791,6 +793,21 @@
de = evas_list_data(evas_list_last(edje_file->collection_dir->entries));
de->entry = parse_str(0);
+}
+
+static void
+st_collections_group_alias(void)
+{
+ Edje_Part_Collection_Directory_Entry *de, *alias;
+
+ 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);
+
+ aliases = evas_list_append(aliases, alias);
}
static void
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- edje_cc_out.c 6 Aug 2006 01:35:56 -0000 1.52
+++ edje_cc_out.c 12 Oct 2006 05:35:14 -0000 1.53
@@ -52,6 +52,7 @@
Evas_List *fonts = NULL;
Evas_List *codes = NULL;
Evas_List *code_lookups = NULL;
+Evas_List *aliases = NULL;
static Eet_Data_Descriptor *edd_edje_file = NULL;
static Eet_Data_Descriptor *edd_edje_image_directory = NULL;
@@ -221,6 +222,16 @@
}
if (edje_file)
{
+
+ if (edje_file->collection_dir)
+ {
+ /* copy aliases into collection directory */
+ while (aliases)
+ {
+ edje_file->collection_dir->entries =
evas_list_append(edje_file->collection_dir->entries, aliases->data);
+ aliases = evas_list_remove_list(aliases, aliases);
+ }
+ }
bytes = eet_data_write(ef, edd_edje_file, "edje_file", edje_file, 1);
if (bytes <= 0)
{
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
