Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/lib


Modified Files:
        Edje.h Edje_Edit.h edje_data.c edje_load.c edje_main.c 
        edje_private.h edje_program.c edje_smart.c 


Log Message:


fixed a leak... patches from trill... need to go thru my mail....

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- Edje.h      20 Jan 2004 01:04:16 -0000      1.25
+++ Edje.h      8 Mar 2004 02:43:48 -0000       1.26
@@ -15,6 +15,7 @@
 #define EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED 4
 #define EDJE_LOAD_ERROR_CORRUPT_FILE               5
 #define EDJE_LOAD_ERROR_UNKNOWN_FORMAT             6
+#define EDJE_LOAD_ERROR_INCOMPATIBLE_FILE          7
 
 #ifdef __cplusplus
 extern "C" {
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje_Edit.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Edje_Edit.h 20 Feb 2004 03:20:10 -0000      1.1
+++ Edje_Edit.h 8 Mar 2004 02:43:48 -0000       1.2
@@ -16,6 +16,7 @@
 typedef struct _Edje_Image_Directory_Entry           Edje_Image_Directory_Entry;
 typedef struct _Edje_Program                         Edje_Program;
 typedef struct _Edje_Program_Target                  Edje_Program_Target;
+typedef struct _Edje_Program_After                   Edje_Program_After;
 typedef struct _Edje_Part_Collection_Directory       Edje_Part_Collection_Directory;
 typedef struct _Edje_Part_Collection_Directory_Entry 
Edje_Part_Collection_Directory_Entry;
 typedef struct _Edje_Part_Collection                 Edje_Part_Collection;
@@ -127,6 +128,7 @@
    
    Evas_Hash                      *collection_hash;
    int                             references;
+   int                             version;
 };
 
 /*----------*/
@@ -180,7 +182,7 @@
    
    Evas_List *targets; /* list of target parts to apply the state to */
    
-   int        after; /* an action id to run at the end of this, for looping */
+   Evas_List *after; /* list of actions to run at the end of this, for looping */
 };
 
 struct _Edje_Program_Target /* the target of an action */
@@ -188,6 +190,11 @@
    int id; /* just the part id no, or action id no */
 };
 
+struct _Edje_Program_After /* the action to run after another action */
+{
+   int id;
+};
+
 /*----------*/
 
 struct _Edje_Part_Collection_Directory
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_data.c 12 Jan 2004 17:41:47 -0000      1.15
+++ edje_data.c 8 Mar 2004 02:43:48 -0000       1.16
@@ -7,6 +7,7 @@
 Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry = NULL;
 Eet_Data_Descriptor *_edje_edd_edje_program = NULL;
 Eet_Data_Descriptor *_edje_edd_edje_program_target = NULL;
+Eet_Data_Descriptor *_edje_edd_edje_program_after = NULL;
 Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory = NULL;
 Eet_Data_Descriptor *_edje_edd_edje_part_collection_directory_entry = NULL;
 Eet_Data_Descriptor *_edje_edd_edje_part_collection = NULL;
@@ -40,6 +41,7 @@
    FREED(_edje_edd_edje_image_directory_entry);
    FREED(_edje_edd_edje_program);
    FREED(_edje_edd_edje_program_target);
+   FREED(_edje_edd_edje_program_after);
    FREED(_edje_edd_edje_part_collection_directory);
    FREED(_edje_edd_edje_part_collection_directory_entry);
    FREED(_edje_edd_edje_part_collection);
@@ -88,6 +90,7 @@
    _edje_edd_edje_file = 
      NEWD("Edje_File", 
          Edje_File);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_file, Edje_File, "version", version, 
EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_file, Edje_File, "image_dir", 
image_dir, _edje_edd_edje_image_directory);
    EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_file, Edje_File, "collection_dir", 
