ffi-efl 0.0.5 → 0.0.6

data/Changelog

@@ -1,3 +1,13 @@
+2011-05-11 Jérémy Zurcher <jeremy@asynk.ch>
+	* use ditz ass issure tracker
+	* use FFI.attach_variable for EAPI extern ...
+	* Efl::EinaLog module and specs
+	* quick add classes : ElmWin, ElmInWIn, ElmBg, ElmLayout, ElmBox, ElmList, ElmIcon, ElmNotify, ElmDiskSelector, ElmPager
+	* REinaList has #to_a and #to_ary
+	* add ClassHelper #null? #to_a #to_ary #to_s
+	* rework REvasObject#initialize
+	* rework ClassHelper#method_missing
+
 2011-05-06 Jérémy Zurcher <jeremy@asynk.ch>
 	* release 0.0.5
 	* add REvasText class + specs

data/Rakefile

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

data/lib/efl/ecore.rb

@@ -15,6 +15,10 @@ module Efl
         EVENT_SIGNAL_REALTIME = 5 # Realtime signal event
         EVENT_COUNT = 6
         #
+        def self.version
+            Native::VersionStruct.new(Native.ecore_version)
+        end
+        #
         class REcorePipe
             def initialize cb, data
                 @ptr = FFI::AutoPointer.new Native.ecore_pipe_add(cb, data), REcorePipe.method(:release)

data/lib/efl/ecore_getopt.rb

