summaryrefslogtreecommitdiffstats
path: root/lib/e17
diff options
context:
space:
mode:
Diffstat (limited to 'lib/e17')
-rw-r--r--lib/e17/ecore.rb12
-rw-r--r--lib/e17/ecore/event.rb20
2 files changed, 19 insertions, 13 deletions
diff --git a/lib/e17/ecore.rb b/lib/e17/ecore.rb
index 95a6d04..7df5814 100644
--- a/lib/e17/ecore.rb
+++ b/lib/e17/ecore.rb
@@ -11,6 +11,8 @@ module E17
#
ffi_lib 'ecore'
#
+ typedef :pointer, :ecore_pipe
+ #
callback :ecore_pipe_cb, [:pointer, :pointer, :int], :void
callback :ecore_select_function, [:int, :pointer, :pointer, :pointer, :pointer], :int
callback :ecore_fd_prep_cb, [:pointer, :pointer], :void
@@ -19,11 +21,11 @@ module E17
# http://docs.enlightenment.org/auto/ecore/group__Ecore__Group.html
[ :ecore_init, [], :int],
[ :ecore_shutdown, [], :int],
- [ :ecore_pipe_add, [:ecore_pipe_cb, :pointer], :pointer],
- [ :ecore_pipe_del, [:pointer], :pointer],
- [ :ecore_pipe_read_close, [:pointer], :void],
- [ :ecore_pipe_write_close, [:pointer], :void],
- [ :ecore_pipe_write, [:pointer, :pointer, :int], :bool],
+ [ :ecore_pipe_add, [:ecore_pipe_cb, :pointer], :ecore_pipe],
+ [ :ecore_pipe_del, [:ecore_pipe], :pointer],
+ [ :ecore_pipe_read_close, [:ecore_pipe], :void],
+ [ :ecore_pipe_write_close, [:ecore_pipe], :void],
+ [ :ecore_pipe_write, [:ecore_pipe, :pointer, :int], :bool],
# http://docs.enlightenment.org/auto/ecore/group__Ecore__Main__Loop__Group.html
[ :ecore_main_loop_iterate, [], :void],
[ :ecore_main_loop_begin, [], :void],
diff --git a/lib/e17/ecore/event.rb b/lib/e17/ecore/event.rb
index 9465d16..56b5c69 100644
--- a/lib/e17/ecore/event.rb
+++ b/lib/e17/ecore/event.rb
@@ -20,6 +20,10 @@ module E17
EVENT_SIGNAL_REALTIME = 5 # Realtime signal event
EVENT_COUNT = 6
#
+ typedef :pointer, :ecore_event
+ typedef :pointer, :ecore_event_filter
+ typedef :pointer, :ecore_event_handler
+ #
callback :ecore_end_cb, [:pointer, :pointer], :void
callback :ecore_data_cb, [:pointer], :pointer
callback :ecore_filter_cb, [:pointer, :pointer, :int, :pointer], :bool
@@ -27,15 +31,15 @@ module E17
#
fcts = [
# http://docs.enlightenment.org/auto/ecore/group__Ecore__Event__Group.html
- [ :ecore_event_handler_add, [:int, :ecore_event_handler_cb, :pointer], :pointer],
- [ :ecore_event_handler_del, [:pointer], :pointer],
- [ :ecore_event_add, [:int, :pointer, :ecore_end_cb, :pointer], :pointer],
- [ :ecore_event_del, [:pointer], :pointer],
- [ :ecore_event_handler_data_get, [:pointer], :pointer],
- [ :ecore_event_handler_data_set, [:pointer,:pointer], :pointer],
+ [ :ecore_event_handler_add, [:int, :ecore_event_handler_cb, :pointer], :ecore_event_handler],
+ [ :ecore_event_handler_del, [:ecore_event_handler], :pointer],
+ [ :ecore_event_add, [:int, :pointer, :ecore_end_cb, :pointer], :ecore_event],
+ [ :ecore_event_del, [:ecore_event], :pointer],
+ [ :ecore_event_handler_data_get, [:ecore_event_handler], :pointer],
+ [ :ecore_event_handler_data_set, [:ecore_event_handler, :pointer], :pointer],
[ :ecore_event_type_new, [], :int],
- [ :ecore_event_filter_add, [:ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :pointer], :pointer],
- [ :ecore_event_filter_del, [:pointer], :pointer],
+ [ :ecore_event_filter_add, [:ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :pointer], :ecore_event_filter],
+ [ :ecore_event_filter_del, [:ecore_event_filter], :pointer],
[ :ecore_event_current_type_get, [], :int],
[ :ecore_event_current_event_get, [], :pointer],
]