Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor
Modified Files:
edje_edit.patch
Log Message:
* Make clipping work
* Add some debugging code
* Include locale.h (this should fix Hisham error)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/edje_edit.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_edit.patch 18 Feb 2008 02:58:14 -0000 1.6
+++ edje_edit.patch 18 Feb 2008 20:38:40 -0000 1.7
@@ -4,7 +4,7 @@
retrieving revision 1.4
diff -u -r1.4 Doxyfile
--- Doxyfile 6 Dec 2007 23:40:48 -0000 1.4
-+++ Doxyfile 18 Feb 2008 02:54:41 -0000
++++ Doxyfile 18 Feb 2008 20:33:01 -0000
@@ -1,7 +1,7 @@
PROJECT_NAME = Edje
PROJECT_NUMBER =
@@ -29,7 +29,7 @@
retrieving revision 1.93
diff -u -r1.93 configure.in
--- configure.in 25 Jan 2008 03:35:46 -0000 1.93
-+++ configure.in 18 Feb 2008 02:54:41 -0000
++++ configure.in 18 Feb 2008 20:33:01 -0000
@@ -66,6 +66,7 @@
evas >= 0.9.9
ecore-evas >= 0.9.9
@@ -44,7 +44,7 @@
retrieving revision 1.6
diff -u -r1.6 gendoc
--- gendoc 6 Dec 2007 23:42:38 -0000 1.6
-+++ gendoc 18 Feb 2008 02:54:42 -0000
++++ gendoc 18 Feb 2008 20:33:01 -0000
@@ -1,7 +1,7 @@
#!/bin/sh
cp ./edje.c.in ./edje.c
@@ -68,8 +68,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 18 Feb 2008 02:54:42 -0000
-@@ -0,0 +1,1250 @@
++++ src/lib/Edje_Edit.h 18 Feb 2008 20:33:01 -0000
+@@ -0,0 +1,1274 @@
+#ifndef _EDJE_EDIT_H
+#define _EDJE_EDIT_H
+
@@ -177,6 +177,15 @@
+ Evas_Object *obj ///< The edje object to save
+);
+
++/**Print on standard output many information about the internal status
++ * of the edje object.
++ * This is probably only usefull to debug.
++ */
++EAPI void
++edje_edit_print_internal_status(
++ Evas_Object *obj ///< The edje object to inspect
++);
++
+//@}
+/******************************************************************************/
+/************************** GROUPS API
************************************/
@@ -304,6 +313,24 @@
+ const char *part ///< The name of the part
+);
+
++/**Get the clip_to part.
++ * NULL is returned on errors and if the part don't have a clip.
++ */
++EAPI const char * ///@return The name of the part to clip part to.
Use edje_edit_string_free() when you don't need it anymore.
++edje_edit_part_clip_to_get(
++ Evas_Object *obj, ///< The edje object
++ const char *part ///< The name of the part
++);
++/**Set a part to clip part to.
++ * If clip_to is NULL then the clipping value will be cancelled (unset
clipping)
++ */
++EAPI unsigned char ///@return 1 on success, 0 otherwise.
++edje_edit_part_clip_to_set(
++ Evas_Object *obj, ///< The edje object
++ const char *part, ///< The name of the part
++ const char *clip_to ///< The name of the part to clip part to.
++);
++
+/**Get the effect for a given part. */
+EAPI unsigned char ///@return One of: EDJE_TEXT_EFFECT_NONE, _PLAIN,
_OUTLINE, _SOFT_OUTLINE, _SHADOW, _SOFT_SHADOW, _OUTLINE_SHADOW,
_OUTLINE_SOFT_SHADOW, _FAR_SHADOW, _FAR_SOFT_SHADOW, _GLOW.
+edje_edit_part_effect_get(
@@ -324,7 +351,6 @@
+ Evas_Object *obj, ///< The edje object
+ const char *part ///< The name of the part
+);
-+
+/**Set the current state in part.*/
+EAPI unsigned char ///@return 1 on success, 0 otherwise.
+edje_edit_part_selected_state_set(
@@ -339,7 +365,6 @@
+ Evas_Object *obj, ///< The edje object
+ const char *part ///< The name of the part
+);
-+
+/**Set mouse_events for part.*/
+EAPI void
+edje_edit_part_mouse_events_set(
@@ -354,7 +379,6 @@
+ Evas_Object *obj, ///< The edje object
+ const char *part ///< The name of the part
+);
-+
+/**Set repeat_events for part. */
+EAPI void
+edje_edit_part_repeat_events_set(
@@ -1326,7 +1350,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 18 Feb 2008 02:54:42 -0000
++++ src/lib/Makefile.am 18 Feb 2008 20:33:01 -0000
@@ -14,7 +14,8 @@
libedje.la
@@ -1352,8 +1376,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 18 Feb 2008 02:54:42 -0000
-@@ -0,0 +1,2861 @@
++++ src/lib/edje_edit.c 18 Feb 2008 20:33:01 -0000
+@@ -0,0 +1,2953 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
@@ -2290,6 +2314,67 @@
+ return 1;
+}
+
++
++EAPI const char *
++edje_edit_part_clip_to_get(Evas_Object *obj, const char *part)
++{
++ GET_RP_OR_RETURN(NULL)
++ Edje_Real_Part *clip = NULL;
++
++ printf("Get clip_to for part: %s [to_id: %d]\n", part,
rp->part->clip_to_id);
++ if (rp->part->clip_to_id < 0) return NULL;
++
++ clip = ed->table_parts[rp->part->clip_to_id % ed->table_parts_size];
++ if (!clip || !clip->part || !clip->part->name) return NULL;
++
++
++ return evas_stringshare_add(clip->part->name);
++}
++EAPI unsigned char
++edje_edit_part_clip_to_set(Evas_Object *obj, const char *part, const char
*clip_to)
++{
++ GET_RP_OR_RETURN(0)
++ Edje_Real_Part *clip;
++
++ /* unset clipping */
++ if (!clip_to)
++ {
++ printf("UnSet clip_to for part: %s\n", part);
++
++ if (rp->clip_to->object)
++ {
++ evas_object_pointer_mode_set(rp->clip_to->object,
++ EVAS_OBJECT_POINTER_MODE_AUTOGRAB);
++ evas_object_clip_unset(rp->object);
++ }
++
++ evas_object_clip_set(rp->object, ed->clipper);
++
++
++ rp->part->clip_to_id = -1;
++ rp->clip_to = NULL;
++
++ edje_object_calc_force(obj);
++
++ return 1;
++ }
++
++ /* set clipping */
++ printf("Set clip_to for part: %s [to: %s]\n", part, clip_to);
++ clip = _edje_real_part_get(ed, clip_to);
++ if (!clip || !clip->part) return 0;
++ rp->part->clip_to_id = clip->part->id;
++ rp->clip_to = clip;
++
++ evas_object_pass_events_set(rp->clip_to->object, 1);
++ evas_object_pointer_mode_set(rp->clip_to->object,
EVAS_OBJECT_POINTER_MODE_NOGRAB);
++ evas_object_clip_set(rp->object, rp->clip_to->object);
++
++ edje_object_calc_force(obj);
++
++ return 1;
++}
++
+EAPI unsigned char
+edje_edit_part_mouse_events_get(Evas_Object *obj, const char *part)
+{
@@ -4215,13 +4300,44 @@
+ return 1;
+}
+
++
++
++EAPI void
++edje_edit_print_internal_status(Evas_Object *obj)
++{
++ int i;
++ GET_ED_OR_RETURN()
++ printf("\n****** CHECKIN' INTERNAL STRUCTS STATUS *********\n");
++
++ printf("*** Edje\n");
++ printf(" path: '%s'\n", ed->path);
++ printf(" part: '%s'\n", ed->part);
++ printf(" parent: '%s'\n", ed->parent);
++ printf("\n");
++
++ printf("*** Parts [table:%d list:%d]\n", ed->table_parts_size,
evas_list_count(ed->collection->parts));
++ for (i = 0; i < ed->table_parts_size; i++)
++ {
++ Edje_Real_Part *rp;
++
++ rp = ed->table_parts[i % ed->table_parts_size];
++ printf(" [%d]%s (id:%d)\n", i , rp->part->name, rp->part->id);
++ }
++
++ printf("\n");
++
++ printf("\n");
++ printf("\n");
++
++ printf("****************** END ************************\n\n");
++}
Index: src/lib/edje_load.c
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.111
diff -u -r1.111 edje_load.c
--- src/lib/edje_load.c 18 Jan 2008 06:34:04 -0000 1.111
-+++ src/lib/edje_load.c 18 Feb 2008 02:54:42 -0000
++++ src/lib/edje_load.c 18 Feb 2008 20:33:02 -0000
@@ -5,7 +5,7 @@
#include "Edje.h"
#include "edje_private.h"
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs