ffi-efl 0.0.3 → 0.0.4

data/Changelog

@@ -1,3 +1,15 @@
+2011-05-XX Jérémy Zurcher <jeremy@asynk.ch>
+	* release 0.0.4
+	* ruby 1.8.7 compatible
+	* FFI::AutoPointer usage fixed, constructors cleaned
+	* module Efl::Native used for all FFI => require 'efl/native'
+	* ClassHelper#method_missing enhanced
+	* REinaList and REinaHash cleaned
+	* EcoreEvas specs completed 
+	* REvas and REvasObject spec completed
+	* REvasRectanlge, REvasLine, EvasPolygon classes added
+	* more test/*.rb
+
 2011-05-01 Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.0.3
 	+ Evas, Evas_Ecore, Edje, Elm ... usable

data/Rakefile

@@ -44,7 +44,7 @@ PROJ.spec.opts << '--color'
 PROJ.rcov.opts << '-I lib'
 #
 # Dependencies
-depend_on 'rake', '>=0.8.7'
+depend_on 'ffi', '>=1.0.7'
 #
 task :default  => [:spec]
 #

data/lib/efl/ecore.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/ecore'
+require 'efl/native/ecore'
 #
 module Efl
     module Ecore
@@ -17,13 +17,24 @@ module Efl
         #
         class REcorePipe
             def initialize cb, data
-                @ptr = Efl::Ecore.ecore_pipe_add cb, data
+                @ptr = FFI::AutoPointer.new Native.ecore_pipe_add(cb, data), REcorePipe.method(:release)
+            end
+            def self.release p
+                Native.ecore_pipe_del p
+            end
+            def del
+                @ptr.autorelease=false
+                REcorePipe.release @ptr
+                @ptr=nil
+            end
+            def read_close
+                Native.ecore_pipe_read_close @ptr
+            end
+            def write_close
+                Native.ecore_pipe_write_close @ptr
             end
-            def del; Efl::Ecore.ecore_pipe_del @ptr; end
-            def read_close; Efl::Ecore.ecore_pipe_read_close @ptr; end
-            def write_close; Efl::Ecore.ecore_pipe_write_close @ptr; end
             def write data
-                Efl::Ecore.ecore_pipe_write @ptr, FFI::MemoryPointer.from_string(data.to_s), data.to_s.length+1
+                Native.ecore_pipe_write @ptr, FFI::MemoryPointer.from_string(data.to_s), data.to_s.length+1
             end
             #
         end

data/lib/efl/ecore_evas.rb

@@ -1,49 +1,102 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/ecore_evas'
+require 'efl/native/ecore_evas'
 #
 module Efl
     #
     module EcoreEvas
+        #
+        def self.ecore_evas_list
+            EinaList::REinaList.new Native.ecore_evas_ecore_evas_list_get
+        end
+        def self.engines_list
+            EinaList::REinaList.new Native.ecore_evas_engines_get
+        end
         #
         class REcoreEvas
             include Efl::ClassHelper
-            proxy_list [Efl::EcoreEvas,'ecore_evas_'].freeze
-            def initialize o=nil, &block
+            search_prefixes 'ecore_evas_'
+            def initialize o=nil
                 @ptr = (
                     case o
                     when NilClass
-                        FFI::AutoPointer.new Efl::EcoreEvas.ecore_evas_new(nil, 0, 0, 0, 0, nil), method(:free)
-                    when self.class
-                        o.to_ptr
-                    when FFI::AutoPointer
-                        o
+                        FFI::AutoPointer.new Native.ecore_evas_new(nil, 0, 0, 0, 0, nil), REcoreEvas.method(:release)
+                    when Hash
+                        FFI::AutoPointer.new Native.ecore_evas_new(o[:engine_name], o[:x], o[:y], o[:w], o[:h], o[:extra_options]), REcoreEvas.method(:release)
                     when FFI::Pointer
-                        FFI::AutoPointer.new o, method(:free)
+                        o
                     else
                         raise ArgumentError.new "wrong argument #{o.class.name}"
                     end
                 )
                 yield self if block_given?
             end
+            def self.release p
+                Native.ecore_evas_free p unless p.nil?
+            end
             def free p=nil
-                return Efl::EcoreEvas.ecore_evas_free p unless p.nil?
-                Efl::EcoreEvas.ecore_evas_free @ptr
-                @ptr.free
+                @ptr.autorelease=false
+                REcoreEvas.release @ptr
                 @ptr=nil
             end
-            def get
+            def geometry_get
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                w = FFI::MemoryPointer.new :int
+                h = FFI::MemoryPointer.new :int
+                Native.ecore_evas_geometry_get @ptr, x, y, w, h
+                [ x.read_int, y.read_int, w.read_int, h.read_int ]
+            end
+            alias :geometry :geometry_get
+            def size
+                geometry_get[2..-1]
+            end
+            def size= wh
+                Native.evas_object_resize @ptr, *wh
+            end
+            def name_class_get
+                n = FFI::MemoryPointer.new :pointer
+                c = FFI::MemoryPointer.new :pointer
+                Native.ecore_evas_name_class_get @ptr, n, c
+                [ n.read_pointer.read_string, c.read_pointer.read_string ]
+            end
+            def size_min_get
+                w = FFI::MemoryPointer.new :int
+                h = FFI::MemoryPointer.new :int
+                Native.ecore_evas_size_min_get @ptr, w, h
+                [ w.read_int, h.read_int ]
+            end
+            def size_max_get
+                w = FFI::MemoryPointer.new :int
+                h = FFI::MemoryPointer.new :int
+                Native.ecore_evas_size_max_get @ptr, w, h
+                [ w.read_int, h.read_int ]
+            end
+            def size_base_get
+                w = FFI::MemoryPointer.new :int
+                h = FFI::MemoryPointer.new :int
+                Native.ecore_evas_size_base_get @ptr, w, h
+                [ w.read_int, h.read_int ]
+            end
+            def size_step_get
+                w = FFI::MemoryPointer.new :int
+                h = FFI::MemoryPointer.new :int
+                Native.ecore_evas_size_step_get @ptr, w, h
+                [ w.read_int, h.read_int ]
+            end
+            def evas
                 # EAPI Evas *ecore_evas_get(const Ecore_Evas *ee);
-                Efl::Evas::REvas.new Efl::EcoreEvas.ecore_evas_get @ptr
+                Evas::REvas.new Native.ecore_evas_get @ptr
             end
+            alias :get :evas
             def object_image_new
                 # EAPI Evas_Object *ecore_evas_object_image_new(Ecore_Evas *ee_target);
-                Efl::Evas::REvasObject.new Efl::EcoreEvas.ecore_evas_object_image_new @prt
+                Evas::REvasObject.new Native.ecore_evas_object_image_new @prt
             end
             def object_associate_get
                 # EAPI Evas_Object *ecore_evas_object_associate_get(const Ecore_Evas *ee);
-                Efl::Evas::REvasObject.new Efl::EcoreEvas.ecore_evas_object_associate_get @prt
+                Evas::REvasObject.new Native.ecore_evas_object_associate_get @prt
             end
             #
         end
@@ -55,23 +108,24 @@ module Efl
         class REvas
             def ecore_evas_get
                 # EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e);
-                Efl::EcoreEvas::REcoreEvas.new Efl::EcoreEvas.ecore_evas_ecore_evas_get @ptr
+                EcoreEvas::REcoreEvas.new Native.ecore_evas_ecore_evas_get @ptr
             end
         end
         #
         class REvasObject
             def ecore_evas_get
                 # EAPI Ecore_Evas *ecore_evas_object_ecore_evas_get(Evas_Object *obj);
-                Efl::EcoreEvas::REcoreEvas.new Efl::EcoreEvas.ecore_evas_object_ecore_evas_get @ptr
-            end
-            def evas_get
-                # EAPI Evas *ecore_evas_object_evas_get(Evas_Object *obj);
-                Efl::Evas::REvas.new Efl::EcoreEvas.ecore_evas_object_evas_get @ptr
+                EcoreEvas::REcoreEvas.new Native.ecore_evas_object_ecore_evas_get @ptr
             end
+            alias :ecore_evas :ecore_evas_get
+            # FIXME override REvas#evas_get => evas_object_evas_get
+#            def evas_get
+#                # EAPI Evas *ecore_evas_object_evas_get(Evas_Object *obj);
+#                Evas::REvas.new Efl::EcoreEvas.ecore_evas_object_evas_get @ptr
+#            end
+#            alias :evas :evas_get
         end
     end
-    # TODO
-    #EAPI unsigned char ecore_getopt_callback_ecore_evas_list_engines(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
     #
 end
 #

data/lib/efl/ecore_getopt.rb

@@ -1,13 +1,13 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/ecore_getopt'
+require 'efl/native/ecore_getopt'
 #
 module Efl
     #
-    module EcoreGetopt
+    module Native
         #
-        class Value < FFI::Union
+        class EcoreGetoptValue < FFI::Union
             layout  :strp,          :pointer,
                     :boolp,         :eina_bool_p,
                     :shortp,        :short_p,
@@ -18,10 +18,10 @@ module Efl
                     :ulongp,        :ulong_p,
                     :doublep,       :double_p,
                     :listp,         :eina_list_p,
-                    :ptrp,          :void_p,
+                    :ptrp,          :void_p
         end
         #
-        class DescStoreDef < FFI::Union
+        class EcoreGetoptDescStoreDef < FFI::Union
             layout  :strv,          :pointer,
                     :boolv,         :uchar,
                     :shortv,        :short,
@@ -30,40 +30,40 @@ module Efl
                     :ushortv,       :ushort,
                     :uintv,         :uint,
                     :ulongv,        :ulong,
-                    :doublev,       :double,
+                    :doublev,       :double
         end
         #
-        class DescStore < FFI::Struct
+        class EcoreGetoptDescStore < FFI::Struct
             layout  :type,          :ecore_getopt_type,                 # enum
                     :arg_req,       :ecore_getopt_desc_arg_requirement, # enum
-                    :def,           DescStoreDef,
+                    :def,           EcoreGetoptDescStoreDef
         end
         #
         callback :ecore_getopt_desc_cb, [:ecore_getopt_p, :ecore_getopt_desc_p, :string, :pointer, :ecore_getopt_value_p ], :eina_bool
         #
-        class DescCallback < FFI::Struct
+        class EcoreGetoptDescCallback < FFI::Struct
             layout  :func,          :ecore_getopt_desc_cb,
                     :data,          :pointer,
                     :arg_req,       :ecore_getopt_desc_arg_requirement, # enum
-                    :def,           :pointer,
+                    :def,           :pointer
         end
         #
-        class ActionParam < FFI::Union
-            layout  :store,         DescStore,
+        class EcoreGetoptActionParam < FFI::Union
+            layout  :store,         EcoreGetoptDescStore,
                     :store_const,   :pointer,
                     :choices,       :pointer,
                     :append_type,   :ecore_getopt_type,                 # enum
-                    :callback,      DescCallback,
-                    :dummy,         :pointer,
+                    :callback,      EcoreGetoptDescCallback,
+                    :dummy,         :pointer
         end
         #
-        class Desc < FFI::Struct
+        class EcoreGetoptDesc < FFI::Struct
             layout  :shortname,     :char,
                     :longname,      :pointer,
                     :help,          :pointer,
                     :metavar,       :pointer,
                     :action,        :ecore_getopt_action,               # enum
-                    :action_param,  ActionParam,
+                    :action_param,  EcoreGetoptActionParam
         end
         #
         class EcoreGetopt < FFI::Struct
@@ -74,12 +74,15 @@ module Efl
                     :license,       :pointer,
                     :description,   :pointer,
                     :strict,        :char
-#                    :descs,         :pointer,   # NULL terminated  EcoreGetopt_Desc[]
+#                        :descs,         :pointer,   # NULL terminated  EcoreGetopt_Desc[]
 
             def desc_ptr idx
-                Efl::EcoreGetopt::Desc.new to_ptr+Efl::EcoreGetopt::EcoreGetopt.size+(idx*Efl::EcoreGetopt::Desc.size)
+                Native::EcoreGetoptDesc.new to_ptr+Native::EcoreGetopt.size+(idx*Native::EcoreGetoptDesc.size)
             end
         end
+    end
+    #
+    module EcoreGetopt
         #
         class REcoreGetopt
             def initialize desc
@@ -99,6 +102,7 @@ module Efl
                 @refs << p
                 p
             end
+            private :p_from_string
             def << o
                 @options.insert -2, o
             end
@@ -109,14 +113,14 @@ module Efl
                 @ecore_getopt.to_ptr
             end
             def create
-                @ecore_getopt = Efl::EcoreGetopt::EcoreGetopt.new FFI::MemoryPointer.new (Efl::EcoreGetopt::EcoreGetopt.size+Efl::EcoreGetopt::Desc.size*@options.length), 1
+                @ecore_getopt = Native::EcoreGetopt.new( FFI::MemoryPointer.new( :uchar, Native::EcoreGetopt.size+Native::EcoreGetoptDesc.size*@options.length) )
                 [:prog,:usage,:version,:copyright,:license,:description].each do |sym|
                     @ecore_getopt[sym] = ( @desc.has_key?(sym) ? FFI::MemoryPointer.from_string(@desc[sym]) : FFI::Pointer::NULL )
                 end
                 @ecore_getopt[:strict] = @desc[:strict] if @desc.has_key? :strict
                 @options.each_with_index do |o,i|
                     d = @ecore_getopt.desc_ptr i
-                    d[:shortname] = o[0].ord
+                    d[:shortname] = o[0].to_s.bytes.first
                     d[:longname] = p_from_string o[1]
                     d[:help] = p_from_string o[2]
                     d[:metavar] = o[3]
@@ -152,9 +156,9 @@ module Efl
                         d[:action_param][:dummy] = FFI::Pointer::NULL
                     end
                 end
-                @values_p = FFI::MemoryPointer.new Efl::EcoreGetopt::Value, @values.length, false
+                @values_p = FFI::MemoryPointer.new Native::EcoreGetoptValue, @values.length, false
                 @values.each_with_index do |v,i|
-                    Efl::EcoreGetopt::Value.new(@values_p+(i*Efl::EcoreGetopt::Value.size))[v[0]] = v[1]
+                    Native::EcoreGetoptValue.new(@values_p+(i*Native::EcoreGetoptValue.size))[v[0]] = v[1]
                 end
             end
             def parse argv
@@ -163,7 +167,7 @@ module Efl
                     ptr[i].put_pointer 0, p_from_string(s)
                 end
                 ptr[argv.length].put_pointer 0, FFI::Pointer::NULL
-                Efl::EcoreGetopt.ecore_getopt_parse @ecore_getopt, @values_p, argv.length, ptr
+                Native.ecore_getopt_parse @ecore_getopt, @values_p, argv.length, ptr
             end
             def store_full short, long, help, meta, type, arg_req, def_val
                 self << [ short, long, help, meta, :ecore_getopt_action_store, [:store, [type,arg_req, def_val] ] ]

data/lib/efl/ecore_input.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/ecore_input'
+require 'efl/native/ecore_input'
 #
 module Efl
     #

data/lib/efl/edje.rb

@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 #
 require 'efl/evas'
-require 'efl/ffi/edje'
+require 'efl/native/edje'
 #
 module Efl
     #
@@ -10,34 +10,34 @@ module Efl
         #
         class REdje < Efl::Evas::REvasObject
             #
-            proxy_list [Efl::Edje,'edje_object_'].freeze
+            search_prefixes 'edje_object_'
             def part_object_get part
                 # EAPI const Evas_Object *edje_object_part_object_get (const Evas_Object *obj, const char *part);
-                Efl::Evas::RevasObject.new Efl::Edje.edje_object_part_object_get @ptr, part
+                Evas::RevasObject.new Native.edje_object_part_object_get @ptr, part
             end
             def part_swallow_get part
                 # EAPI Evas_Object *edje_object_part_swallow_get (const Evas_Object *obj, const char *part);
-                Efl::Evas::RevasObject.new Efl::Edje.edje_object_part_swallow_get @ptr, part
+                Evas::RevasObject.new Native.edje_object_part_swallow_get @ptr, part
             end
             def external_object_get part
                 # EAPI Evas_Object *edje_object_part_external_object_get (const Evas_Object *obj, const char *part);
-                Efl::Evas::RevasObject.new Efl::Edje.edje_object_part_external_object_get @ptr, part
+                Evas::RevasObject.new Native.edje_object_part_external_object_get @ptr, part
             end
             def external_content_get part, content
                 # EAPI Evas_Object *edje_object_part_external_content_get (const Evas_Object *obj, const char *part, const char *content);
-                Efl::Evas::RevasObject.new Efl::Edje.edje_object_part_external_content_get @ptr, part, content
+                Evas::RevasObject.new Native.edje_object_part_external_content_get @ptr, part, content
             end
             def part_box_remove part, child
                 # EAPI Evas_Object *edje_object_part_box_remove (Evas_Object *obj, const char *part, Evas_Object *child);
-                Efl::Evas::RevasObject.new Efl::Edje.edje_object_part_box_remove @ptr, part, child
+                Evas::RevasObject.new Native.edje_object_part_box_remove @ptr, part, child
             end
             def part_box_remove_at part, pos
                 # EAPI Evas_Object *edje_object_part_box_remove_at (Evas_Object *obj, const char *part, unsigned int pos);
-                Efl::Evas::RevasObject.new Efl::Edje.edje_object_part_box_remove_at @ptr, part, pos
+                Evas::RevasObject.new Native.edje_object_part_box_remove_at @ptr, part, pos
             end
-            def part_child_get part, col, row
+            def part_table_child_get part, col, row
                 # EAPI Evas_Object *edje_object_part_table_child_get (Evas_Object *obj, const char *part, unsigned int col, unsigned int row);
-                Efl::Evas::RevasObject.new Efl::Edje.edje_object_part_child_get @ptr, part, col, row
+                Evas::RevasObject.new Native.edje_object_part_table_child_get @ptr, part, col, row
             end
         end
         #
@@ -48,7 +48,7 @@ module Efl
         class REvas
             def edje_object_add
                 # EAPI Evas_Object *edje_object_add (Evas *evas);
-                Efl::Edje::REdje.new Efl::Edje.edje_object_add @ptr
+                Edje::REdje.new Native.edje_object_add @ptr
             end
         end
         #

data/lib/efl/eet.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/eet'
+require 'efl/native/eet'
 #
 module Efl
     #
@@ -10,32 +10,38 @@ module Efl
         class REetFile
             #
             include Efl::ClassHelper
-            proxy_list [Efl::Eet,'eet_'].freeze
+            search_prefixes 'eet_'
             #
             def initialize ptr
                 @ptr=ptr
             end
             private :initialize
             #
-            def self.open path, mode=:eet_file_mode_read, &blk
-                if blk
-                    f = Efl::Eet.eet_open path, mode
-                    raise Exception.new "Unable to open file #{path}" if f.nil?
-                    yield REetFile.new f
-                    Efl::Eet.eet_close f
-                else
-                    f = Efl::Eet.eet_open path, mode
-                    return REetFile.new f unless f.nil?
-                end
+            def self.open path, mode=:eet_file_mode_read
+                p = Native.eet_open path, mode
+                raise Exception.new "Unable to open file #{path}" if p.nil?
+                o = REetFile.new FFI::AutoPointer.new p, REetFile.method(:release)
+                return o if not block_given?
+                yield o
+                o.close
+                nil
+            end
+            def self.release p
+                Native.eet_close f
+            end
+            def close
+                @ptr.autorelease=false
+                Native.eet_close @ptr
+                @ptr = nil
             end
             #
             def write key, data, compress=false
-                Efl::Eet.eet_write @ptr, key, FFI::MemoryPointer.from_string(data), data.bytesize, ( compress ? 1 : 0 )
+                Native.eet_write @ptr, key, data, data.bytesize, ( compress ? 1 : 0 )
             end
             #
             def read key
                 ptr = FFI::MemoryPointer.new(:int)
-                data = Efl::Eet.eet_read @ptr, key, ptr
+                data = Native.eet_read @ptr, key, ptr
                 s = ptr.read_int
                 ptr.free
                 return nil if s==0

data/lib/efl/eina.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/eina'
+require 'efl/native/eina'
 #
 module Efl
     #

data/lib/efl/eina_hash.rb

@@ -1,56 +1,43 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/eina_hash'
+require 'efl/native/eina_hash'
 #
-class Hash
-    def self.from_eina_hash o
-        if o.is_a? Efl::EinaHash::REinaHash
-            o.to_h
-        elsif o.is_a? FFI::Pointer
-            Efl::EinaHash::REinaHash.new(o).to_h
-        else
-            raise ArgumentError.new " wrong argument #{o.class.name}"
-        end
-    end
-end
 module Efl
     module EinaHash
         #
         class REinaHash
             include Enumerable
             include Efl::ClassHelper
-            proxy_list [Efl::EinaHash,'eina_hash_'].freeze
+            search_prefixes 'eina_hash_'
             def initialize o=nil, &block
-                cstr = ( block_given? ? block : Proc.new { Efl::EinaHash.eina_hash_string_djb2_new FFI::Pointer::NULL } )
+                cstr = ( block_given? ? block : Proc.new { Native.eina_hash_string_djb2_new FFI::Pointer::NULL } )
                 @ptr = (
                     case o
                     when NilClass
-                        FFI::AutoPointer.new cstr.call, method(:free)
-                    when self.class
-                        o.to_ptr
-                    when FFI::AutoPointer
-                        o
+                        FFI::AutoPointer.new cstr.call, REinaHash.method(:release)
                     when FFI::Pointer
-                        FFI::AutoPointer.new ( o==FFI::Pointer::NULL ? cstr.call : o ), method(:free)
+                        FFI::AutoPointer.new( (o==FFI::Pointer::NULL ? cstr.call : o), REinaHash.method(:release))
                     when Hash
                         ptr = cstr.call
-                        o.each do |k,v| Efl::EinaHash.eina_hash_add ptr, k, v end
-                        FFI::AutoPointer.new ptr, method(:free)
+                        o.each do |k,v| Native.eina_hash_add ptr, k, v end
+                        FFI::AutoPointer.new ptr, REinaHash.method(:release)
                     else
                         raise ArgumentError.new "wrong argument #{o.class.name}"
                     end
                 )
             end
-            def free p=nil
-                return Efl::EinaHash.eina_hash_free p unless p.nil?
-                Efl::EinaHash.eina_hash_free @ptr
-                @ptr.free
-                @ptr = nil
+            def self.release p
+                Native.eina_hash_free p
+            end
+            def del
+                @ptr.autorelease=false
+                EinaHash.release @ptr
+                @ptr=nil
             end
             def each data=FFI::Pointer::NULL, &block
                 return if not block_given?
-                Efl::EinaHash::eina_hash_foreach @ptr, Proc.new{|h,k,v,d| block.call(k,v) }, data
+                Native.eina_hash_foreach @ptr, Proc.new{|h,k,v,d| block.call(k,v) }, data
             end
             def to_h
                  rh = {}
@@ -68,12 +55,12 @@ module Efl
             end
             # for fun and tests
             def add k, v
-                Efl::EinaHash.eina_hash_add @ptr, k, v
+                Native.eina_hash_add @ptr, k, v
                 v
             end
             alias :[]= :add
             def find k
-                r = Efl::EinaHash.eina_hash_find @ptr, k
+                r = Native.eina_hash_find @ptr, k
                 return ( r==FFI::Pointer::NULL ? nil : r )
             end
             alias :[] :find