@@ -89,7 +89,7 @@ module Efl
                 @ecore_getopt = nil
                 @desc = desc
                 @options = [
-                    [ 0, FFI::Pointer::NULL, FFI::Pointer::NULL, FFI::Pointer::NULL, 0, {:dummy=>FFI::Pointer::NULL} ]
+                    [ 0 ],
                 ]
                 @values = [
                     [ :ptrp, FFI::Pointer::NULL ]
@@ -120,6 +120,10 @@ module Efl
                 @ecore_getopt[:strict] = @desc[:strict] if @desc.has_key? :strict
                 @options.each_with_index do |o,i|
                     d = @ecore_getopt.desc_ptr i
+                    if o[0]==0
+                        d[:shortname] = d[:longname] = d[:help] = d[:metavar] = d[:action] = d[:action_param][:dummy] = 0
+                        break
+                    end
                     d[:shortname] = o[0].to_s.bytes.first
                     d[:longname] = p_from_string o[1]
                     d[:help] = p_from_string o[2]
@@ -228,12 +232,12 @@ module Efl
                 self << [ short, long, help, FFI::Pointer::NULL, :ecore_getopt_action_count, [:dummy,FFI::Pointer::NULL] ]
             end
             def callback_full short, long, help, meta, cb, data, arg_req, def_val
-                self << [ short, long, help, meta, :ecore_getopt_action_callback, [:callback, [cb, data, arg_req,def_val] ] ]
+                self << [ short, long, help, meta, :ecore_getopt_action_callback, [:callback, [cb, data, arg_req, def_val] ] ]
             end
-            def callback_noargs short, long, help, cb, data
+            def callback_noargs short, long, help, cb, data=nil
                 callback_full short, long, help, FFI::Pointer::NULL, cb, data, :ecore_getopt_desc_arg_requirement_no, FFI::Pointer::NULL
             end
-            def callback_args short, long, help, meta, cb, data
+            def callback_args short, long, help, meta, cb, data=nil
                 callback_full short, long, help, meta, cb, data, :ecore_getopt_desc_arg_requirement_yes, FFI::Pointer::NULL
             end
             def help short, long

data/lib/efl/edje.rb

@@ -7,6 +7,10 @@ require 'efl/native/edje'
 module Efl
     #
     module Edje
+        #
+        def self.version
+            Native::VersionStruct.new(Native.edje_version)
+        end
         #
         class REdje < Efl::Evas::REvasObject
             #

data/lib/efl/eet.rb

@@ -6,6 +6,10 @@ require 'efl/native/eet'
 module Efl
     #
     module Eet
+        #
+        def self.version
+            Native::VersionStruct.new(Native.eet_version)
+        end
         #
         class REetFile
             #

data/lib/efl/eina.rb

@@ -7,6 +7,10 @@ module Efl
     #
     module Eina
         #
+        def self.version
+            Native::VersionStruct.new(Native.eina_version)
+        end
+        #
     end
     #
 end

data/lib/efl/eina_list.rb

@@ -49,9 +49,10 @@ module Efl
                     p = l[:next]
                 end
             end
-            def to_ary
+            def to_a
                 inject([]) { |s,e| s<<e }
             end
+            alias :to_ary :to_a
             # for fun and tests
             def append p
                 @ptr = Native.eina_list_append @ptr, p

data/lib/efl/eina_log.rb

@@ -0,0 +1,68 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/native/eina_log'
+#
+module Efl
+    #
+    module EinaLog
+        #
+        COLOR_LIGHTRED  ="\033[31;1m"
+        COLOR_RED       ="\033[31m"
+        COLOR_LIGHTBLUE ="\033[34;1m"
+        COLOR_BLUE      ="\033[34m"
+        COLOR_GREEN     ="\033[32;1m"
+        COLOR_YELLOW    ="\033[33;1m"
+        COLOR_ORANGE    ="\033[0;33m"
+        COLOR_WHITE     ="\033[37;1m"
+        COLOR_LIGHTCYAN ="\033[36;1m"
+        COLOR_CYAN      ="\033[36m"
+        COLOR_RESET     ="\033[0m"
+        COLOR_HIGH      ="\033[1m"
+        #
+        def self.log_dom_crit dom, lvl, msg
+            file, line, func = caller[1].split ':'
+            Native.eina_log_print dom, lvl, file, func, line.to_i, msg
+        end
+        def self.log_dom_crit dom, msg
+            self._log_dom dom, :eina_log_level_critical, msg
+        end
+        def self.log_dom_err dom, msg
+            self._log_dom dom, :eina_log_level_err, msg
+        end
+        def self.log_dom_info dom, msg
+            self._log_dom dom, :eina_log_level_info, msg
+        end
+        def self.log_dom_warn dom, msg
+            self._log_dom dom, :eina_log_level_warn, msg
+        end
+        def self.log_dom_dbg dom, msg
+            self._log_dom dom, :eina_log_level_dbg, msg
+        end
+        # should never be called directly
+        def self._log lvl, msg
+            file, line, func = caller[1].split ':'
+            Native.eina_log_print Native.EINA_LOG_DOMAIN_GLOBAL, lvl, file, func, line.to_i, msg
+        end
+        #
+        def self.log_crit msg
+            self._log :eina_log_level_critical, msg
+        end
+        def self.log_err msg
+            self._log :eina_log_level_err, msg
+        end
+        def self.log_info msg
+            self._log :eina_log_level_info, msg
+        end
+        def self.log_warn msg
+            self._log :eina_log_level_warn, msg
+        end
+        def self.log_dbg msg
+            self._log :eina_log_level_dbg, msg
+        end
+        #
+    end
+    #
+end
+#
+# EOF

data/lib/efl/elementary.rb

@@ -4,10 +4,12 @@
 require 'efl/evas'
 require 'efl/native/elementary'
 #
-Efl::Evas::REvasObject.search_prefixes << 'elm_'   # append not prepend !
-#
 module Efl
     module Elm
+        #
+        def self.version
+            Native::VersionStruct.new(Native.elm_version)
+        end
         #
         class << self
             def init *args
@@ -21,22 +23,152 @@ module Efl
             end
         end
         #
-        class ElmWin
-            include Efl::ClassHelper
-            search_prefixes 'elm_win_', 'elm_'
-            def initialize parent, title, type=:elm_win_basic
-                @evas_object = Evas::REvasObject.new Native.elm_win_add parent, title, type
-                @ptr = @evas_object.to_ptr
-                yield self,@evas_object if block_given?
-            end
-            def add e
-                eo = Evas::REvasObject.new Native.send "elm_#{e}_add", @ptr
-                yield eo if block_given?
-                eo
+        class ElmWin < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_win_', 'elm_object_'
+            #
+            def initialize parent, title, type=:elm_win_basic, &block
+                super Native.method(:elm_win_add), parent, title, type, &block
             end
             def smart_callback_add event_str, cb, data=FFI::MemoryPointer::NULL
                 Native.evas_object_smart_callback_add @ptr, event_str, cb, data
             end
+            def inwin_add
+                ElmInWin.new @ptr
+            end
+            def screen_position_get
+                x = FFI::MemoryPointer.new :int
+                y = FFI::MemoryPointer.new :int
+                Native.elm_win_screen_position_get @ptr, x, y
+                [ x.read_int, y.read_int ]
+            end
+            alias :screen_position :screen_position_get
+        end
+        #
+        class ElmInWin < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_win_inwin_', 'elm_win_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_win_inwin_add), parent, &block
+            end
+        end
+        #
+        class ElmBg < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_bg_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_bg_add), parent, &block
+            end
+            def file_get
+                f = FFI::MemoryPointer.new :pointer
+                g = FFI::MemoryPointer.new :pointer
+                Native.elm_bg_file_get @ptr, f, g
+                [ f.read_pointer.read_string, g.read_pointer.read_string ]
+            end
+            alias :file :file_get
+            def color_get
+                r = FFI::MemoryPointer.new :int
+                g = FFI::MemoryPointer.new :int
+                b = FFI::MemoryPointer.new :int
+                Native.elm_bg_color_get @ptr, r, g, b
+                [ r.read_int, g.read_int, b.read_int ]
+            end
+            alias :color :color_get
+        end
+        #
+        class ElmLayout < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_layout_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_layout_add), parent, &block
+            end
+            #
+            def edje_get &block
+                Efl::Edje::REdje.new Native.method(:elm_layout_edje_get), @ptr, &block
+            end
+            alias :edje :edje_get
+        end
+        #
+        class ElmBox < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_box_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_box_add), parent, &block
+            end
+            #
+        end
+        #
+        class ElmList < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_list_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_list_add), parent, &block
+            end
+            #
+        end
+        #
+        class ElmIcon < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_icon_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_icon_add), parent, &block
+            end
+            #
+            def scale_set args
+                Native.elm_icon_scale_set @ptr, *args
+            end
+            alias :scale= :scale_set
+        end
+        #
+        class ElmLabel < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_label_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_label_add), parent, &block
+            end
+        end
+        #
+        class ElmPager < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_pager_', 'elm_object_'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_pager_add), parent, &block
+            end
+        end
+        #
+        class ElmPanel < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_panel_', 'elm_object'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_panel_add), parent, &block
+            end
+        end
+        #
+        class ElmDiskSelector < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_diskselector_', 'elm_object'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_diskselector_add), parent, &block
+            end
+        end
+        #
+        class ElmNotify < Efl::Evas::REvasObject
+            #
+            search_prefixes 'elm_notify_', 'elm_object'
+            #
+            def initialize parent, &block
+                super Native.method(:elm_notify_add), parent, &block
+            end
         end
         #
     end

