update efl/evas* and specs

1 files changed, 63 insertions, 61 deletions

diff --git a/lib/efl/evas.rb b/lib/efl/evas.rb
index c4dcbb7..22db560 100644
--- a/lib/efl/evas.rb
+++ b/lib/efl/evas.rb
@@ -4,7 +4,8 @@
 require 'efl/ffi/evas'
 #
 module Efl
-    module FFI
+    #
+    module Evas
         #
         EVAS_ENGINE_BUFFER_DEPTH_ARGB32 = 0
         EVAS_ENGINE_BUFFER_DEPTH_BGRA32 = 1
@@ -12,16 +13,17 @@ module Efl
         EVAS_ENGINE_BUFFER_DEPTH_BGR24  = 3
         EVAS_ENGINE_BUFFER_DEPTH_RGB32  = 4
         #
-        class EvasEngineInfo < ::FFI::Struct
-            layout  :magic,         :int
-        end
         callback :new_update_region_cb, [:int, :int, :int, :int, :int_p], :pointer
         callback :free_update_region_cb, [:int, :int, :int, :int, :pointer], :void
-        class EvasEngineInfoBufferFunc < ::FFI::Struct
+        #
+        class EngineInfoStruct < FFI::Struct
+            layout  :magic,                 :int
+        end
+        class EngineInfoBufferFuncStruct < FFI::Struct
             layout  :new_update_region,     :new_update_region_cb,
                     :free_update_region,    :free_update_region_cb
         end
-        class EvasEngineInfoBufferInfo < ::FFI::Struct
+        class EngineInfoBufferInfoStruct < FFI::Struct
             layout  :depth_type,            :int,
                     :dest_buffer,           :pointer,
                     :dest_buffer_row_bytes, :int,
@@ -30,112 +32,112 @@ module Efl
                     :color_key_r,           :int,
                     :color_key_g,           :int,
                     :color_key_b,           :int,
-                    :func,          EvasEngineInfoBufferFunc,
+                    :func,                  EngineInfoBufferFuncStruct,
         end
-        class EvasEngineInfoBuffer < ::FFI::Struct
-            layout  :magic,         EvasEngineInfo,
-                    :info,          EvasEngineInfoBufferInfo,
-#                    :func,          EvasEngineInfoBufferFunc,
-                    :mode,          :evas_engine_render_mode,
+        class EngineInfoBufferStruct < FFI::Struct
+            layout  :magic,                 EngineInfoStruct,
+                    :info,                  EngineInfoBufferInfoStruct,
+#                    :func,                  EvasEngineInfoBufferFunc,
+                    :mode,                  :evas_engine_render_mode,
         end
         #
-    end
-    #
-    module Evas
-        #
-        class Evas
-            include Efl::Helper
-            @func_prefixes = [ 'evas_' ].freeze
+        class REvas
+            #
+            include Efl::ClassHelper
+            @search_paths = [ [Efl::Evas,'evas_'] ].freeze
+            #
             def initialize o=nil
                 @ptr = (
                     case o
                     when NilClass
-                        ::FFI::AutoPointer.new Efl::FFI.evas_new, method(:free)
+                        FFI::AutoPointer.new Efl::Evas.evas_new, method(:free)
                     when self.class
-                        o.ptr
-                    when ::FFI::AutoPointer
+                        o.to_ptr
+                    when FFI::AutoPointer
                         o
-                    when ::FFI::Pointer
-                        ::FFI::AutoPointer.new o, method(:free)
+                    when FFI::Pointer
+                        FFI::AutoPointer.new o, method(:free)
                     else
-                        raise ArgumentError.new "#{ptr.class} valid argument"
+                        raise ArgumentError.new "#{o.class} valid argument"
                     end
                 )
                 yield self if block_given?
             end
             def free
-                Efl::FFI.evas_free @ptr
+                Efl::Evas.evas_free @ptr
                 @ptr=nil
             end
             def object_add t
-                Efl::Evas::EvasObject.new Efl::FFI.send "evas_object_#{t}_add", @ptr
+                Efl::Evas::REvasObject.new Efl::Evas.send "evas_object_#{t}_add", @ptr
             end
             def output_size_get
