E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_parse.c
Log Message:
Remove unused variable.
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- edje_cc_parse.c 6 Jun 2008 18:31:48 - 1.51
+++ edje_cc_parse.c 19 Jun 2008 12:47:04 - 1.52
@@ -839,7 +839,6 @@
int
parse_flags(int n, ...)
{
- char *str;
Evas_List *lst;
int result = 0;
va_list va;
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_script_only.c
Log Message:
Add return values.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_script_only.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_script_only.c 7 Jun 2008 10:06:13 - 1.3
+++ edje_script_only.c 19 Jun 2008 12:46:04 - 1.4
@@ -81,6 +81,7 @@
#define IFNO(func) if (si->fn.func == EMBRYO_FUNCTION_NONE)
#define CLFN(func) IFFN(func) {_call_fn(ed, #func, si->fn.func);}
#define SI Sinfo *si; si = ed->script_only_data; if (!si) return
+#define SI_RETURN(ret) Sinfo *si; si = ed->script_only_data; if (!si) return
(ret)
#define PINT(val) embryo_parameter_cell_push(ed->collection->script,
(Embryo_Cell)(val))
#define PSTR(val) embryo_parameter_string_push(ed->collection->script, val)
#define GTFN(func) si->fn.func =
embryo_program_function_find(ed->collection->script, #func)
@@ -104,7 +105,7 @@
static int
_oid_alloc(Edje *ed)
{
- SI;
+ SI_RETURN(0);
si->oid.id++;
return si->oid.id;
@@ -115,7 +116,7 @@
{
Oid *oi;
char buf[64];
- SI;
+ SI_RETURN(NULL);
oi = calloc(1, sizeof(Oid));
if (!oi) return NULL;
@@ -139,7 +140,7 @@
_oid_find(Edje *ed, int oid)
{
char buf[64];
- SI;
+ SI_RETURN(NULL);
snprintf(buf, sizeof(buf), "%i", oid);
return evas_hash_find(si->oid.hash, buf);
@@ -203,7 +204,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(1);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -219,7 +220,7 @@
Edje *ed = embryo_program_data_get(ep);
Evas_Object *o;
Oid *oid;
- SI;
+ SI_RETURN(-1);
o = evas_object_rectangle_add(evas_object_evas_get(ed->obj));
if (!o) return 0;
@@ -233,7 +234,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(1);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -246,7 +247,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(1);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -259,11 +260,11 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(3);
if (!(oid = _oid_find(ed, params[1]))) return -1;
- if ((oid->x == params[2]) && (oid->y == params[3])) return;
+ if ((oid->x == params[2]) && (oid->y == params[3])) return -1;
oid->x = params[2];
oid->y = params[3];
evas_object_move(oid->obj, ed->x + oid->x, ed->y + oid->y);
@@ -275,11 +276,11 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(3);
if (!(oid = _oid_find(ed, params[1]))) return -1;
- if ((oid->w == params[2]) && (oid->h == params[3])) return;
+ if ((oid->w == params[2]) && (oid->h == params[3])) return -1;
oid->w = params[2];
oid->h = params[3];
evas_object_resize(oid->obj, oid->w, oid->h);
@@ -291,12 +292,12 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
if ((oid->x == params[2]) && (oid->y == params[3]) &&
- (oid->w == params[4]) && (oid->h == params[5])) return;
+ (oid->w == params[4]) && (oid->h == params[5])) return -1;
oid->x = params[2];
oid->y = params[3];
oid->w = params[4];
@@ -311,7 +312,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -327,7 +328,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -341,7 +342,7 @@
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
int r, g, b, a;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -358,7 +359,7 @@
{
Edje *ed = embryo_program_data_get(ep);
char *sig = NULL, *src = NULL;
- SI;
+ SI_RETURN(-1);
CHKPARAM(2);
GETSTR(sig, params[1]);
@@ -382,7 +383,6 @@
void
_edje_script_only_init(Edje *ed)
{
- Embryo_Function fn;
Sinfo *si;
si = calloc(1, sizeof(Sinfo));
@@ -425,7 +425,6 @@
void
_edje_script_only_shutdown(Edje *ed)
{
- Embryo_Function fn;
SI;
CLFN(obj_shutdown);
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_edit.c
Log Message:
Fix compiler warnings.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_edit.c 14 Jun 2008 01:13:16 - 1.17
+++ edje_edit.c 19 Jun 2008 12:39:58 - 1.18
@@ -3327,11 +3327,9 @@
static char *types[] = {"NONE", "RECT", "TEXT", "IMAGE", "SWALLOW",
"TEXTBLOCK", "GRADIENT", "GROUP"};
-static int
+static void
_edje_generate_source_of_part(Evas_Object *obj, const char *part, FILE *f)
{
- int i;
-
fprintf(f, I3"part {\n");
fprintf(f, I4"name: \"%s\";\n", part);
fprintf(f, I4"type: %s;\n", types[edje_edit_part_type_get(obj, part)]);
@@ -3345,7 +3343,7 @@
fprintf(f, I3"}\n");//part
}
-static int
+static void
_edje_generate_source_of_group(Edje *ed, const char *group, FILE *f)
{
Evas_Object *obj;
@@ -3353,7 +3351,7 @@
int w, h;
obj = edje_object_add(ed->evas);
- if (!edje_object_file_set(obj, ed->file->path, group)) return 0;
+ if (!edje_object_file_set(obj, ed->file->path, group)) return;
fprintf(f, I1"group {\n");
fprintf(f, I2"name: \"%s\";\n", group);
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_edit.c
Log Message:
formatting
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- edje_edit.c 13 Mar 2008 19:01:53 - 1.10
+++ edje_edit.c 13 Mar 2008 19:08:14 - 1.11
@@ -105,7 +105,7 @@
return NULL;
}
- if (sscanf(delim,"%lf", &value) != 1)
+ if (sscanf(delim, "%lf", &value) != 1)
{
free(name);
return NULL;
@@ -132,12 +132,12 @@
if (!ed->file) return -1;
if (!ed->file->image_dir) return -1;
- //printf("SEARCH IMAGE %s\n",image_name);
+ //printf("SEARCH IMAGE %s\n", image_name);
for (l = ed->file->image_dir->entries; l; l = l->next)
{
i = l->data;
- if (strcmp(image_name,i->entry) == 0)
+ if (strcmp(image_name, i->entry) == 0)
{
//printf(" Found id: %d \n", i->id);
return i->id;
@@ -147,7 +147,7 @@
return -1;
}
-static const char*
+static const char *
_edje_image_name_find(Evas_Object *obj, int image_id)
{
Edje_Image_Directory_Entry *i;
@@ -562,7 +562,7 @@
while (lst)
{
if (lst->data) evas_stringshare_del(lst->data);
- //printf("FREE: %s\n",lst->data);
+ //printf("FREE: %s\n", lst->data);
lst = evas_list_remove(lst, lst->data);
}
}
@@ -631,7 +631,7 @@
}
/* Init Edje_Part_Collection_Directory_Entry */
- printf(" new id: %d\n",id);
+ printf(" new id: %d\n", id);
de->id = id;
de->entry = mem_strdup(name);
ed->file->collection_dir->entries =
evas_list_append(ed->file->collection_dir->entries, de);
@@ -679,7 +679,7 @@
"for writing output\n", ed->file->path);
return 0;
}
- snprintf(buf, SZ(buf), "collections/%d",g->id);
+ snprintf(buf, SZ(buf), "collections/%d", g->id);
eet_delete(eetf, buf);
eet_close(eetf);
@@ -1180,8 +1180,8 @@
pd = _edje_part_description_find_byname(ed, part, state);
if (!pd) return 0;
- printf("EDJE: Set state: %s\n",pd->state.name);
- _edje_part_description_apply(ed, rp, pd->state.name, pd->state.value, NULL,
0); //WHAT IS NULL ,0
+ printf("EDJE: Set state: %s\n", pd->state.name);
+ _edje_part_description_apply(ed, rp, pd->state.name, pd->state.value, NULL,
0); //WHAT IS NULL , 0
edje_object_calc_force(obj);
return 1;
@@ -1251,7 +1251,7 @@
edje_edit_part_mouse_events_get(Evas_Object *obj, const char *part)
{
GET_RP_OR_RETURN(0);
- //printf("Get mouse_events for part: %s [%d]\n",part,
rp->part->mouse_events);
+ //printf("Get mouse_events for part: %s [%d]\n", part,
rp->part->mouse_events);
return rp->part->mouse_events;
}
@@ -1260,7 +1260,7 @@
{
GET_RP_OR_RETURN();
if (!rp->object) return;
- printf("Set mouse_events for part: %s [%d]\n",part, mouse_events);
+ printf("Set mouse_events for part: %s [%d]\n", part, mouse_events);
rp->part->mouse_events = mouse_events ? 1 : 0;
@@ -1280,7 +1280,7 @@
edje_edit_part_repeat_events_get(Evas_Object *obj, const char *part)
{
GET_RP_OR_RETURN(0);
- //printf("Get repeat_events for part: %s [%d]\n",part,
rp->part->repeat_events);
+ //printf("Get repeat_events for part: %s [%d]\n", part,
rp->part->repeat_events);
return rp->part->repeat_events;
}
@@ -1289,7 +1289,7 @@
{
GET_RP_OR_RETURN();
if (!rp->object) return;
- printf("Set repeat_events for part: %s [%d]\n",part, repeat_events);
+ printf("Set repeat_events for part: %s [%d]\n", part, repeat_events);
rp->part->repeat_events = repeat_events ? 1 : 0;
@@ -1347,7 +1347,7 @@
//append default state
state = rp->part->default_desc;
snprintf(state_name, MAX_PATH,
-"%s %.2f", state->state.name,state->state.value);
+"%s %.2f", state->state.name, state->state.value);
states = evas_list_append(states, evas_stringshare_add(state_name));
//printf("NEW STATE def: %s\n", state->state.name);
@@ -1356,7 +1356,7 @@
{
state = l->data;
snprintf(state_name, sizeof(state_name),
-"%s %.2f", state->state.name,state->state.value);
+"%s %.2f", state->state.name, state->state.value);
states = evas_list_append(states, evas_stringshare_add(state_name));
//printf("NEW STATE: %s\n", state_name);
}
@@ -1378,7 +1378,7 @@
/* split name from value */
delim = strrchr(new_name, (int)' ');
if (!delim) return 0;
- if (sscanf(delim,"%lf", &value) != 1) return 0;
+ if (sscanf(delim, "%lf", &value) != 1) return 0;
delim[0] = '\0';
/* update programs */
@@ -1418,7 +1418,7 @@
EAPI void
edje_edit_state_del(Evas_Object *obj, const char *part, const char *state)
{
- printf("REMOVE STATE: %s IN PART: %s\n",state, part);
+ printf
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_edit.c edje_private.h
Log Message:
Fix compiler warnings
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje_edit.c 12 Mar 2008 16:32:35 - 1.8
+++ edje_edit.c 13 Mar 2008 16:01:35 - 1.9
@@ -222,7 +222,7 @@
if (rp->custom.description)
{
- _edje_collection_free_part_description_free(rp->custom.description);
+ _edje_collection_free_part_description_free(rp->custom.description, 0);
}
_edje_unref(rp->edje);
@@ -399,10 +399,12 @@
pt = ll->data;
if (pt->id == old_id)
-if (new_id == -1)
- epr->targets = evas_list_remove(epr->targets, pt);
-else
- pt->id = new_id;
+ {
+ if (new_id == -1)
+ epr->targets = evas_list_remove(epr->targets, pt);
+ else
+ pt->id = new_id;
+ }
}
}
@@ -753,8 +755,7 @@
edje_edit_group_name_set(Evas_Object *obj, const char *new_name)
{
Evas_List *l;
- int id;
-
+
GET_ED_OR_RETURN(0)
if (!new_name) return 0;
if (edje_edit_group_exist(obj, new_name)) return 0;
@@ -784,10 +785,11 @@
// evas_stringshare_del(pce->entry);
pce->entry = evas_stringshare_add(new_name);
- return;
+ return 1;
}
l = l->next;
}
+ return 0;
}
EAPI int
@@ -1025,11 +1027,10 @@
edje_edit_part_del(Evas_Object *obj, const char* part)
{
printf("REMOVE PART: %s\n", part);
- Evas_List *l, *ll;
Edje_Part *ep;
int id;
- GET_RP_OR_RETURN()
+ GET_RP_OR_RETURN(0)
ep = rp->part;
id = ep->id;
@@ -1082,7 +1083,7 @@
_edje_if_string_free(ed, ep->name);
if (ep->default_desc)
{
- _edje_collection_free_part_description_free(ep->default_desc);
+ _edje_collection_free_part_description_free(ep->default_desc, 0);
ep->default_desc = NULL;
}
while (ep->other_desc)
@@ -1091,7 +1092,7 @@
desc = ep->other_desc->data;
ep->other_desc = evas_list_remove(ep->other_desc, desc);
- _edje_collection_free_part_description_free(desc);
+ _edje_collection_free_part_description_free(desc, 0);
}
free(ep);
@@ -1455,7 +1456,7 @@
rp->part->other_desc = evas_list_remove(rp->part->other_desc, pd);
- _edje_collection_free_part_description_free(pd);
+ _edje_collection_free_part_description_free(pd, 0);
}
EAPI void
@@ -2044,7 +2045,7 @@
EAPI unsigned char
edje_edit_state_aspect_pref_get(Evas_Object *obj, const char *part, const char
*state)
{
- GET_PD_OR_RETURN()
+ GET_PD_OR_RETURN(0)
printf("GET ASPECT_PREF of state '%s' [%d]\n", state, pd->aspect.prefer);
return pd->aspect.prefer;
}
@@ -2059,10 +2060,10 @@
/* TEXT API */
/**/
-EAPI const char*
+EAPI const char *
edje_edit_state_text_get(Evas_Object *obj, const char *part, const char *state)
{
- GET_PD_OR_RETURN()
+ GET_PD_OR_RETURN(NULL)
//printf("GET TEXT of state: %s\n", state);
if (pd->text.text)
@@ -2127,7 +2128,7 @@
EAPI double
edje_edit_state_text_align_y_get(Evas_Object *obj, const char *part, const
char *state)
{
- GET_PD_OR_RETURN()
+ GET_PD_OR_RETURN(0.0)
//printf("GET TEXT_ALIGN_Y of state: %s [%f]\n", state, pd->text.align.x);
return pd->text.align.y;
}
@@ -2398,7 +2399,7 @@
/* Create Image Entry */
de = mem_alloc(sizeof(Edje_Image_Directory_Entry));
- if (name = strrchr(path, '/')) name++;
+ if ((name = strrchr(path, '/'))) name++;
else name = (char *)path;
de->entry = mem_strdup(name);
de->id = free_id;
@@ -3203,7 +3204,7 @@
script = ed->collection->script;
- printf("Get Script [%d] %d\n",script, embryo_program_recursion_get(script));
+ printf("Get Script [%p] %d\n", script,
embryo_program_recursion_get(script));
return "Not yet complete...";
}
@@ -3222,7 +3223,6 @@
long sz;
SrcFile *sf;
SrcFile_List *sfl;
- Eet_File *eetf;
/* Open a temp file */
//TODO this will not work on windows
@@ -3339,7 +3339,6 @@
EAPI void
edje_edit_print_internal_status(Evas_Object *obj)
{
- int i;
Evas_List *l;
GET_ED_OR_RETURN()
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- edje_private.h 6 Mar 2008 17:52:59 - 1.144
+++ edje_private.h 13 Mar 2008 16:01:35 - 1.145
@@ -428,8 +428,8 @@
struct _Edje_Part_Collection_Directory_Entry
{
- char *entry; /* the nominal name of the part collection */
- int id; /* the id of this named
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_program.c
Log Message:
Add const
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- edje_program.c 26 Feb 2008 20:12:00 - 1.59
+++ edje_program.c 13 Mar 2008 06:38:16 - 1.60
@@ -458,7 +458,7 @@
_edje_program_end(Edje *ed, Edje_Running_Program *runp)
{
Evas_List *l;
- char *pname = NULL;
+ const char *pname = NULL;
int free_runp = 0;
if (ed->delete_me) return;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_edit.c Log Message: formatting === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- edje_edit.c 8 Mar 2008 23:11:32 - 1.6 +++ edje_edit.c 12 Mar 2008 09:48:04 - 1.7 @@ -555,7 +555,7 @@ if (!ed || !str) return; dict = eet_dictionary_get(ed->file->ef); - if (eet_dictionary_string_check(dict ,str)) return; + if (eet_dictionary_string_check(dict, str)) return; evas_stringshare_del(str); str = NULL; } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_textblock_styles.c
Log Message:
formatting
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_textblock_styles.c 18 Jan 2008 20:51:03 - 1.14
+++ edje_textblock_styles.c 19 Jan 2008 00:24:53 - 1.15
@@ -444,10 +444,11 @@
buf = _edje_strbuf_append(buf, " ", &buflen, &bufalloc);
buf = _edje_strbuf_append(buf, "font=", &buflen, &bufalloc);
tmp = _edje_str_escape(tag->font);
- if (tmp) {
-buf = _edje_strbuf_append(buf, tmp, &buflen, &bufalloc);
-free(tmp);
- }
+ if (tmp)
+ {
+ buf = _edje_strbuf_append(buf, tmp, &buflen, &bufalloc);
+ free(tmp);
+ }
}
buf = _edje_strbuf_append(buf, "'", &buflen, &bufalloc);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
Edje reference patch two (from dresb)
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- edje_cc_handlers.c 23 Nov 2007 16:40:38 - 1.78
+++ edje_cc_handlers.c 23 Nov 2007 16:43:03 - 1.79
@@ -2,6 +2,45 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+/*
+Concerning the EDC reference:
+
+The formatting for blocks and properties has been implemented as a table
+which is filled using ALIASES.
+For maximum flexibility I implemented them in the [EMAIL PROTECTED]/[EMAIL
PROTECTED] style,
+this means that missing one or changing the order most certainly cause
+formatting errors.
+
+[EMAIL PROTECTED]
+block name
+[EMAIL PROTECTED]
+code sample of the block
+[EMAIL PROTECTED]
+the block's description
+[EMAIL PROTECTED]
+
+[EMAIL PROTECTED]
+property name
+[EMAIL PROTECTED]
+property's parameter list
+[EMAIL PROTECTED]
+the property description (lol)
+[EMAIL PROTECTED]
+*/
+
+/**
+ * @page edcref Edje Data Collection reference
+ * An Edje Data Collection, it's a plain text file (normally identified with
the
+ * .edc extension),consisting of instructions for the Edje Compiler.
+ *
+ * The syntax for the edje data collection files follows a simple structure of
+ * "blocks { .. }" that can contain "properties: ..", more blocks, or both.
+ *
+ * @author Andres Blanc (dresb) [EMAIL PROTECTED]
+ *
+ *
+ */
+
#include "edje_cc.h"
static void st_images_image(void);
@@ -462,6 +501,39 @@
/*/
+/**
+@page edcref
+
+@block
+images
+@context
+images {
+image: "filename1.ext" COMP;
+image: "filename2.ext" LOSSY 99;
+..
+}
+@description
+The "images" block is used to list each image file that will be used in
+the theme along with its compression method (if any).
+Besides the domcument's root, additional "images" blocks can be
+included inside other blocks, normally "collections", "group" and
+"part", easing mantienance of the file list when the theme is split
+among multiple files.
+@endblock
+
+@property
+image
+@parameters
+[image file] [compression method] (compression level)
+@effect
+Used to include each image file. The full path to the directory holding
+the images can be defined later with edje_cc's "-id" option.
+Compression methods:
+@li RAW: Uncompressed.
+@li COMP: Lossless compression.
+@li LOSSY [0-100]: Lossy comression with quality from 0 to 100.
+@endproperty
+ */
static void
st_images_image(void)
{
@@ -525,6 +597,32 @@
}
}
+/**
+@page edcref
+
+@block
+fonts
+@context
+fonts {
+font: "filename1.ext" "fontname";
+font: "filename2.ext" "otherfontname";
+..
+}
+@description
+The "fonts" block is used to list each font file with an alias used
later
+in the theme. As with the "images" block, additional "fonts" blocks can
+be included inside other blocks.
+@endblock
+
+@property
+font
+@parameters
+[font filename] [font alias]
+@effect
+Defines each font "file" and "alias", the full path to the directory
+holding the font files can be defined with edje_cc's "-fd" option.
+@endproperty
+ */
static void
st_fonts_font(void)
{
@@ -566,6 +664,30 @@
}
}
+/**
+@page edcref
+@block
+data
+@context
+data {
+item: "arbitraryname" "arbitraryvalue";
+item: "othername" "othervalue";
+..
+}
+@description
+The "data" block is used to pass arbitrary parameters from the theme to
+the application. Unlike the "images" and "fonts" blocks, additional
+"data" blocks can only be included inside the "group" block.
+@endblock
+
+@property
+item
+@parameters
+[parameter name] [parameter value]
+@effect
+Defines each additional parameter.
+@endproperty
+ */
static void
st_data_item(void)
{
@@ -579,7 +701,27 @@
edje_file->data = evas_list_append(edje_file->data, di);
}
-
+/**
+@page edcref
+@block
+color_classes
+@context
+color_classes {
+color_class {
+name: "colorclassname";
+color: [0-255] [0-255] [0-255] [0-255];
+color2: [0-255] [0-255] [0-255] [0-255];
+color3: [0-255] [0-255] [0-255] [0-255]
+}
+..
+
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje Modified Files: Doxyfile Log Message: Edje reference patch one (from dresb) === RCS file: /cvs/e/e17/libs/edje/Doxyfile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Doxyfile22 Oct 2004 19:12:12 - 1.2 +++ Doxyfile23 Nov 2007 16:40:38 - 1.3 @@ -1,7 +1,7 @@ PROJECT_NAME = Edje PROJECT_NUMBER = OUTPUT_DIRECTORY = doc -INPUT = edje.c +INPUT = edje.c ./src/bin/edje_cc_handlers.c IMAGE_PATH = doc/img OUTPUT_LANGUAGE= English GENERATE_HTML = YES @@ -51,7 +51,14 @@ GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES -ALIASES= +ALIASES= block="" +ALIASES += context="\code" +ALIASES += description="\endcode " +ALIASES += endblock="" +ALIASES += property=" " +ALIASES += parameters="" +ALIASES += effect=" " +ALIASES += endproperty="" ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 OPTIMIZE_OUTPUT_FOR_C = YES - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/doc
Modified Files:
edje.css
Log Message:
Edje reference patch one (from dresb)
===
RCS file: /cvs/e/e17/libs/edje/doc/edje.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje.css2 Jun 2003 23:49:54 - 1.1
+++ edje.css23 Nov 2007 16:40:38 - 1.2
@@ -176,3 +176,14 @@
text-align: center;
font-size: 8;
}
+table.edcref {
+ border-collapse: collapse;
+}
+table.edcref td {
+ border-style: hidden;
+ vertical-align:top;
+ padding: 0.5em;
+}
+td.property {
+width: 5em;
+}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
Edje reference patch one (from dresb)
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- edje_cc_handlers.c 24 Jul 2007 14:20:07 - 1.77
+++ edje_cc_handlers.c 23 Nov 2007 16:40:38 - 1.78
@@ -1074,6 +1074,31 @@
}
static void
+st_collections_group_parts_part_effect(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+
+ check_arg_count(1);
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ ep = evas_list_data(evas_list_last(pc->parts));
+ ep->effect = parse_enum(0,
+ "NONE", EDJE_TEXT_EFFECT_NONE,
+ "PLAIN", EDJE_TEXT_EFFECT_PLAIN,
+ "OUTLINE", EDJE_TEXT_EFFECT_OUTLINE,
+ "SOFT_OUTLINE", EDJE_TEXT_EFFECT_SOFT_OUTLINE,
+ "SHADOW", EDJE_TEXT_EFFECT_SHADOW,
+ "SOFT_SHADOW", EDJE_TEXT_EFFECT_SOFT_SHADOW,
+ "OUTLINE_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SHADOW,
+ "OUTLINE_SOFT_SHADOW", EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW,
+ "FAR_SHADOW", EDJE_TEXT_EFFECT_FAR_SHADOW,
+ "FAR_SOFT_SHADOW", EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW,
+ "GLOW", EDJE_TEXT_EFFECT_GLOW,
+ NULL);
+}
+
+static void
st_collections_group_parts_part_dragable_x(void)
{
Edje_Part_Collection *pc;
@@ -1505,6 +1530,79 @@
}
static void
+st_collections_group_parts_part_description_color_class(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(1);
+
+ 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));
+ ed->color_class = parse_str(0);
+}
+
+static void
+st_collections_group_parts_part_description_color(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(4);
+
+ 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));
+ ed->color.r = parse_int_range(0, 0, 255);
+ ed->color.g = parse_int_range(1, 0, 255);
+ ed->color.b = parse_int_range(2, 0, 255);
+ ed->color.a = parse_int_range(3, 0, 255);
+}
+
+static void
+st_collections_group_parts_part_description_color2(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(4);
+
+ 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));
+ ed->color2.r = parse_int_range(0, 0, 255);
+ ed->color2.g = parse_int_range(1, 0, 255);
+ ed->color2.b = parse_int_range(2, 0, 255);
+ ed->color2.a = parse_int_range(3, 0, 255);
+}
+
+static void
+st_collections_group_parts_part_description_color3(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(4);
+
+ 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));
+ ed->color3.r = parse_int_range(0, 0, 255);
+ ed->color3.g = parse_int_range(1, 0, 255);
+ ed->color3.b = parse_int_range(2, 0, 255);
+ ed->color3.a = parse_int_range(3, 0, 255);
+}
+
+static void
st_collections_group_parts_part_description_rel1_relative(void)
{
Edje_Part_Collection *pc;
@@ -1850,72 +1948,72 @@
}
static void
-st_collections_group_parts_part_description_fill_origin_relative(void)
+st_collections_group_parts_part_description_fill_spread(void)
{
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
- check_arg_count(2);
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
- if (ep->type != EDJE_PART_TYPE_IMAGE && ep->type != EDJE_PART_TYPE_GRADIENT)
+ /* XXX this will need to include IMAGES when spread support is added to
evas images */
+ if (ep->type != EDJE_PART_TYPE_GRADIENT)
{
fprintf(stderr, "%s: Error. parse error %s:%i. "
- "fill attributes in non-IMAGE part.\n",
+ "gradient attributes in non-GRADIENT part.\n",
progname, file_in, line - 1);
exit(-1);
}
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
- ed->fill.pos_rel_x = p
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: edc.vim Log Message: add new keyword === RCS file: /cvs/e/e17/libs/edje/data/edc.vim,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- edc.vim 3 Nov 2007 12:17:29 - 1.13 +++ edc.vim 10 Nov 2007 13:17:23 - 1.14 @@ -22,7 +22,7 @@ syn keywordcLabel item name min max type effect syn keywordcLabel mouse_events repeat_events clip_to syn keywordcLabel color_class text_class x y confine -syn keywordcLabel state visible align step aspect fixed +syn keywordcLabel state visible align step aspect aspect_preference fixed syn keywordcLabel relative offset to to_x to_y normal tween syn keywordcLabel border color color2 color3 font size fit align syn keywordcLabel signal source action transition in target after - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_message_queue.c Log Message: Don't clean up this job, ecore_job will clean it up itself. === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_message_queue.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- edje_message_queue.c5 Oct 2007 05:12:37 - 1.31 +++ edje_message_queue.c4 Nov 2007 12:41:15 - 1.32 @@ -126,8 +126,6 @@ _edje_message_queue_clear(); if (job_loss_timer) ecore_timer_del(job_loss_timer); - if (job) - ecore_job_del(job); job = NULL; job_loss_timer = NULL; } - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/data
Modified Files:
edc.vim
Log Message:
Support spectr{a,um}
===
RCS file: /cvs/e/e17/libs/edje/data/edc.vim,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edc.vim 11 Jun 2007 10:04:25 - 1.12
+++ edc.vim 3 Nov 2007 12:17:29 - 1.13
@@ -16,6 +16,7 @@
syn keywordcStructure part parts dragable description rel1 rel2
syn keywordcStatement text image font fill origin size tag
syn keywordcStructure programs program script styles style base
+syn keywordcStructure spectra spectrum
syn match cType "+ + +;" contained
syn keywordcLabel item name min max type effect
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_out.c
Log Message:
Don't segfault on empty file.
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- edje_cc_out.c 26 Aug 2007 12:54:51 - 1.57
+++ edje_cc_out.c 15 Sep 2007 08:46:34 - 1.58
@@ -521,15 +521,18 @@
}
/* check that all groups have names */
- for (l = edje_file->collection_dir->entries; l; l = l->next)
+ if (edje_file->collection_dir)
{
- Edje_Part_Collection_Directory_Entry *de;
- de = l->data;
- if (!de->entry)
+ for (l = edje_file->collection_dir->entries; l; l = l->next)
{
-fprintf(stderr, "%s: Error. collection %i: name missing.\n",
- progname, de->id);
-ABORT_WRITE(ef, file_out);
+Edje_Part_Collection_Directory_Entry *de;
+de = l->data;
+if (!de->entry)
+ {
+ fprintf(stderr, "%s: Error. collection %i: name missing.\n",
+ progname, de->id);
+ ABORT_WRITE(ef, file_out);
+ }
}
}
/* check that all spectra are valid */
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_text.c
Log Message:
Remove mysterious charachter.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- edje_text.c 18 Jun 2007 16:48:43 - 1.62
+++ edje_text.c 18 Jun 2007 16:49:11 - 1.63
@@ -181,7 +181,7 @@
if (params->text.elipsis != 1.0)
c2 = evas_object_text_char_coords_get(ep->object,
-p + sw - r, th / 2,
- NULL, NULL, N*ULL, NULL);
+ NULL, NULL, NULL, NULL);
if ((c1 < 0) && (c2 < 0))
{
c1 = 0;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_text.c
Log Message:
Remove padding when searching for character position.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- edje_text.c 26 May 2007 23:57:21 - 1.61
+++ edje_text.c 18 Jun 2007 16:48:43 - 1.62
@@ -156,6 +156,7 @@
Evas_Coord sw, int *free_text)
{
Evas_Coord tw = 0, th = 0, p;
+ int l, r;
char *buf;
int c1 = -1, c2 = -1, loop = 0, extra;
size_t orig_len;
@@ -166,6 +167,7 @@
evas_object_text_text_set(ep->object, text);
part_get_geometry(ep, &tw, &th);
+ evas_object_text_style_pad_get(ep->object, &l, &r, NULL, NULL);
p = ((sw - tw) * params->text.elipsis);
@@ -174,12 +176,12 @@
{
if (params->text.elipsis != 0.0)
c1 = evas_object_text_char_coords_get(ep->object,
- -p, th / 2,
+ -p + l, th / 2,
NULL, NULL, NULL, NULL);
if (params->text.elipsis != 1.0)
c2 = evas_object_text_char_coords_get(ep->object,
- -p + sw, th / 2,
- NULL, NULL, NULL, NULL);
+ -p + sw - r, th / 2,
+ NULL, NULL, N*ULL, NULL);
if ((c1 < 0) && (c2 < 0))
{
c1 = 0;
@@ -447,7 +449,7 @@
dif = (th - sh) / 4;
if (dif < 1) dif = 1;
-while ((th > sh) && (sw >= 0.0))
+while ((th > sh) && (sw >= 0))
{
size -= dif;
if (size <= 0) break;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_util.c
Log Message:
Remove unused variable.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- edje_util.c 27 May 2007 05:28:07 - 1.95
+++ edje_util.c 17 Jun 2007 07:09:02 - 1.96
@@ -995,7 +995,6 @@
EAPI void
edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
{
- Edje *ed;
Edje_Real_Part *rp;
if (!obj_swallow) return;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_cache.c edje_calc.c edje_embryo.c edje_private.h
edje_textblock_styles.c
Log Message:
- Formatting.
- Remove old code.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_cache.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_cache.c4 Apr 2007 13:25:54 - 1.11
+++ edje_cache.c5 Apr 2007 15:54:16 - 1.12
@@ -64,24 +64,28 @@
}
static int
-_edje_font_hash (Edje_File *edf)
+_edje_font_hash(Edje_File *edf)
{
int count = 0;
if (edf->font_dir)
{
Evas_List *l;
- for (l = edf->font_dir->entries; l; l = evas_list_next (l))
+ for (l = edf->font_dir->entries; l; l = evas_list_next(l))
{
-Edje_Font_Directory_Entry *fnt = l->data;
-intlength = strlen (fnt->entry) + 7;
-char *tmp = alloca (length);
-
-snprintf (tmp, length, "fonts/%s", fnt->entry);
-fnt->path = evas_stringshare_add (tmp);
-evas_stringshare_del (fnt->entry);
+Edje_Font_Directory_Entry *fnt;
+int length;
+char *tmp;
+
+fnt = l->data;
+length = strlen(fnt->entry) + 7;
+tmp = alloca(length);
+
+snprintf(tmp, length, "fonts/%s", fnt->entry);
+fnt->path = evas_stringshare_add(tmp);
+evas_stringshare_del(fnt->entry);
fnt->entry = fnt->path + 6;
-edf->font_hash = evas_hash_direct_add (edf->font_hash, fnt->entry,
fnt);
+edf->font_hash = evas_hash_direct_add(edf->font_hash, fnt->entry,
fnt);
count++;
}
@@ -150,7 +154,7 @@
edf->font_hash = NULL;
- _edje_font_hash (edf);
+ _edje_font_hash(edf);
eet_close(ef);
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- edje_calc.c 4 Apr 2007 13:25:54 - 1.96
+++ edje_calc.c 5 Apr 2007 15:54:16 - 1.97
@@ -682,9 +682,11 @@
if (!text) text = "";
/* check if the font is embedded in the .eet */
-if (ed->file->font_hash)
+ if (ed->file->font_hash)
{
-Edje_Font_Directory_Entry *fnt = evas_hash_find
(ed->file->font_hash, font);
+Edje_Font_Directory_Entry *fnt;
+
+fnt = evas_hash_find(ed->file->font_hash, font);
if (fnt)
{
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- edje_embryo.c 18 Jan 2007 23:58:40 - 1.54
+++ edje_embryo.c 5 Apr 2007 15:54:16 - 1.55
@@ -353,7 +353,7 @@
CHKPARAM(1);
- return (Embryo_Cell) _edje_var_list_count_get(ed, (int) params[1]);
+ return (Embryo_Cell)_edje_var_list_count_get(ed, (int) params[1]);
}
/* remove(id, n) */
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- edje_private.h 4 Apr 2007 13:25:54 - 1.120
+++ edje_private.h 5 Apr 2007 15:54:16 - 1.121
@@ -267,7 +267,7 @@
struct _Edje_Font_Directory_Entry
{
const char *entry; /* the name of the font */
- char *path;
+ const char *path;
};
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- edje_textblock_styles.c 4 Apr 2007 13:25:54 - 1.10
+++ edje_textblock_styles.c 5 Apr 2007 15:54:16 - 1.11
@@ -8,33 +8,9 @@
static int
_edje_font_is_embedded(Edje_File *edf, char *font)
{
- Edje_Font_Directory_Entry *fnt = NULL;
-
if (!edf->font_dir) return 0;
-/*fnt = evas_hash_find (edf->font_hash, font); */
-/*if (fnt) */
-/* if (fnt->entry && (!strcmp(fnt->entry, font))) */
-/*return 1; */
- return 1;
+ return 1;
}
-
-#if 0
-static char *
-_edje_str_deescape(char *str)
-{
- char *s2, *s, *d;
-
- s2 = malloc(strlen(str) + 1);
- if (!s2) return NULL;
- for (s = str, d = s2; *s != 0; s++, d++)
- {
- if ((*s == '\\') && (s[1] != 0)) s++;
- *d = *s;
- }
- *d = 0;
- return s2;
-}
-#endif
/* Put a \ before and Space( ), \ or ' in a string.
* A newly allocated string is returned.
-
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje Modified Files: autogen.sh Log Message: Remove unused file. === RCS file: /cvs/e/e17/libs/edje/autogen.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- autogen.sh 3 Aug 2005 01:00:15 - 1.8 +++ autogen.sh 25 Mar 2007 08:44:55 - 1.9 @@ -5,7 +5,7 @@ touch README -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/m4 Removed Files: ac_expand_dir.m4 Log Message: Remove unused file. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_message_queue.c
Log Message:
Reset job incase the user reset's edje.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- edje_message_queue.c24 Mar 2007 16:48:51 - 1.24
+++ edje_message_queue.c25 Mar 2007 07:10:48 - 1.25
@@ -115,6 +115,7 @@
_edje_message_shutdown(void)
{
_edje_message_queue_clear();
+ job = NULL;
}
void
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_message_queue.c
Log Message:
Can't and shouldn't delete job on shutdown. The job handler might not get
called and ecore will free the memory anyway.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- edje_message_queue.c24 Mar 2007 16:05:43 - 1.23
+++ edje_message_queue.c24 Mar 2007 16:48:51 - 1.24
@@ -115,11 +115,6 @@
_edje_message_shutdown(void)
{
_edje_message_queue_clear();
- if (job)
- {
- ecore_job_del(job);
- job = NULL;
- }
}
void
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_message_queue.c
Log Message:
Remove debug comments.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- edje_message_queue.c7 Jan 2006 08:54:30 - 1.22
+++ edje_message_queue.c24 Mar 2007 16:05:43 - 1.23
@@ -89,7 +89,6 @@
static void
_edje_job(void *data)
{
-// printf("_edje_job()\n");
job = NULL;
if (job_loss_timer)
{
@@ -97,19 +96,13 @@
job_loss_timer = NULL;
}
_edje_message_queue_process();
-// printf("_edje_job() END\n");
}
static int
_edje_job_loss_timer(void *data)
{
job_loss_timer = NULL;
- if (job)
- {
-// printf("! EDJE!!! EEEK! lost a job!\n");
-// printf("!!! job = %p\n", job);
- job = NULL;
- }
+ if (job) job = NULL;
return 0;
}
@@ -276,7 +269,6 @@
if (!job)
{
-// printf("no job... add\n");
job = ecore_job_add(_edje_job, NULL);
if (job_loss_timer) ecore_timer_del(job_loss_timer);
job_loss_timer = ecore_timer_add(0.05, _edje_job_loss_timer, NULL);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/m4 Removed Files: ac_path_generic.m4 Log Message: No longer needed. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_embryo.c Log Message: Typo. === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_embryo.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- edje_embryo.c 9 Oct 2006 06:01:13 - 1.53 +++ edje_embryo.c 18 Jan 2007 23:58:40 - 1.54 @@ -80,8 +80,8 @@ * Direction:get_drag_dir(part_id) * get_drag(part_id, &Float:dx, &Float:&dy) * set_drag(part_id, Float:dx, Float:dy) - * text_set(part_id, str[]) - * text_get(part_id, dst[], maxlen) + * set_text(part_id, str[]) + * get_text(part_id, dst[], maxlen) * get_min_size(w, h) * get_max_size(w, h) * set_color_class(class[], r, g, b, a) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_util.c
Log Message:
No need to alloc Edje_List_Foreach_Data
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- edje_util.c 24 Dec 2006 10:29:16 - 1.85
+++ edje_util.c 28 Dec 2006 11:35:40 - 1.86
@@ -264,16 +264,11 @@
Evas_List *
edje_color_class_list(void)
{
- Edje_List_Foreach_Data *fdata;
- Evas_List *list;
+ Edje_List_Foreach_Data fdata;
- fdata = calloc(1, sizeof(Edje_List_Foreach_Data));
- evas_hash_foreach(_edje_color_class_member_hash,
_edje_color_class_list_foreach, fdata);
+ evas_hash_foreach(_edje_color_class_member_hash,
_edje_color_class_list_foreach, &fdata);
- list = fdata->list;
- free(fdata);
-
- return list;
+ return fdata.list;
}
static Evas_Bool
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
