Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_callbacks.c edje_private.h
Log Message:
handle double/triple click again
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- edje_callbacks.c 7 Dec 2004 12:38:55 -0000 1.16
+++ edje_callbacks.c 7 Dec 2004 13:31:15 -0000 1.17
@@ -45,7 +45,7 @@
ed = data;
rp = evas_object_data_get(obj, "real_part");
if (!rp) return;
-#ifdef _ECORE_X_H
+#ifdef HAVE_ECORE_X
if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_DOWN)
{
Ecore_X_Event_Mouse_Button_Down *evx;
@@ -64,9 +64,31 @@
snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
}
else
+#endif
+#ifdef HAVE_ECORE_FB
+ if (ecore_event_current_type_get() == ECORE_FB_EVENT_MOUSE_BUTTON_DOWN)
+ {
+ Ecore_Fb_Event_Mouse_Button_Down *evfb;
+
+ evfb = ecore_event_current_event_get();
+ if (evfb)
+ {
+ if (evfb->triple_click)
+ snprintf(buf, sizeof(buf), "mouse,down,%i,triple", ev->button);
+ else if (evfb->double_click)
+ snprintf(buf, sizeof(buf), "mouse,down,%i,double", ev->button);
+ else
+ snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
+ }
+ else
+ snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
+ }
+ else
#endif
snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
_edje_ref(ed);
+ _edje_freeze(ed);
+ _edje_emit(ed, buf, rp->part->name);
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
if (rp->drag.down.count == 0)
@@ -84,8 +106,6 @@
rp->clicked_button = ev->button;
rp->still_in = 1;
}
- _edje_freeze(ed);
- _edje_emit(ed, buf, rp->part->name);
_edje_recalc(ed);
_edje_thaw(ed);
_edje_unref(ed);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- edje_private.h 2 Nov 2004 17:31:56 -0000 1.78
+++ edje_private.h 7 Dec 2004 13:31:15 -0000 1.79
@@ -7,9 +7,12 @@
#include <Evas.h>
#include <Ecore.h>
-#ifdef HAVE_ECORE_X_H
+#ifdef HAVE_ECORE_X
#include <Ecore_X.h>
#endif
+#ifdef HAVE_ECORE_FB
+#include <Ecore_Fb.h>
+#endif
#include <Eet.h>
#include <Embryo.h>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