collection_dir, _edje_edd_edje_part_collection_directory);   
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_file, Edje_File, "data", data, 
_edje_edd_edje_data);
@@ -97,7 +100,12 @@
      NEWD("Edje_Program_Target",
          Edje_Program_Target);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program_target, Edje_Program_Target, 
"id", id, EET_T_INT);
-   
+
+   _edje_edd_edje_program_after =
+     NEWD("Edje_Program_After", Edje_Program_After);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program_after,
+                                 Edje_Program_After, "id", id, EET_T_INT);
+
    _edje_edd_edje_program = 
      NEWD("Edje_Program",
          Edje_Program);
@@ -115,8 +123,8 @@
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "tween.mode", 
tween.mode, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "tween.time", 
tween.time, EET_T_DOUBLE);
    EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_program, Edje_Program, "targets", 
targets, _edje_edd_edje_program_target);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "after", 
after, EET_T_INT);
-   
+   EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_program, Edje_Program, "after", after, 
_edje_edd_edje_program_after);
+
    _edje_edd_edje_part_image_id = 
      NEWD("Edje_Part_Image_Id",
          Edje_Part_Image_Id);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- edje_load.c 23 Jan 2004 02:13:38 -0000      1.35
+++ edje_load.c 8 Mar 2004 02:43:48 -0000       1.36
@@ -360,6 +360,14 @@
             goto out;
          }
 
+       if (ed->file->version != EDJE_FILE_VERSION)
+         {
+           _edje_file_free(ed->file);
+           ed->file = NULL;
+           ed->load_error = EDJE_LOAD_ERROR_INCOMPATIBLE_FILE;
+           goto out;
+         }
+
        ed->file->references = 1;   
        ed->file->path = strdup(ed->path);
        if (!ed->file->collection_dir)
@@ -577,6 +585,14 @@
             pr->targets = evas_list_remove(pr->targets, prt);
             free(prt);
          }
+       while (pr->after)
+         {
+            Edje_Program_After *pa;
+
+            pa = pr->after->data;
+            pr->after = evas_list_remove(pr->after, pa);
+                free(pa);
+         }
        free(pr);
      }
    while (ec->parts)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- edje_main.c 20 Jan 2004 01:04:16 -0000      1.30
+++ edje_main.c 8 Mar 2004 02:43:48 -0000       1.31
@@ -55,6 +55,26 @@
    ed->path = NULL;
    if (ed->part) free(ed->part);
    ed->part = NULL;
