Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_main.c edje_private.h
Log Message:
signal emit action added
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_main.c 20 Jun 2003 10:44:36 -0000 1.11
+++ edje_main.c 20 Jun 2003 13:41:00 -0000 1.12
@@ -1,18 +1,15 @@
#include "Edje.h"
#include "edje_private.h"
-/* FIXME: finish ACTION_STOP action */
-/* FIXME: add a "SIGNAL_EMIT action to emit fake (or real) signals */
-/* FIXME: somehow handle double click? */
+/* FIXME: ? somehow handle double click? */
/* FIXME: free stuff - no more leaks */
-/* FIXME: new prog starts while current program is running on part, stop old */
-/* FIXME: add numeric params to conditiosn for progs (ranges etc.) */
+/* FIXME: ? add numeric params to conditions for progs (ranges etc.) */
/* FIXME: dragables havwe to work */
/* FIXME: drag start/top signals etc. */
/* FIXME: app has to be able to have callbacks called on signal emits */
/* FIXME: app has to be able to emit signals */
-/* 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: 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 */
Edje *_edje_fetch(Evas_Object *obj);
Edje *_edje_add(Evas_Object *obj);
@@ -74,7 +71,6 @@
static Evas_List *_edje_animators = NULL;
static Evas_Hash *_edje_file_hash = NULL;
-
static Evas_Smart *_edje_smart = NULL;
void
@@ -688,6 +684,10 @@
}
}
}
+ else if (pr->action == EDJE_ACTION_TYPE_SIGNAL_EMIT)
+ {
+ _edje_emit(ed, pr->state, pr->state2);
+ }
}
static void
@@ -1424,6 +1424,7 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "source",
source, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "action",
action, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "state",
state, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "state2",
state2, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "value",
value, EET_T_DOUBLE);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "tween.mode",
tween.mode, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "tween.time",
tween.time, EET_T_DOUBLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje_private.h 20 Jun 2003 09:38:27 -0000 1.12
+++ edje_private.h 20 Jun 2003 13:41:00 -0000 1.13
@@ -35,15 +35,14 @@
* tween to the new state.
*
* the signals that can be emitted are:
- * "mouse.down"
- * "mouse.up"
- * "mouse.in"
- * "mouse.out"
- * "mouse.move"
- * "clicked"
- * "drag.start"
+ * "mouse,down"
+ * "mouse,up"
+ * "mouse,in"
+ * "mouse,out"
+ * "mouse,move"
+ * "drag,start"
* "drag"
- * "drag.stop"
+ * "drag,stop"
*/
typedef struct _Edje_File Edje_File;
@@ -82,6 +81,7 @@
#define EDJE_ACTION_TYPE_NONE 0
#define EDJE_ACTION_TYPE_STATE_SET 1
#define EDJE_ACTION_TYPE_ACTION_STOP 2
+#define EDJE_ACTION_TYPE_SIGNAL_EMIT 3
#define EDJE_ACTION_TYPE_LAST 4
#define EDJE_TWEEN_MODE_NONE 0
@@ -131,6 +131,7 @@
int action; /* type - set state, stop action, set drag pos etc. */
char *state; /* what state of alternates to apply, NULL = default */
+ char *state2; /* what other state to use - for signal emit action */
double value; /* value of state to apply (if multiple names match) */
struct {
-------------------------------------------------------
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