data/lib/efl/evas.rb

@@ -45,6 +45,13 @@ module Efl
         EVAS_ENGINE_BUFFER_DEPTH_BGR24  = 3
         EVAS_ENGINE_BUFFER_DEPTH_RGB32  = 4
         #
+        EVAS_HINT_FILL = -1.0
+        EVAS_HINT_EXPAND = 1.0
+        #
+        def self.version
+            Native::VersionStruct.new(Native.evas_version)
+        end
+        #
         class REvas
             #
             include Efl::ClassHelper
@@ -125,17 +132,15 @@ module Efl
             include Efl::ClassHelper
             search_prefixes 'evas_object_', 'evas_'
             #
-            def initialize *args
+            def initialize a, *args
                 @ptr = (
-                    case args[0]
-                    when NilClass
-                        FFI::AutoPointer.new Native.evas_new, REvasObject.method(:release)
+                    case a
                     when FFI::Pointer
-                        args[0]
+                        a
                     when Method
-                        FFI::AutoPointer.new args[0].call(args[1]), REvasObject.method(:release)
+                        FFI::AutoPointer.new a.call(*args), REvasObject.method(:release)
                     else
-                        raise ArgumentError.new "wrong argument #{args[0].class.name}"
+                        raise ArgumentError.new "wrong argument #{a.class.name}"
                     end
                 )
                 yield self if block_given?