-                x = ::FFI::MemoryPointer.new :int
-                y = ::FFI::MemoryPointer.new :int
-                Efl::FFI.evas_output_size_get @ptr, x, y
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                Efl::Evas.evas_output_size_get @ptr, x, y
                 [ x.read_int, y.read_int ]
             end
             def output_viewport_get
-                x = ::FFI::MemoryPointer.new :int
-                y = ::FFI::MemoryPointer.new :int
-                w = ::FFI::MemoryPointer.new :int
-                h = ::FFI::MemoryPointer.new :int
-                Efl::FFI.evas_output_viewport_get @ptr, x, y, w, h
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                w = FFI::MemoryPointer.new :int
+                h = FFI::MemoryPointer.new :int
+                Efl::Evas.evas_output_viewport_get @ptr, x, y, w, h
                 [ x.read_int, y.read_int, w.read_int, h.read_int ]
             end
             def pointer_output_xy_get
-                x = ::FFI::MemoryPointer.new :int
-                y = ::FFI::MemoryPointer.new :int
-                Efl::FFI.evas_pointer_output_xy_get @ptr, x, y
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                Efl::Evas.evas_pointer_output_xy_get @ptr, x, y
                 [ x.read_int, y.read_int ]
             end
             def pointer_canvas_xy_get
-                x = ::FFI::MemoryPointer.new :int
-                y = ::FFI::MemoryPointer.new :int
-                Efl::FFI.evas_pointer_canvas_xy_get @ptr, x, y
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                Efl::Evas.evas_pointer_canvas_xy_get @ptr, x, y
                 [ x.read_int, y.read_int ]
             end
         end
         #
-        class EvasObject
-            include Efl::Helper
-            @func_prefixes = [ 'evas_object_', 'evas_' ].freeze
+        class REvasObject
+            #
+            include Efl::ClassHelper
+            @search_paths = [ [Efl::Evas,'evas_object_'],[Efl::Evas,'evas_'] ].freeze
+            #
             def initialize o=nil
                 @ptr = (
                     case o
                     when NilClass
-                        ::FFI::AutoPointer.new Efl::FFI.evas_new, method(:free)
+                        FFI::AutoPointer.new Efl::Evas.evas_new, method(:free)
                     when self.class
-                        o.ptr
-                    when ::FFI::AutoPointer
+                        o.to_ptr
+                    when FFI::AutoPointer
                         o
-                    when ::FFI::Pointer
-                        ::FFI::AutoPointer.new o, method(:free)
+                    when FFI::Pointer
+                        FFI::AutoPointer.new o, method(:free)
                     else
-                        raise ArgumentError.new "#{ptr.class} valid argument"
+                        raise ArgumentError.new "#{o.class} valid argument"
                     end
                 )
                 yield self if block_given?
             end
             def free
-                Efl::FFI.evas_object_del @ptr
+                Efl::Evas.evas_object_del @ptr
                 @ptr=nil
             end
             def geometry_get
-                x = ::FFI::MemoryPointer.new :int
-                y = ::FFI::MemoryPointer.new :int
-                w = ::FFI::MemoryPointer.new :int
-                h = ::FFI::MemoryPointer.new :int
-                Efl::FFI.evas_object_geometry_get @evas, x, y, w, h
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                w = FFI::MemoryPointer.new :int
+                h = FFI::MemoryPointer.new :int
+                Efl::Evas.evas_object_geometry_get @evas, x, y, w, h
                 [ x.read_int, y.read_int, w.read_int, h.read_int ]
             end
             def color_get
-                r = ::FFI::MemoryPointer.new :int
-                g = ::FFI::MemoryPointer.new :int
-                b = ::FFI::MemoryPointer.new :int
-                a = ::FFI::MemoryPointer.new :int
-                Efl::FFI.evas_object_color_get @evas, r, g, b, a
+                r = FFI::MemoryPointer.new :int
+                g = FFI::MemoryPointer.new :int
+                b = FFI::MemoryPointer.new :int
+                a = FFI::MemoryPointer.new :int
+                Efl::Evas.evas_object_color_get @evas, r, g, b, a
                 [ r.read_int, g.read_int, b.read_int, a.read_int ]
             end
         end