diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2011-09-02 01:16:26 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2011-09-02 01:16:26 +0200 |
| commit | 1ad98d67facecc172300a0627ce532f88a7073fc (patch) | |
| tree | 3c4a0750a5c4115cddecfb40bcd41a98010ecfef /lib/efl/ffi.rb | |
| parent | 7e329c15fe8f339177a7ff2b3ee3af734898b0e5 (diff) | |
| download | ffi-efl-1ad98d67facecc172300a0627ce532f88a7073fc.zip ffi-efl-1ad98d67facecc172300a0627ce532f88a7073fc.tar.gz | |
Efl::Native swallows Efl::FFIHelper module
Diffstat (limited to 'lib/efl/ffi.rb')
| -rw-r--r-- | lib/efl/ffi.rb | 109 |
1 files changed, 47 insertions, 62 deletions
diff --git a/lib/efl/ffi.rb b/lib/efl/ffi.rb index 6aff583..422f173 100644 --- a/lib/efl/ffi.rb +++ b/lib/efl/ffi.rb @@ -6,21 +6,45 @@ require 'ffi' module Efl # module Native - class VersionStruct < FFI::Struct - layout :major, :int, - :minor, :int, - :micro, :int, - :revision, :int - - def full - [:major,:minor,:micro,:revision].collect { |e| self[e].to_s }.join '.' - end - end - end - # - module FFIHelper # - def attach_fcts fcts + extend FFI::Library + # + typedef :pointer, :char_p + typedef :pointer, :short_p + typedef :pointer, :int_p + typedef :pointer, :long_p + typedef :pointer, :float_p + typedef :pointer, :double_p + typedef :pointer, :uchar_p + typedef :pointer, :ushort_p + typedef :pointer, :uint_p + typedef :pointer, :ulong_p + typedef :pointer, :ufloat_p + typedef :pointer, :udouble_p + typedef :pointer, :void_p + typedef :pointer, :string_array + typedef :pointer, :string_array_p + typedef :uint_p, :uintptr_t + # + typedef :bool, :eina_bool + typedef :pointer, :eina_bool_p + typedef :pointer, :eina_list_p + typedef :pointer, :eina_hash_p + typedef :pointer, :eina_iterator_p + typedef :pointer, :eina_accessor_p + typedef :pointer, :evas_p + typedef :pointer, :evas_object_p + typedef :pointer, :evas_object_pp + typedef :pointer, :evas_gl_api_p + typedef :pointer, :ecore_getopt_p + typedef :pointer, :ecore_getopt_desc_p + typedef :pointer, :ecore_getopt_value_p + # + callback :eina_compare_cb, [ :void_p, :void_p ], :int + callback :eina_each_cb, [ :void_p, :void_p, :void_p ], :eina_bool + callback :eina_free_cb, [ :void_p ], :void + # + def self.attach_fcts fcts fcts.each do |func| begin attach_function(*func) @@ -30,55 +54,16 @@ module Efl end end # - def ffi_typedefs - @ffi_typedefs - end - # - def steal_ffitype mod, sym - typedef mod.ffi_typedefs[sym], sym - end - # - def self.extended mod - # - mod.extend FFI::Library - # - mod.typedef :pointer, :char_p - mod.typedef :pointer, :short_p - mod.typedef :pointer, :int_p - mod.typedef :pointer, :long_p - mod.typedef :pointer, :float_p - mod.typedef :pointer, :double_p - mod.typedef :pointer, :uchar_p - mod.typedef :pointer, :ushort_p - mod.typedef :pointer, :uint_p - mod.typedef :pointer, :ulong_p - mod.typedef :pointer, :ufloat_p - mod.typedef :pointer, :udouble_p - mod.typedef :pointer, :void_p - mod.typedef :pointer, :string_array - mod.typedef :pointer, :string_array_p - mod.typedef :uint_p, :uintptr_t - # - mod.typedef :bool, :eina_bool - mod.typedef :pointer, :eina_bool_p - mod.typedef :pointer, :eina_list_p - mod.typedef :pointer, :eina_hash_p - mod.typedef :pointer, :eina_iterator_p - mod.typedef :pointer, :eina_accessor_p - mod.typedef :pointer, :evas_p - mod.typedef :pointer, :evas_object_p - mod.typedef :pointer, :evas_object_pp - mod.typedef :pointer, :evas_gl_api_p - mod.typedef :pointer, :ecore_getopt_p - mod.typedef :pointer, :ecore_getopt_desc_p - mod.typedef :pointer, :ecore_getopt_value_p - # - mod.callback :eina_compare_cb, [ :void_p, :void_p ], :int - mod.callback :eina_each_cb, [ :void_p, :void_p, :void_p ], :eina_bool - mod.callback :eina_free_cb, [ :void_p ], :void - # + class VersionStruct < FFI::Struct + layout :major, :int, + :minor, :int, + :micro, :int, + :revision, :int + + def full + [:major,:minor,:micro,:revision].collect { |e| self[e].to_s }.join '.' + end end - # end # module ModuleHelper |