Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_data.c edje_load.c edje_private.h
Log Message:
more fixme's fixed. more fixme's added. edje is moving.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_data.c 24 Jun 2003 02:33:04 -0000 1.1
+++ edje_data.c 25 Jun 2003 02:29:25 -0000 1.2
@@ -134,7 +134,6 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "dragable.step_y", dragable.step_y, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "dragable.count_y", dragable.count_y, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "dragable.counfine_id", dragable.confine_id, EET_T_INT);
- EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "clip_to_id", clip_to_id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "align.x", align.x, EET_T_DOUBLE);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "align.y", align.y, EET_T_DOUBLE);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "min.w", min.w, EET_T_INT);
@@ -204,6 +203,7 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "id", id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "type", type,
EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "mouse_events",
mouse_events, EET_T_CHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "clip_to_id",
clip_to_id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "color_class",
color_class, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "text_class",
text_class, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_part, Edje_Part, "default_desc",
default_desc, _edje_edd_edje_part_description);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_load.c 24 Jun 2003 02:33:04 -0000 1.1
+++ edje_load.c 25 Jun 2003 02:29:25 -0000 1.2
@@ -85,6 +85,12 @@
rp->param1.rel1_to = evas_list_nth(ed->parts,
rp->param1.description->rel1.id);
if (rp->param1.description->rel2.id >= 0)
rp->param1.rel2_to = evas_list_nth(ed->parts,
rp->param1.description->rel2.id);
+ if (rp->part->clip_to_id >= 0)
+ {
+ rp->clip_to = evas_list_nth(ed->parts, rp->part->clip_to_id);
+ if (rp->clip_to)
+ evas_object_clip_set(rp->object, rp->clip_to->object);
+ }
}
ed->dirty = 1;
_edje_freeze(ed);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_private.h 24 Jun 2003 02:33:04 -0000 1.17
+++ edje_private.h 25 Jun 2003 02:29:25 -0000 1.18
@@ -10,23 +10,39 @@
#include <math.h>
#include <fnmatch.h>
-/* FIXME: need "random" signals and events to hook to */
-/* FIXME: clip_to needs to work */
-/* FIXME: free stuff - no more leaks */
-/* FIXME: dragables have to work */
-/* FIXME: drag start/top signals etc. */
-/* FIXME: drag needs to have signals with relative pos */
-/* FIXME: drag vals 0.0 -> 1.0. "rest" pos == 0.0 */
-/* FIXME: text parts need to work */
-/* FIXME: reduce linked list walking and list_nth calls */
-/* FIXME: named parts need to be able to be "replaced" with new evas objects */
-/* FIXME: need to be able to calculate min & max size of a whole edje */
-/* FIXME: add code to list collections in an eet */
-/* FIXME: part replacement with objec t+callbacks */
-/* FIXME: part queries for geometry etc. */
-
-/* FIXME: ? somehow handle double click? */
-/* FIXME: ? add numeric params to conditions for progs (ranges etc.) */
+/* FIXME:
+ * reference count programs since the tmp lists can be screwed if a program is ended
by another
+ * need "random" signals and events for hooking to, and "random" durations
+ * free stuff - no more leaks
+ * dragables have to work
+ * drag start/top signals etc.
+ * drag needs to have signals with relative pos as arg.
+ * drag vals should be 0.0 -> 1.0 if drag is confined. "rest" pos = 0.0.
+ * query dragable for its relative pos value
+ * text parts need to work
+ * text and color classes need to work
+ * reduce linked list walking and list_nth calls
+ * named parts need to be able to be "replaced" with new evas objects
+ * real part size and "before min/max limit" sizes need to be stored per part
+ * need to be able to calculate min & max size of a whole edje
+ * add code to list collections in an eet file
+ * externally sourced images need to be supported in edje_cc and edje
+ * part replacement with object callbacks should be possible
+ * part queries for geometry etc.
+ * need to be able to "pause" edjes from API
+ * need to be able to force anim times to 0.0 from API to turn off animation
+ * need to detect relative loops
+ * need to detect clip_to loops
+ * need to detect anim time 0.0 loops
+ * need to check frametime 0.0 works
+ * need to check mouse_events flag works
+ * edje_cc should be able to force lossy, lossless, min and max quality and
compression of encoded images
+ * edje_cc needs to prune out unused images
+ * edje_cc might need an option for limiting number of tween images
+ * audit edje for corrupt/bad input files
+ * ? somehow handle double click?
+ * ? add numeric params to conditions for progs (ranges etc.)
+*/
/* HOW THIS ALL WORKS:
@@ -198,9 +214,10 @@
struct _Edje_Part
{
char *name; /* the name if any of the part */
+ int id; /* its id number */
unsigned char type; /* what type (image, rect, text) */
unsigned char mouse_events; /* it will affect/respond to mouse events */
- int id; /* its id number */
+ int clip_to_id; /* the part id to clip this one to */
char *color_class; /* how to modify the color */
char *text_class; /* how to apply/modify the font */
Edje_Part_Description *default_desc; /* the part descriptor for default */
@@ -233,8 +250,6 @@
int confine_id; /* dragging within this bit, -1 = no */
} dragable;
- int clip_to_id; /* the part id to clip this one to */
-
struct {
double x, y; /* 0 <-> 1.0 alignment within allocated space */
} align;
@@ -360,6 +375,8 @@
Edje_Real_Part *rel2_to;
Edje_Real_Part *confine_to;
} param1, param2;
+
+ Edje_Real_Part *clip_to;
Edje_Running_Program *program;
};
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
