From: <enl...@li...> - 2002-07-07 02:29:47
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas2 Dir : e17/libs/evas2/src/lib/canvas Modified Files: Tag: SPLIT evas_object_gradient.c evas_object_image.c evas_object_line.c evas_object_main.c evas_object_polygon.c evas_object_rectangle.c evas_object_text.c evas_stack.c Log Message: clear up a few fixme's =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_object_gradient.c,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -3 -r1.1.2.9 -r1.1.2.10 --- evas_object_gradient.c 3 Jul 2002 07:28:11 -0000 1.1.2.9 +++ evas_object_gradient.c 7 Jul 2002 02:29:16 -0000 1.1.2.10 @@ -4,6 +4,7 @@ /* private magic number for gradient objects */ #define MAGIC_OBJ_GRADIENT 0x71777773 +static const char o_type[] = "gradient"; /* private struct for gradient object internal data */ typedef struct _Evas_Object_Gradient Evas_Object_Gradient; @@ -168,6 +169,7 @@ obj->prev = obj->cur; /* set up methods (compulsory) */ obj->func = &object_func; + obj->type = o_type; } static void * =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_object_image.c,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -3 -r1.1.2.13 -r1.1.2.14 --- evas_object_image.c 4 Jul 2002 07:33:06 -0000 1.1.2.13 +++ evas_object_image.c 7 Jul 2002 02:29:16 -0000 1.1.2.14 @@ -4,6 +4,7 @@ /* private magic number for image objects */ #define MAGIC_OBJ_IMAGE 0x71777775 +static const char o_type[] = "image"; /* private struct for rectangle object internal data */ typedef struct _Evas_Object_Image Evas_Object_Image; @@ -608,6 +609,7 @@ obj->prev = obj->cur; /* set up methods (compulsory) */ obj->func = &object_func; + obj->type = o_type; } static void * =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_object_line.c,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -3 -r1.1.2.6 -r1.1.2.7 --- evas_object_line.c 2 Jul 2002 01:44:10 -0000 1.1.2.6 +++ evas_object_line.c 7 Jul 2002 02:29:16 -0000 1.1.2.7 @@ -4,6 +4,7 @@ /* private magic number for line objects */ #define MAGIC_OBJ_LINE 0x71777772 +static const char o_type[] = "line"; /* private struct for line object internal data */ typedef struct _Evas_Object_Line Evas_Object_Line; @@ -182,6 +183,7 @@ obj->prev = obj->cur; /* set up methods (compulsory) */ obj->func = &object_func; + obj->type = o_type; } static void * =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_object_main.c,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -u -3 -r1.1.2.20 -r1.1.2.21 --- evas_object_main.c 5 Jul 2002 23:35:33 -0000 1.1.2.20 +++ evas_object_main.c 7 Jul 2002 02:29:16 -0000 1.1.2.21 @@ -745,3 +745,12 @@ } return in; } + +const char * +evas_object_type_get(Evas_Object *obj) +{ + MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); + return NULL; + MAGIC_CHECK_END(); + return obj->type; +} =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_object_polygon.c,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -3 -r1.1.2.6 -r1.1.2.7 --- evas_object_polygon.c 3 Jul 2002 07:28:11 -0000 1.1.2.6 +++ evas_object_polygon.c 7 Jul 2002 02:29:16 -0000 1.1.2.7 @@ -4,6 +4,7 @@ /* private magic number for polygon objects */ #define MAGIC_OBJ_POLYGON 0x71777774 +static const char o_type[] = "polygon"; /* private struct for line object internal data */ typedef struct _Evas_Object_Polygon Evas_Object_Polygon; @@ -191,6 +192,7 @@ obj->prev = obj->cur; /* set up methods (compulsory) */ obj->func = &object_func; + obj->type = o_type; } static void * =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_object_rectangle.c,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -u -3 -r1.1.2.21 -r1.1.2.22 --- evas_object_rectangle.c 2 Jul 2002 01:44:10 -0000 1.1.2.21 +++ evas_object_rectangle.c 7 Jul 2002 02:29:16 -0000 1.1.2.22 @@ -4,6 +4,7 @@ /* private magic number for rectangle objects */ #define MAGIC_OBJ_RECTANGLE 0x71777771 +static const char o_type[] = "rectangle"; /* private struct for rectangle object internal data */ typedef struct _Evas_Object_Rectangle Evas_Object_Rectangle; @@ -93,6 +94,7 @@ obj->prev = obj->cur; /* set up methods (compulsory) */ obj->func = &object_func; + obj->type = o_type; } static void * =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_object_text.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -3 -r1.1.2.4 -r1.1.2.5 --- evas_object_text.c 5 Jul 2002 23:35:33 -0000 1.1.2.4 +++ evas_object_text.c 7 Jul 2002 02:29:16 -0000 1.1.2.5 @@ -4,6 +4,7 @@ /* private magic number for text objects */ #define MAGIC_OBJ_TEXT 0x71777776 +static const char o_type[] = "text"; /* private struct for text object internal data */ typedef struct _Evas_Object_Text Evas_Object_Text; @@ -619,6 +620,7 @@ obj->prev = obj->cur; /* set up methods (compulsory) */ obj->func = &object_func; + obj->type = o_type; } static void * =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/src/lib/canvas/Attic/evas_stack.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -3 -r1.1.2.1 -r1.1.2.2 --- evas_stack.c 14 Jun 2002 00:35:41 -0000 1.1.2.1 +++ evas_stack.c 7 Jul 2002 02:29:16 -0000 1.1.2.2 @@ -92,7 +92,18 @@ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; MAGIC_CHECK_END(); - return (Evas_Object *)(((Evas_Object_List *)obj)->next); + if (((Evas_Object_List *)obj)->next) + return (Evas_Object *)(((Evas_Object_List *)obj)->next); + else + { + if (((Evas_Object_List *)(((Evas_Object *)obj)->layer))->next) + { + Evas_Layer *l; + + l = (Evas_Layer *)(((Evas_Object_List *)(((Evas_Object *)obj)->layer))->next); + return l->objects; + } + } } Evas_Object * @@ -101,5 +112,38 @@ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; MAGIC_CHECK_END(); - return (Evas_Object *)(((Evas_Object_List *)obj)->prev); + if (((Evas_Object_List *)obj)->prev) + return (Evas_Object *)(((Evas_Object_List *)obj)->prev); + else + { + if (((Evas_Object_List *)(((Evas_Object *)obj)->layer))->prev) + { + Evas_Layer *l; + + l = (Evas_Layer *)(((Evas_Object_List *)(((Evas_Object *)obj)->layer))->prev); + return (Evas_Object *)(((Evas_Object_List *)(l->objects))->last); + } + } +} + +Evas_Object * +evas_object_bottom_get(Evas *e) +{ + MAGIC_CHECK(e, Evas, MAGIC_EVAS); + return NULL; + MAGIC_CHECK_END(); + if (e->layers) + return e->layers->objects; + return NULL; +} + +Evas_Object * +evas_object_top_get(Evas *e) +{ + MAGIC_CHECK(e, Evas, MAGIC_EVAS); + return NULL; + MAGIC_CHECK_END(); + if (e->layers) + return (Evas_Object *)(((Evas_List *)(((Evas_Layer *)(((Evas_Object_List *)(e->layers))->last))->objects))->last); + return NULL; } |