Menu
▾
▴
enlightenment-cvs
|
From: <enl...@li...> - 2005-04-29 18:46:49
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_out.c
Log Message:
don't die if embryo_cc brabbles about warnings in the embryo code
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- edje_cc_out.c 24 Feb 2005 15:34:43 -0000 1.41
+++ edje_cc_out.c 29 Apr 2005 18:46:41 -0000 1.42
@@ -672,7 +672,8 @@
EMBRYO_PREFIX"/bin/embryo_cc -i %s -o %s %s",
DAT"include", tmpo, tmpn);
ret = system(buf);
- if (ret != 0)
+ /* accept warnings in the embryo code */
+ if (ret < 0 || ret > 1)
{
fprintf(stderr, "%s: Warning. Compiling script code not clean.\n",
progname);
|
|
From: <enl...@li...> - 2005-05-23 17:29:53
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_load.c
Log Message:
fix a silly bug that caused a memleak (i think)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- edje_load.c 23 May 2005 07:06:20 -0000 1.59
+++ edje_load.c 23 May 2005 17:29:43 -0000 1.60
@@ -389,7 +389,7 @@
lst = evas_list_append(lst, strdup(ce->entry));
}
}
- if (ed_file > 0) _edje_file_unref(ed_file);
+ if (ed_file->references > 0) _edje_file_unref(ed_file);
else _edje_file_free(ed_file);
return lst;
}
@@ -453,7 +453,7 @@
break;
}
}
- if (ed_file > 0) _edje_file_unref(ed_file);
+ if (ed_file->references > 0) _edje_file_unref(ed_file);
else _edje_file_free(ed_file);
return str;
}
|
|
From: <enl...@li...> - 2005-05-23 17:49:00
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_load.c
Log Message:
made edje_file_collection_list() check its argument before trying to do anything with it
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- edje_load.c 23 May 2005 17:29:43 -0000 1.60
+++ edje_load.c 23 May 2005 17:48:53 -0000 1.61
@@ -360,6 +360,8 @@
Evas_List *lst = NULL;
Edje_File *ed_file;
+ if (!file || !*file) return NULL;
+
ed_file = evas_hash_find(_edje_file_hash, file);
if (!ed_file) ed_file = _edje_file_cache_find((char *)file);
if (!ed_file)
|
|
From: <enl...@li...> - 2005-05-24 17:02:08
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_load.c
Log Message:
the evas_hash_foreach callback is supposed to return a value ;)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- edje_load.c 24 May 2005 05:42:36 -0000 1.63
+++ edje_load.c 24 May 2005 17:02:00 -0000 1.64
@@ -1111,6 +1111,8 @@
edf->path, edf->references,
coll->part, coll->references);
_edje_collection_free(edf, coll);
+
+ return 1;
}
#ifdef EDJE_PROGRAM_CACHE
|
|
From: <enl...@li...> - 2005-07-26 19:27:09
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_callbacks.c
Log Message:
cleanup. formatting and stuff
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- edje_callbacks.c 26 Jul 2005 13:59:02 -0000 1.19
+++ edje_callbacks.c 26 Jul 2005 19:27:02 -0000 1.20
@@ -1,8 +1,7 @@
/*
- * vim: ts=8
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-
#include "Edje.h"
#include "edje_private.h"
@@ -61,64 +60,55 @@
_edje_emit(ed, buf, rp->part->name);
if (rp->events_to)
- {
- int x, y;
- Edje_Real_Part* events;
- events = rp->events_to;
-
- //fprintf(stderr,"rp = %s, events = %s\n", rp->part->name, events->part->name);
-
- evas_object_geometry_get(rp->object, &x, &y, NULL, NULL);
- /*
- fprintf(stderr,"x = %d, y = %d\n", x, y);
- fprintf(stderr,"ev->canvas.x = %d\n", ev->canvas.x);
- *
- x = ed->x;
- y = ed->y;
- */
- if ((events->part->dragable.x) || (events->part->dragable.y))
- {
- if (events->part->dragable.x)
+ {
+ int x = 0, y = 0;
+ Edje_Real_Part *events = rp->events_to;
+
+ evas_object_geometry_get(rp->object, &x, &y, NULL, NULL);
+
+ if ((events->part->dragable.x) || (events->part->dragable.y))
+ {
+ if (events->part->dragable.x)
{
- events->drag.tmp.x = ev->canvas.x - x - (events->x + events->w/2);
- events->drag.down.x = ev->canvas.x - x;
- events->x = ev->canvas.x - x - events->w/2;
+ events->drag.tmp.x = ev->canvas.x - x - (events->x + events->w / 2);
+ events->drag.down.x = ev->canvas.x - x;
+ events->x = ev->canvas.x - x - events->w / 2;
}
- if (events->part->dragable.y)
+ if (events->part->dragable.y)
{
- events->drag.tmp.y = ev->canvas.y - y - (events->y + events->h/2);
- events->drag.down.y = ev->canvas.y - y;
- events->y = ev->canvas.y - y - events->h/2;
+ events->drag.tmp.y = ev->canvas.y - y - (events->y + events->h / 2);
+ events->drag.down.y = ev->canvas.y - y;
+ events->y = ev->canvas.y - y - events->h / 2;
}
- snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
- _edje_emit(ed, buf, events->part->name);
- ed->dirty = 1;
- }
- _edje_recalc(ed);
- _edje_thaw(ed);
- _edje_unref(ed);
- _edje_ref(ed);
- _edje_freeze(ed);
-
- rp = events;
- {
- double dx, dy;
- int dir;
-
- dir = _edje_part_dragable_calc(ed, rp, &dx, &dy);
-// fprintf(stderr,"dx = %f, dy = %f\n", dx, dy);
- if ((dx != rp->drag.val.x) || (dy != rp->drag.val.y))
- {
- rp->drag.val.x = dx;
- rp->drag.val.y = dy;
- _edje_emit(ed, "drag", rp->part->name);
- ed->dirty = 1;
- rp->drag.need_reset = 1;
- _edje_recalc(ed);
- }
- }
- }
+ snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
+ _edje_emit(ed, buf, events->part->name);
+ ed->dirty = 1;
+ }
+ _edje_recalc(ed);
+ _edje_thaw(ed);
+ _edje_unref(ed);
+ _edje_ref(ed);
+ _edje_freeze(ed);
+
+ rp = events;
+ {
+ double dx = 0.0, dy = 0.0;
+ int dir;
+
+ dir = _edje_part_dragable_calc(ed, rp, &dx, &dy);
+
+ if ((dx != rp->drag.val.x) || (dy != rp->drag.val.y))
+ {
+ rp->drag.val.x = dx;
+ rp->drag.val.y = dy;
+ _edje_emit(ed, "drag", rp->part->name);
+ ed->dirty = 1;
+ rp->drag.need_reset = 1;
+ _edje_recalc(ed);
+ }
+ }
+ }
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
@@ -161,11 +151,11 @@
_edje_ref(ed);
_edje_emit(ed, buf, rp->part->name);
- if(rp->events_to)
- {
- rp = rp->events_to;
- snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
- _edje_emit(ed, buf, rp->part->name);
+ if (rp->events_to)
+ {
+ rp = rp->events_to;
+ snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
+ _edje_emit(ed, buf, rp->part->name);
}
if ((rp->part->dragable.x) || (rp->part->dragable.y))
@@ -208,7 +198,9 @@
rp = evas_object_data_get(obj, "real_part");
if (!rp) return;
if (rp->events_to)
- rp = rp->events_to;
+ {
+ rp = rp->events_to;
+ }
if (rp->still_in)
{
|
|
From: <enl...@li...> - 2005-09-26 19:33:59
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: edc.vim Log Message: added the 'fixed' keyword =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/data/edc.vim,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- edc.vim 5 Jan 2005 17:40:49 -0000 1.8 +++ edc.vim 26 Sep 2005 19:33:53 -0000 1.9 @@ -21,7 +21,7 @@ syn keyword cLabel item name min max type effect syn keyword cLabel mouse_events repeat_events clip_to syn keyword cLabel color_class text_class x y confine -syn keyword cLabel state visible align step aspect +syn keyword cLabel state visible align step aspect fixed syn keyword cLabel relative offset to to_x to_y normal tween syn keyword cLabel border color color2 color3 font size fit align syn keyword cLabel signal source action transition in target after |
|
From: <enl...@li...> - 2005-10-01 01:44:02
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: edc.vim Log Message: textblock keywords =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/data/edc.vim,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- edc.vim 26 Sep 2005 19:33:53 -0000 1.9 +++ edc.vim 30 Sep 2005 20:32:36 -0000 1.10 @@ -14,8 +14,8 @@ " A bunch of useful C keywords syn keyword cStatement images data fonts collections group syn keyword cStatement part parts dragable description rel1 rel2 -syn keyword cStatement text image font fill origin size -syn keyword cStatement programs program script +syn keyword cStatement text image font fill origin size tag +syn keyword cStatement programs program script styles style base syn match cType "+ + +;" contained syn keyword cLabel item name min max type effect |
|
From: <enl...@li...> - 2005-10-04 17:54:43
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_program.c
Log Message:
don't access freed memory
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- edje_program.c 21 Sep 2005 03:11:31 -0000 1.43
+++ edje_program.c 4 Oct 2005 17:54:36 -0000 1.44
@@ -369,6 +369,7 @@
{
Evas_List *l;
char *pname = NULL;
+ int free_runp = 0;
if (ed->delete_me) return;
_edje_ref(ed);
@@ -402,7 +403,7 @@
{
_edje_anim_count--;
ed->actions = evas_list_remove(ed->actions, runp);
- free(runp);
+ free_runp = 1;
if (!ed->actions)
{
_edje_animators = evas_list_remove(_edje_animators, ed);
@@ -411,6 +412,7 @@
_edje_emit(ed, "program,stop", pname);
_edje_thaw(ed);
_edje_unref(ed);
+ if (free_runp) free(runp);
}
void
|
|
From: <enl...@li...> - 2005-10-04 17:57:26
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c
Log Message:
warnings suck
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- edje_calc.c 19 Sep 2005 03:13:22 -0000 1.69
+++ edje_calc.c 4 Oct 2005 17:57:20 -0000 1.70
@@ -470,7 +470,7 @@
if (stl)
{
- char *ptxt;
+ const char *ptxt;
if (evas_object_textblock2_style_get(ep->object) != stl->style)
evas_object_textblock2_style_set(ep->object, stl->style);
|
|
From: <enl...@li...> - 2005-10-04 18:01:22
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_embryo.c
Log Message:
set walking_actions to 1 while we're walking the actions list. this fixes an embryo induced segfault, horray.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- edje_embryo.c 10 Dec 2004 15:45:31 -0000 1.44
+++ edje_embryo.c 4 Oct 2005 18:01:09 -0000 1.45
@@ -729,12 +729,18 @@
ed = embryo_program_data_get(ep);
program_id = params[1];
if (program_id < 0) return 0;
+
+ ed->walking_actions = 1;
+
for (l = ed->actions; l; l = l->next)
{
runp = l->data;
if (program_id == runp->program->id)
_edje_program_end(ed, runp);
}
+
+ ed->walking_actions = 0;
+
return 0;
}
|
|
From: <enl...@li...> - 2005-10-07 11:24:13
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_var.c
Log Message:
warn about cancelling non-existing timers, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_var.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_var.c 7 Oct 2005 03:55:28 -0000 1.15
+++ edje_var.c 7 Oct 2005 11:24:07 -0000 1.16
@@ -950,25 +950,44 @@
return et->id;
}
-void
-_edje_var_timer_del(Edje *ed, int id)
+static Edje_Var_Timer *
+_edje_var_timer_find(Edje *ed, int id)
{
Evas_List *l;
- if (!ed->var_pool) return;
+ if (!ed->var_pool) return NULL;
+
for (l = ed->var_pool->timers; l; l = l->next)
{
- Edje_Var_Timer *et;
-
- et = l->data;
- if (et->id == id)
- {
- ed->var_pool->timers = evas_list_remove(ed->var_pool->timers, et);
- ecore_timer_del(et->timer);
- free(et);
- return;
- }
+ Edje_Var_Timer *et = l->data;
+
+ if (et->id == id) return et;
}
+
+ return NULL;
+}
+
+void
+_edje_var_timer_del(Edje *ed, int id)
+{
+ Edje_Var_Timer *et;
+
+ et = _edje_var_timer_find(ed, id);
+ if (!et)
+ {
+ fprintf(stderr,
+ "*** EDJE ERROR: Cannot find timer to cancel\n"
+ "*** NAUGHTY PROGRAMMER!!!\n"
+ "*** SPANK SPANK SPANK!!!\n"
+ "*** Now go fix your code. Tut tut tut!\n"
+ "\n");
+ if (getenv("EDJE_ERROR_ABORT")) abort();
+ return;
+ }
+
+ ed->var_pool->timers = evas_list_remove(ed->var_pool->timers, et);
+ ecore_timer_del(et->timer);
+ free(et);
}
int
|
|
From: <enl...@li...> - 2005-10-07 11:26:22
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_textblock_styles.c
Log Message:
warning fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_textblock_styles.c 5 Oct 2005 08:38:04 -0000 1.1
+++ edje_textblock_styles.c 7 Oct 2005 11:26:15 -0000 1.2
@@ -21,6 +21,7 @@
return 1;
}
+#if 0
static char *
_edje_str_deescape(char *str)
{
@@ -36,6 +37,7 @@
*d = 0;
return s2;
}
+#endif
static char *
_edje_str_escape(char *str)
@@ -60,7 +62,7 @@
static void
_edje_format_param_parse(char *item, char **key, char **val)
{
- char *p, *pv;
+ char *p;
char *k, *v;
p = strchr(item, '=');
|
|
From: <enl...@li...> - 2006-02-13 18:20:34
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_decc.c
Log Message:
support empty includes
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_decc.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- edje_decc.c 23 Jan 2006 15:13:44 -0000 1.16
+++ edje_decc.c 13 Feb 2006 18:20:26 -0000 1.17
@@ -221,7 +221,11 @@
printf("ERROR: unable to write file (%s).\n", out);
exit (-1);
}
- fputs(sf->file, f);
+
+ /* if the file is empty, sf->file will be NULL.
+ * note that that's not an error
+ */
+ if (sf->file) fputs(sf->file, f);
fclose(f);
}
if (fontlist)
|
|
From: <enl...@li...> - 2006-02-25 09:56:15
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_embryo.c
Log Message:
the custom state code was still using strdup, but it needs to use the stringshare api
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- edje_embryo.c 30 Nov 2005 09:56:14 -0000 1.48
+++ edje_embryo.c 25 Feb 2006 09:56:09 -0000 1.49
@@ -1514,7 +1514,7 @@
*d = *parent;
- d->state.name = strdup("custom");
+ d->state.name = evas_stringshare_add("custom");
d->state.value = 0.0;
/* make sure all the allocated memory is getting copied,
@@ -1532,12 +1532,12 @@
d->image.tween_list = evas_list_append(d->image.tween_list, iid_new);
}
-#define STRDUP(x) x ? strdup(x) : NULL
- d->color_class = STRDUP(d->color_class);
- d->text.text = STRDUP(d->text.text);
- d->text.text_class = STRDUP(d->text.text_class);
- d->text.font = STRDUP(d->text.font);
-#undef STRDUP
+#define DUP(x) x ? evas_stringshare_add(x) : NULL
+ d->color_class = DUP(d->color_class);
+ d->text.text = DUP(d->text.text);
+ d->text.text_class = DUP(d->text.text_class);
+ d->text.font = DUP(d->text.font);
+#undef DUP
rp->custom.description = d;
|
|
From: <enl...@li...> - 2006-02-25 09:57:57
|
Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_embryo.c
Log Message:
custom state: i think we should inherit the parent's text style, too
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- edje_embryo.c 25 Feb 2006 09:56:09 -0000 1.49
+++ edje_embryo.c 25 Feb 2006 09:57:55 -0000 1.50
@@ -1537,6 +1537,7 @@
d->text.text = DUP(d->text.text);
d->text.text_class = DUP(d->text.text_class);
d->text.font = DUP(d->text.font);
+ d->text.style = DUP(d->text.style);
#undef DUP
rp->custom.description = d;
|
Thanks for helping keep SourceForge clean.
X