Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor
Modified Files:
edje_edit.patch
Log Message:
* disable edje cache on load
* commented out all free() for eet strings. Need to find a solution for this.
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/edje_edit.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- edje_edit.patch 26 Feb 2008 01:33:35 -0000 1.18
+++ edje_edit.patch 3 Mar 2008 23:07:52 -0000 1.19
@@ -4,7 +4,7 @@
retrieving revision 1.4
diff -u -r1.4 Doxyfile
--- Doxyfile 6 Dec 2007 23:40:48 -0000 1.4
-+++ Doxyfile 26 Feb 2008 01:24:35 -0000
++++ Doxyfile 3 Mar 2008 23:03:21 -0000
@@ -1,7 +1,7 @@
PROJECT_NAME = Edje
PROJECT_NUMBER =
@@ -29,7 +29,7 @@
retrieving revision 1.6
diff -u -r1.6 gendoc
--- gendoc 6 Dec 2007 23:42:38 -0000 1.6
-+++ gendoc 26 Feb 2008 01:24:35 -0000
++++ gendoc 3 Mar 2008 23:03:21 -0000
@@ -1,7 +1,7 @@
#!/bin/sh
cp ./edje.c.in ./edje.c
@@ -53,8 +53,8 @@
RCS file: src/lib/Edje_Edit.h
diff -N src/lib/Edje_Edit.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/lib/Edje_Edit.h 26 Feb 2008 01:24:35 -0000
-@@ -0,0 +1,1386 @@
++++ src/lib/Edje_Edit.h 3 Mar 2008 23:03:21 -0000
+@@ -0,0 +1,1398 @@
+#ifndef _EDJE_EDIT_H
+#define _EDJE_EDIT_H
+
@@ -162,6 +162,18 @@
+ Evas_Object *obj ///< The edje object to save
+);
+
++/**Open a group for editing in the given edje file.
++ * This function do the same as edje_object_file_set(), but make some extra
++ * stuff usefull for editing (as disabling cache). Always use this instead of
++ * the original if you need to edit the edje.
++ */
++EAPI int ///@return 1 on success, 0 on failure
++edje_edit_load(
++ Evas_Object *obj, ///< The edje object to load the group in
++ const char *file, ///< The name of the file to take the group from
++ const char *group ///< The name of the group to load
++);
++
+/**Print on standard output many information about the internal status
+ * of the edje object.
+ * This is probably only usefull to debug.
@@ -1447,7 +1459,7 @@
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- src/lib/Makefile.am 18 Jan 2008 06:38:46 -0000 1.39
-+++ src/lib/Makefile.am 26 Feb 2008 01:24:35 -0000
++++ src/lib/Makefile.am 3 Mar 2008 23:03:21 -0000
@@ -14,7 +14,8 @@
libedje.la
@@ -1473,8 +1485,8 @@
RCS file: src/lib/edje_edit.c
diff -N src/lib/edje_edit.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/lib/edje_edit.c 26 Feb 2008 01:24:36 -0000
-@@ -0,0 +1,3378 @@
++++ src/lib/edje_edit.c 3 Mar 2008 23:03:22 -0000
+@@ -0,0 +1,3396 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
@@ -2231,7 +2243,7 @@
+ printf("Set name of current group: %s [id: %d][new name: %s]\n",
+ pc->part, pc->id, new_name);
+
-+ if (pc->part) evas_stringshare_del(pc->part);
++ //if (pc->part && ed->file->free_strings) evas_stringshare_del(pc->part);
TODO FIXME
+ pc->part = evas_stringshare_add(new_name);
+
+ l = ed->file->collection_dir->entries;
@@ -2347,7 +2359,7 @@
+
+ printf("Set name of part: %s [new name: %s]\n", part, new_name);
+
-+ if (rp->part->name) evas_stringshare_del(rp->part->name);
++ //if (rp->part->name && ed->file->free_strings)
evas_stringshare_del(rp->part->name); TODO FIXME
+ rp->part->name = (char *)evas_stringshare_add(new_name);
+
+ return 1;
@@ -2541,7 +2553,7 @@
+ _edje_fix_parts_id(ed);
+
+ /* Free Edje_Part and all descriptions */
-+ if (ep->name) evas_stringshare_del(ep->name);
++ //if (ep->name && ed->file->free_strings) evas_stringshare_del(ep->name);
TODO FIXME
+ if (ep->default_desc)
+ {
+ _edje_collection_free_part_description_free(ep->default_desc);
@@ -2805,7 +2817,8 @@
+
+ if (rp->part->source)
+ {
-+ evas_stringshare_del(rp->part->source);
++ //if (ed->file->free_strings)
++ // evas_stringshare_del(rp->part->source); TODO FIXME
+ rp->part->source = NULL;
+ }
+
@@ -2895,7 +2908,7 @@
+ }
+
+ /* set name */
-+ if (pd->state.name) evas_stringshare_del(pd->state.name);
++ //if (pd->state.name && ed->file->free_strings)
evas_stringshare_del(pd->state.name); TODO FIXME
+ pd->state.name = (char *)evas_stringshare_add(new_name);
+ /* set value */
+ pd->state.value = value;
@@ -3545,8 +3558,8 @@
+
+ if (!text) return;
+
-+ if (pd->text.text)
-+ evas_stringshare_del(pd->text.text);
++ //if (pd->text.text && ed->file->free_strings)
++ // evas_stringshare_del(pd->text.text); TODO FIXME
+
+ pd->text.text = (char *)evas_stringshare_add(text);
+
@@ -3772,7 +3785,7 @@
+ GET_PD_OR_RETURN()
+ printf("SET FONT of state: %s [%s]\n", state, font);
+
-+ if (pd->text.font) evas_stringshare_del(pd->text.font);
++ //if (pd->text.font && ed->file->free_strings)
evas_stringshare_del(pd->text.font); TODO FIXME
+ pd->text.font = (char *)evas_stringshare_add(font);
+
+ edje_object_calc_force(obj);
@@ -4131,11 +4144,14 @@
+ pc->programs = evas_list_remove(pc->programs, epr);
+
+ //Free Edje_Program
-+ if (epr->name) evas_stringshare_del(epr->name);
-+ if (epr->signal) evas_stringshare_del(epr->signal);
-+ if (epr->source) evas_stringshare_del(epr->source);
-+ if (epr->state) evas_stringshare_del(epr->state);
-+ if (epr->state2) evas_stringshare_del(epr->state2);
++ /*if (ed->file->free_strings)
++ {
++ if (epr->name) evas_stringshare_del(epr->name);
++ if (epr->signal) evas_stringshare_del(epr->signal);
++ if (epr->source) evas_stringshare_del(epr->source);
++ if (epr->state) evas_stringshare_del(epr->state);
++ if (epr->state2) evas_stringshare_del(epr->state2);
++ } TODO FIXME*/
+ while (epr->targets)
+ {
+ Edje_Program_Target *prt;
@@ -4249,6 +4265,7 @@
+EAPI unsigned char
+edje_edit_program_name_set(Evas_Object *obj, const char *prog, const char*
new_name)
+{
++ GET_ED_OR_RETURN(0)
+ GET_EPR_OR_RETURN(0)
+ if (!new_name) return 0;
+
@@ -4256,7 +4273,7 @@
+
+ printf("SET NAME for program: %s [new name: %s]\n", prog, new_name);
+
-+ if (epr->name) evas_stringshare_del(epr->name);
++ //if (epr->name && ed->file->free_strings)
evas_stringshare_del(epr->name); TODO FIXME
+ epr->name = evas_stringshare_add(new_name);
+
+ return 1;
@@ -4281,7 +4298,7 @@
+
+ printf("SET SOURCE for program: %s [%s]\n", prog, source);
+
-+ if (epr->source) evas_stringshare_del(epr->source);
++ //if (epr->source && ed->file->free_strings)
evas_stringshare_del(epr->source); TODO FIXME
+ epr->source = evas_stringshare_add(source);
+
+ //Update patterns
@@ -4311,7 +4328,7 @@
+
+ printf("SET SIGNAL for program: %s [%s]\n", prog, signal);
+
-+ if (epr->signal) evas_stringshare_del(epr->signal);
++ //if (epr->signal && ed->file->free_strings)
evas_stringshare_del(epr->signal); TODO FIXME
+ epr->signal = evas_stringshare_add(signal);
+
+ //Update patterns
@@ -4335,11 +4352,12 @@
+EAPI unsigned char
+edje_edit_program_state_set(Evas_Object *obj, const char *prog, const char
*state)
+{
++ GET_ED_OR_RETURN(0)
+ GET_EPR_OR_RETURN(0)
+
+ printf("SET STATE for program: %s\n", prog);
+
-+ if (epr->state) evas_stringshare_del(epr->state);
++ //if (epr->state && ed->file->free_strings)
evas_stringshare_del(epr->state); TODO FIXME
+ epr->state = evas_stringshare_add(state);
+
+ return 1;
@@ -4358,11 +4376,12 @@
+EAPI unsigned char
+edje_edit_program_state2_set(Evas_Object *obj, const char *prog, const char
*state2)
+{
++ GET_ED_OR_RETURN(0)
+ GET_EPR_OR_RETURN(0)
+
+ printf("SET STATE2 for program: %s\n", prog);
+
-+ if (epr->state2) evas_stringshare_del(epr->state2);
++ //if (epr->state2 && ed->file->free_strings)
evas_stringshare_del(epr->state2); TODO FIXME
+ epr->state2 = evas_stringshare_add(state2);
+
+ return 1;
@@ -4742,6 +4761,17 @@
+ return 0;
+
+EAPI int
++edje_edit_load(Evas_Object *obj, const char *file, const char *group)
++{
++ edje_file_cache_set(0);
++ edje_collection_cache_set(0);
++ edje_object_file_set(obj, file, group);
++
++
++ return 1;
++}
++
++EAPI int
+edje_edit_save(Evas_Object *obj)
+{
+ Edje_File *ef;
@@ -4753,7 +4783,7 @@
+ GET_ED_OR_RETURN(0)
+
+ ef = ed->file;
-+ if (!ef) return 1;
++ if (!ef) return 0;
+
+
+ printf("*********** Saving file ******************\n");
@@ -4807,8 +4837,8 @@
+ Evas_List *l;
+ GET_ED_OR_RETURN()
+
-+ _edje_generate_source(ed);
-+ return;
++ //_edje_generate_source(ed);
++ //return;
+ printf("\n****** CHECKIN' INTERNAL STRUCTS STATUS *********\n");
+
+ printf("*** Edje\n");
@@ -4859,7 +4889,7 @@
retrieving revision 1.58
diff -u -r1.58 edje_embryo.c
--- src/lib/edje_embryo.c 25 Jan 2008 03:35:46 -0000 1.58
-+++ src/lib/edje_embryo.c 26 Feb 2008 01:24:36 -0000
++++ src/lib/edje_embryo.c 3 Mar 2008 23:03:22 -0000
@@ -847,7 +847,7 @@
Edje *ed;
int part_id = 0;
@@ -4872,36 +4902,36 @@
Index: src/lib/edje_load.c
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v
-retrieving revision 1.113
-diff -u -r1.113 edje_load.c
---- src/lib/edje_load.c 22 Feb 2008 10:42:50 -0000 1.113
-+++ src/lib/edje_load.c 26 Feb 2008 01:24:36 -0000
+retrieving revision 1.119
+diff -u -r1.119 edje_load.c
+--- src/lib/edje_load.c 2 Mar 2008 02:47:36 -0000 1.119
++++ src/lib/edje_load.c 3 Mar 2008 23:03:22 -0000
@@ -5,7 +5,7 @@
#include "Edje.h"
#include "edje_private.h"
--static void _edje_collection_free_part_description_free(Edje_Part_Description
*desc);
-+void _edje_collection_free_part_description_free(Edje_Part_Description *desc);
+-static void _edje_collection_free_part_description_free(Edje_Part_Description
*desc, unsigned int free_strings);
++void _edje_collection_free_part_description_free(Edje_Part_Description *desc,
unsigned int free_strings);
static Evas_Bool _edje_file_collection_hash_foreach(const Evas_Hash *hash,
const char *key, void *data, void *fdata);
#ifdef EDJE_PROGRAM_CACHE
static int _edje_collection_free_prog_cache_matches_free_cb(Evas_Hash *hash,
const char *key, void *data, void *fdata);
-@@ -918,7 +918,7 @@
+@@ -948,7 +948,7 @@
free(ec);
}
-static void
+void
- _edje_collection_free_part_description_free(Edje_Part_Description *desc)
+ _edje_collection_free_part_description_free(Edje_Part_Description *desc,
unsigned int free_strings)
{
- if (desc->state.name) evas_stringshare_del(desc->state.name);
+ while (desc->image.tween_list)
Index: src/lib/edje_private.h
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
-retrieving revision 1.138
-diff -u -r1.138 edje_private.h
---- src/lib/edje_private.h 21 Feb 2008 18:48:36 -0000 1.138
-+++ src/lib/edje_private.h 26 Feb 2008 01:24:36 -0000
-@@ -329,31 +329,31 @@
+retrieving revision 1.143
+diff -u -r1.143 edje_private.h
+--- src/lib/edje_private.h 1 Mar 2008 06:38:09 -0000 1.143
++++ src/lib/edje_private.h 3 Mar 2008 23:03:22 -0000
+@@ -380,31 +380,31 @@
struct _Edje_Program /* a conditional program to be run */
{
@@ -4948,7 +4978,7 @@
};
struct _Edje_Program_Target /* the target of an action */
-@@ -412,7 +412,7 @@
+@@ -461,7 +461,7 @@
struct _Edje_Part
{
@@ -4957,7 +4987,7 @@
Edje_Part_Description *default_desc; /* the part descriptor for default */
Evas_List *other_desc; /* other possible descriptors */
char *source;
-@@ -451,7 +451,7 @@
+@@ -500,7 +500,7 @@
{
struct {
double value; /* the value of the state (for ranges) */
@@ -4965,4 +4995,4 @@
+ const char *name; /* the named state if any */
} state;
- struct {
+ Edje_Alignment align; /* 0 <-> 1.0 alignment within allocated space */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
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
