[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. 00a54b97536aa9ded13ec8505d14a50a99338b40

[raster]

The following commit has been merged in the upstream-vcs branch:
commit 3270755ad5b84aaf9bcaa779ba8d8d0f309e8fa7
Author: raster <raster>
Date:   Thu May 29 02:00:03 2008 +0000

    * add efreet garbage data check
    * remove printfs that clutter output
    * add efreet file type check - only parse regular files
    * chekc mmap returns correctly for MAP_FAILED results
    * edje has some stubs for adding script-only objecvts - but nothing useful
    right now

diff --git a/src/bin/edje_cc_handlers.c b/src/bin/edje_cc_handlers.c
index 77f5373..1d2fbfc 100644
--- a/src/bin/edje_cc_handlers.c
+++ b/src/bin/edje_cc_handlers.c
@@ -70,6 +70,7 @@ static void ob_collections(void);
 
 static void ob_collections_group(void);
 static void st_collections_group_name(void);
+static void st_collections_group_script_only(void);
 static void st_collections_group_alias(void);
 static void st_collections_group_min(void);
 static void st_collections_group_max(void);
@@ -192,6 +193,7 @@ New_Statement_Handler statement_handlers[] =
      {"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.script_only", st_collections_group_script_only},
      {"collections.group.alias", st_collections_group_alias},
      {"collections.group.min", st_collections_group_min},
      {"collections.group.max", st_collections_group_max},
@@ -763,7 +765,7 @@ st_data_file(void)
      }
 
    data = mmap(NULL, buf.st_size, PROT_READ, MAP_SHARED, fd, 0);
-   if (!data)
+   if (data == MAP_FAILED)
      {
         fprintf(stderr, "%s: Error. %s:%i when mapping file \"%s\": \"%s\"\n",
                 progname, file_in, line, filename, strerror(errno));
@@ -1228,6 +1230,28 @@ st_collections_group_name(void)
 /**
     @page edcref
     @property
+        script_only
+    @parameters
+        [on/off]
+    @effect
+        The flag (on/off) as to if this group is defined ONLY by script
+        callbacks such as init(), resize() and shutdown()
+    @endproperty
+*/
+static void
+st_collections_group_script_only(void)
+{
+   Edje_Part_Collection *pc;
+
+   check_arg_count(1);
+
+   pc = evas_list_data(evas_list_last(edje_collections));
+   pc->script_only = parse_bool(0);
+}
+
+/**
+    @page edcref
+    @property
         alias
     @parameters
         [aditional group name]
diff --git a/src/lib/edje_data.c b/src/lib/edje_data.c
index 323960c..f23200e 100644
--- a/src/lib/edje_data.c
+++ b/src/lib/edje_data.c
@@ -387,4 +387,5 @@ _edje_edd_setup(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "prop.max.w", prop.max.w, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "prop.max.h", prop.max.h, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "id", id, EET_T_INT);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "script_only", id, EET_T_UCHAR);
 }
diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 7178b51..7b4c010 100644
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -457,6 +457,8 @@ struct _Edje_Part_Collection
    Embryo_Program   *script; /* all the embryo script code for this group */
 
    const char       *part;
+   
+   unsigned char    script_only;
 };
 
 struct _Edje_Part

-- 
Enlightenment DR17 graphical layout and animation library