+   if ((ed->actions) || (ed->pending_actions))
+     {
+       _edje_animators = evas_list_remove(_edje_animators, ed);
+     }
+   while (ed->actions)
+     {
+       Edje_Running_Program *runp;
+       
+       runp = ed->actions->data;
+       ed->actions = evas_list_remove(ed->actions, runp);
+       free(runp);
+     }
+   while (ed->pending_actions)
+     {
+       Edje_Pending_Program *pp;
+       
+       pp = ed->pending_actions->data;
+       ed->pending_actions = evas_list_remove(ed->pending_actions, pp);
+       free(pp);
+     }
    while (ed->callbacks)
      {
        Edje_Signal_Callback *escb;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- edje_private.h      20 Feb 2004 03:20:10 -0000      1.58
+++ edje_private.h      8 Mar 2004 02:43:48 -0000       1.59
@@ -17,6 +17,11 @@
 
 #include "Edje_Edit.h"
 
+/* increment this when the EET data descriptors have changed and old
+ * EETs cannot be loaded/used correctly anymore.
+ */
+#define EDJE_FILE_VERSION 1
+
 /* FIXME:
  * 
  * more example edje files
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_program.c      6 Feb 2004 03:40:15 -0000       1.27
+++ edje_program.c      8 Mar 2004 02:43:48 -0000       1.28
@@ -268,17 +268,20 @@
             if (!ed->walking_actions) free(runp);
             goto break_prog;
          }
-       if (runp->program->after >= 0)
+       for (l = runp->program->after; l; l = l->next)
          {
             Edje_Program *pr;
+            Edje_Program_After *pa = l->data;
             
-            pr = evas_list_nth(ed->collection->programs, 
-                               runp->program->after);
-            if (pr) _edje_program_run(ed, pr, 0);
-            if (_edje_block_break(ed))
+            if (pa->id >= 0)
               {
-                 if (!ed->walking_actions) free(runp);
-                 goto break_prog;
+               pr = evas_list_nth(ed->collection->programs, pa->id);
+               if (pr) _edje_program_run(ed, pr, 0);
+               if (_edje_block_break(ed))
+                 {
+                    if (!ed->walking_actions) free(runp);
+                    goto break_prog;
+                 }
               }
          }
        _edje_thaw(ed);
@@ -330,10 +333,10 @@
      {
        _edje_anim_count--;
        ed->actions = evas_list_remove(ed->actions, runp);
+       free(runp);
        if (!ed->actions)
          {
             _edje_animators = evas_list_remove(_edje_animators, ed);
-            free(runp);
          }
      }
    _edje_emit(ed, "program,stop", pname);
@@ -409,7 +412,11 @@
                    }
               }
             _edje_emit(ed, "program,start", pr->name);
-            if (_edje_block_break(ed)) goto break_prog;
+            if (_edje_block_break(ed))
+              {
+                 ed->actions = evas_list_append(ed->actions, runp);
+                 goto break_prog;
+              }
             if (!ed->actions)
               _edje_animators = evas_list_append(_edje_animators, ed);
             ed->actions = evas_list_append(ed->actions, runp);
@@ -445,14 +452,18 @@
             if (_edje_block_break(ed)) goto break_prog;
             _edje_emit(ed, "program,stop", pr->name);
             if (_edje_block_break(ed)) goto break_prog;
-            if (pr->after >= 0)
+
+            for (l = pr->after; l; l = l->next)
               {
                  Edje_Program *pr2;
-                 
-                 pr2 = evas_list_nth(ed->collection->programs, 
-                                    pr->after);
-                 if (pr2) _edje_program_run(ed, pr2, 0);
-                 if (_edje_block_break(ed)) goto break_prog;
+                 Edje_Program_After *pa = l->data;
+                
+                 if (pa->id >= 0)
+                   {
+                      pr2 = evas_list_nth(ed->collection->programs, pa->id);
+                      if (pr2) _edje_program_run(ed, pr2, 0);
+                      if (_edje_block_break(ed)) goto break_prog;
+                   }
               }
             _edje_recalc(ed);
          }
@@ -591,13 +602,17 @@
         /* && (pr->tween.time > 0.0) && (!ed->no_anim))) */
         ))
      {
-       if (pr->after >= 0)
+       for (l= pr->after; l; l = l->next)
          {
             Edje_Program *pr2;
+            Edje_Program_After *pa = l->data;
             
-            pr2 = evas_list_nth(ed->collection->programs, pr->after);
-            if (pr2) _edje_program_run(ed, pr2, 0);
-            if (_edje_block_break(ed)) goto break_prog;
+            if (pa->id >= 0)
+              {
+               pr2 = evas_list_nth(ed->collection->programs, pa->id);
+               if (pr2) _edje_program_run(ed, pr2, 0);
+               if (_edje_block_break(ed)) goto break_prog;
+              }
          }
      }
    break_prog:
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- edje_smart.c        1 Feb 2004 14:02:40 -0000       1.13
+++ edje_smart.c        8 Mar 2004 02:43:48 -0000       1.14
@@ -316,7 +316,8 @@
    ed = evas_object_smart_data_get(obj);
    if (!ed) return;
    if (!evas_object_visible_get(obj)) return;
-   evas_object_hide(ed->clipper);
+   if ((ed->collection) && (ed->parts))
+     evas_object_hide(ed->clipper);
    _edje_emit(ed, "hide", "");
 }
 




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to