@@ -234,6 +239,10 @@ module Efl
                 [ Native.enum_type(:evas_aspect_control)[a.read_int], w.read_int, h.read_int ]
             end
             alias :size_hint_aspect :size_hint_aspect_get
+            def size_hint_align_set_fill
+                Native.evas_object_size_hint_align_set @ptr, EVAS_HINT_FILL, EVAS_HINT_FILL
+            end
+            alias :size_hint_align_fill :size_hint_align_set_fill
             def size_hint_align_get
                 w = FFI::MemoryPointer.new :double
                 h = FFI::MemoryPointer.new :double
@@ -241,6 +250,10 @@ module Efl
                 [ w.read_double, h.read_double ]
             end
             alias :size_hint_align :size_hint_align_get
+            def size_hint_weight_set_expand
+                Native.evas_object_size_hint_weight_set @ptr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
+            end
+            alias :size_hint_weight_expand :size_hint_weight_set_expand
             def size_hint_weight_get
                 w = FFI::MemoryPointer.new :double
                 h = FFI::MemoryPointer.new :double

data/lib/efl/ffi.rb

@@ -4,6 +4,19 @@
 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
         #
@@ -68,8 +81,12 @@ module Efl
     end
     #
     module ClassHelper
+        def to_a; [self] end
+        def to_ary; [self] end
+        def to_s; Object.instance_method(:to_s).bind(self).call+' ['+self.to_ptr.to_s+']' end
         def to_ptr; @ptr; end
         def === o; @ptr === o.to_ptr; end
+        def null?; @ptr.null?; end
         def address; @ptr.address; end
         def self.included kls
             # create class instance @search_prefixes
@@ -95,7 +112,7 @@ module Efl
             else
                 args_s = '*args'
             end
