Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
signals_thumb.c
Log Message:
forget manually marshalling signals to edje, passing events elsewhere works
fine.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_thumb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- signals_thumb.c 10 Nov 2003 18:15:00 -0000 1.4
+++ signals_thumb.c 8 Jan 2004 19:58:16 -0000 1.5
@@ -36,86 +36,6 @@
}
/**
- * The following five functions translate evas mouse events into edje
- * mouse event signal emissions
- */
-static void
-_entice_thumb_mouse_wheel_translate(void *data, Evas * e, Evas_Object * obj,
- void *event_info)
-{
- Evas_Event_Mouse_Wheel *ev = NULL;
- Evas_Object *o = NULL;
-
- if ((ev = (Evas_Event_Mouse_Wheel *) event_info))
- {
- if ((o = (Evas_Object *) data))
- {
- fprintf(stderr, "Mouse WHEEL: %d,%d\n", ev->direction, ev->z);
- /*
- evas_event_feed_mouse_wheel_data(e, ev->direction, ev->z, o); */
- }
- }
-}
-static void
-_entice_thumb_mouse_in_translate(void *data, Evas * e, Evas_Object * obj,
- void *event_info)
-{
- Evas_Event_Mouse_In *ev = NULL;
- Evas_Object *o = NULL;
-
- if ((ev = (Evas_Event_Mouse_In *) event_info))
- if ((o = (Evas_Object *) data))
- edje_object_signal_emit(o, "mouse,in", "EnticeThumb");
-}
-static void
-_entice_thumb_mouse_out_translate(void *data, Evas * e, Evas_Object * obj,
- void *event_info)
-{
- Evas_Event_Mouse_Out *ev = NULL;
- Evas_Object *o = NULL;
-
- if ((ev = (Evas_Event_Mouse_Out *) event_info))
- if ((o = (Evas_Object *) data))
- edje_object_signal_emit(o, "mouse,out", "EnticeThumb");
-}
-static void
-_entice_thumb_mouse_up_translate(void *data, Evas * e, Evas_Object * obj,
- void *event_info)
-{
- Evas_Event_Mouse_Up *ev = NULL;
- Evas_Object *o = NULL;
-
- if ((ev = (Evas_Event_Mouse_Up *) event_info))
- {
- if ((o = (Evas_Object *) data))
- {
- char buf[PATH_MAX];
-
- snprintf(buf, PATH_MAX, "mouse,up,%i", (int) ev->button);
- edje_object_signal_emit(o, buf, "EnticeThumb");
- }
- }
-}
-static void
-_entice_thumb_mouse_down_translate(void *data, Evas * e, Evas_Object * obj,
- void *event_info)
-{
- Evas_Event_Mouse_Down *ev = NULL;
- Evas_Object *o = NULL;
-
- if ((ev = (Evas_Event_Mouse_Down *) event_info))
- {
- if ((o = (Evas_Object *) data))
- {
- char buf[PATH_MAX];
-
- snprintf(buf, PATH_MAX, "mouse,down,%i", (int) ev->button);
- edje_object_signal_emit(o, buf, "EnticeThumb");
- }
- }
-}
-
-/**
* @o - the edje object we're hooking signals into
* @im - the E_Thumb object want want to translate mouse events for
* Evil things are done in order to get mouse events through to edje, it
@@ -133,23 +53,4 @@
count = sizeof(signals) / sizeof(char *);
for (i = 0; i < count; i++)
edje_object_signal_callback_add(o, signals[i], "", funcs[i], im);
-
- /*
- * this is weird, but we intercept callbacks and feed them to edje, for
- * some reason i can't get the mouse callbacks to be handled properly
- * for a swallowed smart object w/o this
- */
- if ((thumb = (E_Thumb *) evas_object_smart_data_get(im)))
- {
- evas_object_event_callback_add(thumb->image, EVAS_CALLBACK_MOUSE_IN,
- _entice_thumb_mouse_in_translate, o);
- evas_object_event_callback_add(thumb->image, EVAS_CALLBACK_MOUSE_OUT,
- _entice_thumb_mouse_out_translate, o);
- evas_object_event_callback_add(thumb->image, EVAS_CALLBACK_MOUSE_UP,
- _entice_thumb_mouse_up_translate, o);
- evas_object_event_callback_add(thumb->image, EVAS_CALLBACK_MOUSE_DOWN,
- _entice_thumb_mouse_down_translate, o);
- evas_object_event_callback_add(thumb->image, EVAS_CALLBACK_MOUSE_WHEEL,
- _entice_thumb_mouse_wheel_translate, o);
- }
}
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
