From fdf076d4f01a2562fbd46dd8bf7f2fa48458d930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 18 Aug 2011 10:59:58 +0200 Subject: Update ecore, eina, evas native API --- lib/efl/native/ecore.rb | 8 ++++++-- lib/efl/native/eina.rb | 2 ++ lib/efl/native/evas.rb | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/efl/native/ecore.rb b/lib/efl/native/ecore.rb index 608a706..80859e0 100644 --- a/lib/efl/native/ecore.rb +++ b/lib/efl/native/ecore.rb @@ -184,8 +184,12 @@ module Efl [ :ecore_main_loop_quit, [ ], :void ], # EAPI void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data); [ :ecore_main_loop_thread_safe_call_async, [ :ecore_cb, :void_p ], :void ], - # EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Cb callback, void *data); - [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_cb, :void_p ], :void_p ], + # EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data); + [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_data_cb, :void_p ], :void_p ], + # EAPI Eina_Bool ecore_thread_main_loop_begin(void); + [ :ecore_thread_main_loop_begin, [ ], :eina_bool ], + # EAPI void ecore_thread_main_loop_end(void); + [ :ecore_thread_main_loop_end, [ ], :void ], # EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data); [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :void_p ], :ecore_event_handler_p ], # EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler); diff --git a/lib/efl/native/eina.rb b/lib/efl/native/eina.rb index 179c42d..70015b6 100644 --- a/lib/efl/native/eina.rb +++ b/lib/efl/native/eina.rb @@ -48,6 +48,8 @@ module Efl [ :eina_threads_shutdown, [ ], :int ], # EAPI Eina_Bool eina_main_loop_is(void); [ :eina_main_loop_is, [ ], :eina_bool ], + # EAPI void eina_main_loop_define(void); + [ :eina_main_loop_define, [ ], :void ], ] # attach_fcts fcts diff --git a/lib/efl/native/evas.rb b/lib/efl/native/evas.rb index 1b4a7c1..c65177f 100644 --- a/lib/efl/native/evas.rb +++ b/lib/efl/native/evas.rb @@ -92,6 +92,8 @@ module Efl # typedef struct _Evas_Version Evas_Version; typedef :pointer, :evas_version typedef :pointer, :evas_version_p + # typedef short Evas_Callback_Priority; + typedef :short, :evas_callback_priority # typedef struct _Evas_Coord_Rectangle Evas_Coord_Rectangle; typedef :pointer, :evas_coord_rectangle # typedef struct _Evas_Point Evas_Point; @@ -348,6 +350,8 @@ module Efl [ :evas_sync, [ :evas_p ], :void ], # EAPI void evas_event_callback_add (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data); [ :evas_event_callback_add, [ :evas_p, :evas_callback_type, :evas_event_cb, :void_p ], :void ], + # EAPI void evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data); + [ :evas_event_callback_priority_add, [ :evas_p, :evas_callback_type, :short, :evas_event_cb, :void_p ], :void ], # EAPI void *evas_event_callback_del (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func); [ :evas_event_callback_del, [ :evas_p, :evas_callback_type, :evas_event_cb ], :void_p ], # EAPI void *evas_event_callback_del_full (Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data); @@ -488,6 +492,8 @@ module Efl [ :evas_object_below_get, [ :evas_object_p ], :evas_object_p ], # EAPI void evas_object_event_callback_add (Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data); [ :evas_object_event_callback_add, [ :evas_object_p, :evas_callback_type, :evas_object_event_cb, :void_p ], :void ], + # EAPI void evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data); + [ :evas_object_event_callback_priority_add, [ :evas_object_p, :evas_callback_type, :short, :evas_object_event_cb, :void_p ], :void ], # EAPI void *evas_object_event_callback_del (Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func); [ :evas_object_event_callback_del, [ :evas_object_p, :evas_callback_type, :evas_object_event_cb ], :void_p ], # EAPI void *evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data); @@ -1090,6 +1096,8 @@ module Efl [ :evas_object_smart_data_set, [ :evas_object_p, :void_p ], :void ], # EAPI void evas_object_smart_callback_add (Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data); [ :evas_object_smart_callback_add, [ :evas_object_p, :string, :evas_smart_cb, :void_p ], :void ], + # EAPI void evas_object_smart_callback_priority_add(Evas_Object *obj, const char *event, Evas_Callback_Priority priority, Evas_Smart_Cb func, const void *data); + [ :evas_object_smart_callback_priority_add, [ :evas_object_p, :string, :short, :evas_smart_cb, :void_p ], :void ], # EAPI void *evas_object_smart_callback_del (Evas_Object *obj, const char *event, Evas_Smart_Cb func); [ :evas_object_smart_callback_del, [ :evas_object_p, :string, :evas_smart_cb ], :void_p ], # EAPI void evas_object_smart_callback_call (Evas_Object *obj, const char *event, void *event_info); -- cgit v1.1-2-g2b99