Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje.h edje_load.c edje_private.h edje_program.c edje_smart.c
edje_util.c
Log Message:
api change... yes i know. sorry! but it's early days. this is much cleaner
using better namespacing.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Edje.h 7 Jul 2003 07:55:18 -0000 1.7
+++ Edje.h 8 Jul 2003 10:08:15 -0000 1.8
@@ -6,27 +6,25 @@
#ifdef __cplusplus
extern "C" {
#endif
-
-/***************************************************************************/
-/* API here */
-/***************************************************************************/
- void edje_init(void);
- void edje_frametime_set(double t);
- double edje_frametime_get(void);
- Evas_Object *edje_add(Evas *evas);
- void edje_file_set(Evas_Object *o, const char *file, const char *part);
- void edje_signal_callback_add(Evas_Object *o, const char *emission, const
char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const
char *source), void *data);
- void *edje_signal_callback_del(Evas_Object *o, const char *emission, const
char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const
char *source));
- void edje_signal_emit(Evas_Object *o, const char *emission, const char
*source);
- void edje_play_set(Evas_Object *obj, int play);
- int edje_play_get(Evas_Object *obj);
- void edje_animation_set(Evas_Object *obj, int on);
- int edje_animation_get(Evas_Object *obj);
- int edje_part_exists(Evas_Object *obj, const char *part);
- void edje_part_geometry_get(Evas_Object *o, const char *part, double *x,
double *y, double *w, double *h);
- void edje_part_text_set(Evas_Object *o, const char *part, const char
*text);
- const char *edje_part_text_get(Evas_Object *obj, const char *part);
+ void edje_init (void);
+ void edje_frametime_set (double t);
+ double edje_frametime_get (void);
+
+ Evas_Object *edje_object_add (Evas *evas);
+ void edje_object_file_set (Evas_Object *o, const char *file,
const char *part);
+ void edje_object_file_get (Evas_Object *o, const char **file,
const char **part);
+ void edje_object_signal_callback_add (Evas_Object *o, const char
*emission, const char *source, void (*func) (void *data, Evas_Object *o, const char
*emission, const char *source), void *data);
+ void *edje_object_signal_callback_del (Evas_Object *o, const char
*emission, const char *source, void (*func) (void *data, Evas_Object *o, const char
*emission, const char *source));
+ void edje_object_signal_emit (Evas_Object *o, const char
*emission, const char *source);
+ void edje_object_play_set (Evas_Object *o, int play);
+ int edje_object_play_get (Evas_Object *o);
+ void edje_object_animation_set (Evas_Object *o, int on);
+ int edje_object_animation_get (Evas_Object *o);
+ int edje_object_part_exists (Evas_Object *o, const char *part);
+ void edje_object_part_geometry_get (Evas_Object *o, const char *part,
double *x, double *y, double *w, double *h);
+ void edje_object_part_text_set (Evas_Object *o, const char *part,
const char *text);
+ const char *edje_object_part_text_get (Evas_Object *o, const char *part);
#ifdef __cplusplus
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_load.c 7 Jul 2003 07:55:18 -0000 1.5
+++ edje_load.c 8 Jul 2003 10:08:15 -0000 1.6
@@ -5,7 +5,7 @@
/* API Routines */
void
-edje_file_set(Evas_Object *obj, const char *file, const char *part)
+edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
{
Edje *ed;
@@ -107,6 +107,22 @@
if ((ed->parts) && (evas_object_visible_get(obj)))
evas_object_show(ed->clipper);
}
+}
+
+void
+edje_object_file_get(Evas_Object *obj, const char **file, const char **part)
+{
+ Edje *ed;
+
+ ed = _edje_fetch(obj);
+ if (!ed)
+ {
+ if (file) *file = NULL;
+ if (part) *part = NULL;
+ return;
+ }
+ if (file) *file = ed->path;
+ if (part) *part = ed->part;
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- edje_private.h 7 Jul 2003 07:55:18 -0000 1.24
+++ edje_private.h 8 Jul 2003 10:08:15 -0000 1.25
@@ -45,6 +45,7 @@
* ? reduce linked list walking and list_nth calls
* ? add containering (hbox, vbox, table, wrapping multi-line hbox & vbox)
* ? add numeric params to conditions for progs (ranges etc.)
+ * ? key/value pair config values per colelction and per edje file
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_program.c 7 Jul 2003 07:55:18 -0000 1.6
+++ edje_program.c 8 Jul 2003 10:08:15 -0000 1.7
@@ -27,7 +27,7 @@
}
void
-edje_signal_callback_add(Evas_Object *obj, const char *emission, const char *source,
void (*func) (void *data, Evas_Object *o, const char *emission, const char *source),
void *data)
+edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char
*source, void (*func) (void *data, Evas_Object *o, const char *emission, const char
*source), void *data)
{
Edje *ed;
Edje_Signal_Callback *escb;
@@ -49,7 +49,7 @@
}
void *
-edje_signal_callback_del(Evas_Object *obj, const char *emission, const char *source,
void (*func) (void *data, Evas_Object *o, const char *emission, const char *source))
+edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const char
*source, void (*func) (void *data, Evas_Object *o, const char *emission, const char
*source))
{
Edje *ed;
Evas_List *l;
@@ -88,7 +88,7 @@
}
void
-edje_signal_emit(Evas_Object *obj, const char *emission, const char *source)
+edje_object_signal_emit(Evas_Object *obj, const char *emission, const char *source)
{
Edje *ed;
@@ -99,7 +99,7 @@
}
void
-edje_play_set(Evas_Object *obj, int play)
+edje_object_play_set(Evas_Object *obj, int play)
{
Edje *ed;
double t;
@@ -129,7 +129,7 @@
}
int
-edje_play_get(Evas_Object *obj)
+edje_object_play_get(Evas_Object *obj)
{
Edje *ed;
@@ -140,7 +140,7 @@
}
void
-edje_animation_set(Evas_Object *obj, int on)
+edje_object_animation_set(Evas_Object *obj, int on)
{
Edje *ed;
Evas_List *l;
@@ -177,7 +177,7 @@
}
int
-edje_animation_get(Evas_Object *obj)
+edje_object_animation_get(Evas_Object *obj)
{
Edje *ed;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_smart.c 7 Jul 2003 07:55:18 -0000 1.3
+++ edje_smart.c 8 Jul 2003 10:08:15 -0000 1.4
@@ -20,7 +20,7 @@
/* API Routines */
Evas_Object *
-edje_add(Evas *evas)
+edje_object_add(Evas *evas)
{
if (!_edje_smart)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_util.c 7 Jul 2003 07:55:18 -0000 1.5
+++ edje_util.c 8 Jul 2003 10:08:15 -0000 1.6
@@ -2,7 +2,7 @@
#include "edje_private.h"
int
-edje_part_exists(Evas_Object *obj, const char *part)
+edje_object_part_exists(Evas_Object *obj, const char *part)
{
Evas_List *l;
Edje *ed;
@@ -20,7 +20,7 @@
}
void
-edje_part_geometry_get(Evas_Object *obj, const char *part, double *x, double *y,
double *w, double *h )
+edje_object_part_geometry_get(Evas_Object *obj, const char *part, double *x, double
*y, double *w, double *h )
{
Evas_List *l;
Edje *ed;
@@ -55,7 +55,7 @@
}
void
-edje_part_text_set(Evas_Object *obj, const char *part, const char *text)
+edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
{
Evas_List *l;
Edje *ed;
@@ -89,7 +89,7 @@
}
const char *
-edje_part_text_get(Evas_Object *obj, const char *part)
+edje_object_part_text_get(Evas_Object *obj, const char *part)
{
Evas_List *l;
Edje *ed;
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