-            self.class.search_prefixes.each do |p|
+            (['']+self.class.search_prefixes).each do |p|
                 sym = p+m_s
                 meth = (
                     if Efl::Native.respond_to? sym
@@ -115,7 +132,6 @@ module Efl
                     return self.send m, *args, &block
                 end
             end
-            return [self.to_s+' ['+self.to_ptr.to_s+']'] if m_s=~/^to_ary$/
             Kernel.raise NameError.new "#{self.class.name} is unable to resolve #{m} within #{self.class.search_prefixes.inspect}"
         end
     end

data/lib/efl/native/ecore.rb

@@ -27,6 +27,7 @@ module Efl
         # TYPEDEFS
         # typedef struct _Ecore_Version Ecore_Version;
         typedef :pointer, :ecore_version
+        typedef :pointer, :ecore_version_p
         # typedef enum _Ecore_Fd_Handler_Flags Ecore_Fd_Handler_Flags;
         typedef :pointer, :ecore_fd_handler_flags
         # typedef enum _Ecore_Exe_Flags Ecore_Exe_Flags;
@@ -134,14 +135,20 @@ module Efl
         # typedef Eina_Bool (*Ecore_Win32_Handle_Cb) (void *data, Ecore_Win32_Handler *wh);
         callback :ecore_win32_handle_cb, [ :void_p, :ecore_win32_handler_p ], :eina_bool
         #
+        # VARIABLES
+        # EAPI extern Ecore_Version *ecore_version;
+        attach_variable :ecore_version, :ecore_version_p
+        # EAPI extern int ECORE_EXE_EVENT_ADD;
+        attach_variable :ECORE_EXE_EVENT_ADD, :int
+        # EAPI extern int ECORE_EXE_EVENT_DEL;
+        attach_variable :ECORE_EXE_EVENT_DEL, :int
+        # EAPI extern int ECORE_EXE_EVENT_DATA;
+        attach_variable :ECORE_EXE_EVENT_DATA, :int
+        # EAPI extern int ECORE_EXE_EVENT_ERROR;
+        attach_variable :ECORE_EXE_EVENT_ERROR, :int
+        #
         # FUNCTIONS
         fcts = [
-        # EAPI extern Ecore_Version *ecore_version;
-        # FIXME
-        # EAPI extern int ECORE_EXE_EVENT_ADD; /**< A child process has been added */ EAPI extern int ECORE_EXE_EVENT_DEL; /**< A child process has been deleted (it exited, naming consistent with the rest of ecore). */
-        # FIXME
-        # EAPI extern int ECORE_EXE_EVENT_DATA; /**< Data from a child process. */ EAPI extern int ECORE_EXE_EVENT_ERROR; /**< Errors from a child process. */
-        # FIXME
         # EAPI int ecore_init(void);
         [ :ecore_init, [  ], :int ],
         # EAPI int ecore_shutdown(void);
@@ -283,8 +290,7 @@ module Efl
         # EAPI Ecore_Thread *ecore_thread_run(Ecore_Thread_Cb func_blocking, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data);
         [ :ecore_thread_run, [ :ecore_thread_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p ], :ecore_thread_p ],
         # EAPI Ecore_Thread *ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy, Ecore_Thread_Notify_Cb func_notify, Ecore_Thread_Cb func_end, Ecore_Thread_Cb func_cancel, const void *data, Eina_Bool try_no_queue);
-        [ :ecore_thread_feedback_run, [ :ecore_thread_cb, :ecore_thread_notify_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p, :eina_bool ],
-            :ecore_thread_p ],
+        [ :ecore_thread_feedback_run, [ :ecore_thread_cb, :ecore_thread_notify_cb, :ecore_thread_cb, :ecore_thread_cb, :void_p, :eina_bool ], :ecore_thread_p ],
         # EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
         [ :ecore_thread_cancel, [ :ecore_thread_p ], :eina_bool ],
         # EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread);

data/lib/efl/native/ecore_evas.rb

@@ -25,16 +25,15 @@ module Efl
         # ENUMS
         # typedef enum _Ecore_Evas_Engine_Type {...} Ecore_Evas_Engine_Type;
         enum :ecore_evas_engine_type, [ :ecore_evas_engine_software_buffer, :ecore_evas_engine_software_xlib, :ecore_evas_engine_xrender_x11,
-            :ecore_evas_engine_opengl_x11, :ecore_evas_engine_software_xcb, :ecore_evas_engine_xrender_xcb, :ecore_evas_engine_software_gdi,
-            :ecore_evas_engine_software_ddraw, :ecore_evas_engine_direct3d, :ecore_evas_engine_opengl_glew, :ecore_evas_engine_cocoa,
-            :ecore_evas_engine_software_sdl, :ecore_evas_engine_directfb, :ecore_evas_engine_software_fb, :ecore_evas_engine_software_8_x11,
-            :ecore_evas_engine_software_16_x11, :ecore_evas_engine_software_16_ddraw, :ecore_evas_engine_software_16_wince, :ecore_evas_engine_opengl_sdl ]
+            :ecore_evas_engine_opengl_x11, :ecore_evas_engine_software_xcb, :ecore_evas_engine_xrender_xcb, :ecore_evas_engine_software_gdi, :ecore_evas_engine_software_ddraw,
+            :ecore_evas_engine_direct3d, :ecore_evas_engine_opengl_glew, :ecore_evas_engine_cocoa, :ecore_evas_engine_software_sdl, :ecore_evas_engine_directfb,
+            :ecore_evas_engine_software_fb, :ecore_evas_engine_software_8_x11, :ecore_evas_engine_software_16_x11, :ecore_evas_engine_software_16_ddraw,
+            :ecore_evas_engine_software_16_wince, :ecore_evas_engine_opengl_sdl ]
         # typedef enum _Ecore_Evas_Avoid_Damage_Type {...} Ecore_Evas_Avoid_Damage_Type;
-        enum :ecore_evas_avoid_damage_type, [ :ecore_evas_avoid_damage_none, 0, :ecore_evas_avoid_damage_expose, 1, :ecore_evas_avoid_damage_built_in,
-            2 ]
+        enum :ecore_evas_avoid_damage_type, [ :ecore_evas_avoid_damage_none, 0, :ecore_evas_avoid_damage_expose, 1, :ecore_evas_avoid_damage_built_in, 2 ]
         # typedef enum _Ecore_Evas_Object_Associate_Flags {...} Ecore_Evas_Object_Associate_Flags;
-        enum :ecore_evas_object_associate_flags, [ :ecore_evas_object_associate_base, 0, :ecore_evas_object_associate_stack, 1,
-            :ecore_evas_object_associate_layer, 1, :ecore_evas_object_associate_del, 1 ]
+        enum :ecore_evas_object_associate_flags, [ :ecore_evas_object_associate_base, 0, :ecore_evas_object_associate_stack, 1, :ecore_evas_object_associate_layer, 1,
+            :ecore_evas_object_associate_del, 1 ]
         #
         # TYPEDEFS
         # typedef unsigned int Ecore_X_Window;
@@ -56,6 +55,7 @@ module Efl
         # void (*func) (Ecore_Evas *ee)
         callback :ecore_evas_event_cb, [:ecore_evas_p], :void
         #
+        # VARIABLES
         #
         # FUNCTIONS
         fcts = [
@@ -179,8 +179,6 @@ module Efl
         [ :ecore_evas_software_wince_gdi_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
         # EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee);
         [ :ecore_evas_software_wince_window_get, [ :ecore_evas_p ], :ecore_wince_window_p ],
-        # EAPI Ecore_Evas *ecore_evas_cocoa_new(const char* name, int w, int h);
-        [ :ecore_evas_cocoa_new, [ :string, :int, :int ], :ecore_evas_p ],
         # EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee);
         [ :ecore_evas_engine_name_get, [ :ecore_evas_p ], :string ],
         # EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e);
@@ -356,8 +354,7 @@ module Efl
         # EAPI Evas_Object *ecore_evas_object_associate_get(const Ecore_Evas *ee);
         [ :ecore_evas_object_associate_get, [ :ecore_evas_p ], :evas_object_p ],
         # 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);
-        [ :ecore_getopt_callback_ecore_evas_list_engines, [ :ecore_getopt_p, :ecore_getopt_desc_p, :string, :void_p, :ecore_getopt_value_p ], :uchar
-            ],
+        [ :ecore_getopt_callback_ecore_evas_list_engines, [ :ecore_getopt_p, :ecore_getopt_desc_p, :string, :void_p, :ecore_getopt_value_p ], :eina_bool ],
         # EAPI Eina_List *ecore_evas_ecore_evas_list_get(void);
         [ :ecore_evas_ecore_evas_list_get, [  ], :eina_list_p ],
         # EAPI void ecore_evas_x11_leader_set(Ecore_Evas *ee, Ecore_X_Window win);
@@ -379,6 +376,10 @@ module Efl
         # EAPI void ecore_evas_x11_shape_input_apply(Ecore_Evas *ee);
         [ :ecore_evas_x11_shape_input_apply, [ :ecore_evas_p ], :void ],
         ]
+        if RUBY_PLATFORM =~ /darwin/
+            # EAPI Ecore_Evas *ecore_evas_cocoa_new(const char* name, int w, int h);
+            fcts << [ :ecore_evas_cocoa_new, [ :string, :int, :int ], :ecore_evas_p ]
+        end
         #
         attach_fcts fcts
         #

data/lib/efl/native/ecore_getopt.rb

@@ -24,12 +24,12 @@ module Efl
         #
         # ENUMS
         # typedef enum {...} Ecore_Getopt_Action;
-        enum :ecore_getopt_action, [ :ecore_getopt_action_store, :ecore_getopt_action_store_const, :ecore_getopt_action_store_true,
-            :ecore_getopt_action_store_false, :ecore_getopt_action_choice, :ecore_getopt_action_append, :ecore_getopt_action_count, :ecore_getopt_action_callback,
-            :ecore_getopt_action_help, :ecore_getopt_action_version, :ecore_getopt_action_copyright, :ecore_getopt_action_license ]
+        enum :ecore_getopt_action, [ :ecore_getopt_action_store, :ecore_getopt_action_store_const, :ecore_getopt_action_store_true, :ecore_getopt_action_store_false,
+            :ecore_getopt_action_choice, :ecore_getopt_action_append, :ecore_getopt_action_count, :ecore_getopt_action_callback, :ecore_getopt_action_help,
+            :ecore_getopt_action_version, :ecore_getopt_action_copyright, :ecore_getopt_action_license ]
         # typedef enum {...} Ecore_Getopt_Type;
-        enum :ecore_getopt_type, [ :ecore_getopt_type_str, :ecore_getopt_type_bool, :ecore_getopt_type_short, :ecore_getopt_type_int,
-            :ecore_getopt_type_long, :ecore_getopt_type_ushort, :ecore_getopt_type_uint, :ecore_getopt_type_ulong, :ecore_getopt_type_double ]
+        enum :ecore_getopt_type, [ :ecore_getopt_type_str, :ecore_getopt_type_bool, :ecore_getopt_type_short, :ecore_getopt_type_int, :ecore_getopt_type_long,
+            :ecore_getopt_type_ushort, :ecore_getopt_type_uint, :ecore_getopt_type_ulong, :ecore_getopt_type_double ]
         # typedef enum {...} Ecore_Getopt_Desc_Arg_Requirement;
         enum :ecore_getopt_desc_arg_requirement, [ :ecore_getopt_desc_arg_requirement_no, 0, :ecore_getopt_desc_arg_requirement_yes, 1,
             :ecore_getopt_desc_arg_requirement_optional, 3 ]
@@ -51,6 +51,8 @@ module Efl
         #
         # CALLBACKS
         #
+        # VARIABLES
+        #
         # FUNCTIONS
         fcts = [
         # EAPI void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);

data/lib/efl/native/ecore_input.rb

@@ -49,24 +49,26 @@ module Efl
         #
         # CALLBACKS
         #
-        # FUNCTIONS
-        fcts = [
+        # VARIABLES
         # EAPI extern int ECORE_EVENT_KEY_DOWN;
-        # FIXME
+        attach_variable :ECORE_EVENT_KEY_DOWN, :int
         # EAPI extern int ECORE_EVENT_KEY_UP;
-        # FIXME
+        attach_variable :ECORE_EVENT_KEY_UP, :int
         # EAPI extern int ECORE_EVENT_MOUSE_BUTTON_DOWN;
-        # FIXME
+        attach_variable :ECORE_EVENT_MOUSE_BUTTON_DOWN, :int
         # EAPI extern int ECORE_EVENT_MOUSE_BUTTON_UP;
-        # FIXME
+        attach_variable :ECORE_EVENT_MOUSE_BUTTON_UP, :int
         # EAPI extern int ECORE_EVENT_MOUSE_MOVE;
-        # FIXME
+        attach_variable :ECORE_EVENT_MOUSE_MOVE, :int
         # EAPI extern int ECORE_EVENT_MOUSE_WHEEL;
-        # FIXME
+        attach_variable :ECORE_EVENT_MOUSE_WHEEL, :int
         # EAPI extern int ECORE_EVENT_MOUSE_IN;
-        # FIXME
+        attach_variable :ECORE_EVENT_MOUSE_IN, :int
         # EAPI extern int ECORE_EVENT_MOUSE_OUT;
-        # FIXME
+        attach_variable :ECORE_EVENT_MOUSE_OUT, :int
+        #
+        # FUNCTIONS
+        fcts = [
         # EAPI int ecore_event_init(void);
         [ :ecore_event_init, [  ], :int ],
         # EAPI int ecore_event_shutdown(void);