ffi-efl 0.0.10 → 0.0.11

data/lib/efl/elm/elm_tooltip.rb

@@ -0,0 +1,20 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_tooltip'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmTooltip < ElmObject
+            #
+            search_prefixes 'elm_tooltip_', 'elm_object_tooltip_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF

data/lib/efl/elm/elm_transit.rb

@@ -0,0 +1,78 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_transit'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmTransit < ElmObject
+            #
+            include Helper
+            constructor :elm_transit_add
+            search_prefixes 'elm_transit_'
+            def effect_resizing_add from_w, from_h, to_w, to_h
+                ElmTransitEffect.new Native.elm_transit_effect_resizing_add @ptr, from_w, from_h, to_w,to_h
+            end
+            #
+            def effect_translation_add from_w, from_h, to_w, to_h
+                ElmTransitEffect.new Native.elm_transit_effect_translation_add @ptr, from_dx, from_dy, to_dx, to_dy
+            end
+            #
+            def effect_zoom_add from_rate, to_rate
+                ElmTransitEffect.new Native.elm_transit_effect_zoom_add @ptr, from_rate, to_rate
+            end
+            #
+            def effect_zoom_add from_rate, to_rate
+                ElmTransitEffect.new Native.elm_transit_effect_zoom_add @ptr, from_rate, to_rate
+            end
+            #
+            def effect_flip_add axis, cw
+                ElmTransitEffect.new Native.elm_transit_effect_flip_add @ptr, axis, cw
+            end
+            #
+            def effect_resizable_flip_add axis, cw
+                ElmTransitEffect.new Native.elm_transit_effect_resizable_flip_add @ptr, axis, cw
+            end
+            #
+            def effect_wipe_add type, dir
+                ElmTransitEffect.new Native.elm_transit_effect_wipe_add @ptr, type, dir
+            end
+            #
+            def effect_color_add from_r, from_g, from_b, from_a, to_r, to_g, to_b, to_a
+                ElmTransitEffect.new Native.elm_transit_effect_color_add @ptr, from_r, from_g, from_b, from_a, to_r, to_g, to_b, to_a
+            end
+            #
+            def effect_fade_add
+                ElmTransitEffect.new Native.elm_transit_effect_fade_add @ptr
+            end
+            #
+            def effect_blend_add
+                ElmTransitEffect.new Native.elm_transit_effect_blend_add @ptr
+            end
+            #
+            def effect_rotation_add from_degree, to_degree
+                ElmTransitEffect.new Native.elm_transit_effect_rotation_add @ptr, from_degree, to_degree
+            end
+            #
+            def effect_image_animation_add images
+                ElmTransitEffect.new Native.elm_transit_effect_image_animation_add @ptr, images
+            end
+            #
+        end
+        #
+        #
+        class ElmTransitEffect < ElmObject
+            #
+            include Helper
+            constructor :elm_transit_add
+            search_prefixes 'elm_transit_effect_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF

data/lib/efl/elm/elm_video.rb

@@ -0,0 +1,30 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_video'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmVideo < ElmObject
+            #
+            include Helper
+            constructor :elm_video_add
+            search_prefixes 'elm_video_'
+            #
+        end
+        #
+        class ElmPlayer < ElmObject
+            #
+            include Helper
+            constructor :elm_player_add
+            search_prefixes 'elm_player_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF

data/lib/efl/elm/elm_web.rb

@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_web'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmWeb < ElmObject
+            #
+            include Helper
+            constructor :elm_web_add
+            search_prefixes 'elm_web_'
+            #
+        end
+        #
+    end
+end
+#
+# EOF

data/lib/efl/elm/elm_win.rb

@@ -0,0 +1,33 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+require 'efl/elm/elm_object'
+require 'efl/native/elm/elm_win'
+#
+module Efl
+    #
+    module Elm
+        #
+        class ElmWin < ElmObject
+            #
+            search_prefixes 'elm_win_'
+            #
+            def initialize parent, title, type=:elm_win_basic, &block
+                super Native.method(:elm_win_add), parent, title, type, &block
+            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
+        #
+    end
+end
+#
+# EOF

data/lib/efl/evas.rb

@@ -1,13 +1,14 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/evas'
 #
 module Efl
     #
     module Native
         #
-        callback :new_update_region_cb, [:int, :int, :int, :int, :int_p], :pointer
+        callback :new_update_region_cb, [:int, :int, :int, :int, :pointer], :pointer
         callback :free_update_region_cb, [:int, :int, :int, :int, :pointer], :void
         #
         class EngineInfoStruct < FFI::Struct
@@ -57,7 +58,7 @@ module Efl
             include Efl::ClassHelper
             search_prefixes 'evas_'
             #
-            def initialize o=nil
+            def initialize o=nil, &block
                 @ptr = (
                     case o
                     when NilClass
@@ -68,7 +69,7 @@ module Efl
                         raise ArgumentError.new "wrong argument #{o.class.name}"
                     end
                 )
-                yield self if block_given?
+                instance_eval &block if block
             end
             def self.release p
                 Native.evas_free p
@@ -132,7 +133,7 @@ module Efl
             include Efl::ClassHelper
             search_prefixes 'evas_object_', 'evas_'
             #
-            def initialize a, *args
+            def initialize a, *args, &block
                 @ptr = (
                     case a
                     when FFI::Pointer
@@ -143,7 +144,7 @@ module Efl
                         raise ArgumentError.new "wrong argument #{a.class.name}"
                     end
                 )
-                yield self if block_given?
+                instance_eval &block if block
             end
             def self.release p
                 Native.evas_object_del p unless p.nil?
@@ -160,9 +161,9 @@ module Efl
                 REvasObject.release @ptr
                 @ptr=nil
             end
-            def object_box_add
+            def object_box_add &block
                 o = Evas::REvasBox.new FFI::AutoPointer.new Native.evas_object_box_add_to(@ptr), REvasObject.method(:release)
-                yield o if block_given?
+                o.instance_eval &block if block
                 o
             end
             def evas_name

data/lib/efl/native.rb

@@ -1,16 +1,50 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/native/eet'
-require 'efl/native/eina'
-require 'efl/native/eina_hash'
-require 'efl/native/eina_list'
-require 'efl/native/evas'
-require 'efl/native/ecore'
-require 'efl/native/ecore_evas'
-require 'efl/native/ecore_getopt'
-require 'efl/native/ecore_input'
-require 'efl/native/edje'
-require 'efl/native/elementary'
+require 'ffi'
+#
+module Efl
+    #
+    module Native
+        #
+        extend FFI::Library
+        #
+        typedef :bool, :eina_bool
+        #
+        def self.attach_fcts fcts
+            fcts.each do |func|
+                begin
+                    attach_function(*func)
+                rescue Object => e
+                    puts "Could not attach #{func} #{e.message}"
+                end
+            end
+        end
+        #
+        class << self
+            def find_variable name
+                ffi_libraries.each do |lib|
+                    address = lib.find_variable name
+                    return address if not address.nil?
+                end
+                return nil
+            end
+        end
+        #
+        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
+    #
+end
+#
+require 'efl/native/eina_types'
 #
 # EOF

data/lib/efl/native/ecore.rb

@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module Ecore
         #
-        FCT_PREFIX = 'ecore_'
+        FCT_PREFIX = 'ecore_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, █ r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -22,35 +21,35 @@ module Efl
         ffi_lib 'ecore'
         #
         # ENUMS
-        # typedef enum _Ecore_Exe_Flags { ECORE_EXE_NONE = 0, ECORE_EXE_PIPE_READ = 1, ECORE_EXE_PIPE_WRITE = 2, ECORE_EXE_PIPE_ERROR = 4, ECORE_EXE_PIPE_READ_LINE_BUFFERED = 8, ECORE_EXE_PIPE_ERROR_LINE_BUFFERED = 16, ECORE_EXE_PIPE_AUTO = 32, ECORE_EXE_RESPAWN = 64, ECORE_EXE_USE_SH = 128, ECORE_EXE_NOT_LEADER = 256, ECORE_EXE_TERM_WITH_PARENT = 512 } Ecore_Exe_Flags
-        # FIXME
-        # typedef enum _Ecore_Exe_Win32_Priority { ECORE_EXE_WIN32_PRIORITY_IDLE, ECORE_EXE_WIN32_PRIORITY_BELOW_NORMAL, ECORE_EXE_WIN32_PRIORITY_NORMAL, ECORE_EXE_WIN32_PRIORITY_ABOVE_NORMAL, ECORE_EXE_WIN32_PRIORITY_HIGH, ECORE_EXE_WIN32_PRIORITY_REALTIME } Ecore_Exe_Win32_Priority
-        # FIXME
-        # typedef enum _Ecore_Fd_Handler_Flags { ECORE_FD_READ = 1, ECORE_FD_WRITE = 2, ECORE_FD_ERROR = 4 } Ecore_Fd_Handler_Flags
-        # FIXME
-        # typedef enum _Ecore_Poller_Type { ECORE_POLLER_CORE = 0 } Ecore_Poller_Type
-        # FIXME
-        # typedef enum _Ecore_Pos_Map { ECORE_POS_MAP_LINEAR, ECORE_POS_MAP_ACCELERATE, ECORE_POS_MAP_DECELERATE, ECORE_POS_MAP_SINUSOIDAL, ECORE_POS_MAP_ACCELERATE_FACTOR, ECORE_POS_MAP_DECELERATE_FACTOR, ECORE_POS_MAP_SINUSOIDAL_FACTOR, ECORE_POS_MAP_DIVISOR_INTERP, ECORE_POS_MAP_BOUNCE, ECORE_POS_MAP_SPRING } Ecore_Pos_Map
-        # FIXME
-        # typedef enum _Ecore_Animator_Source { ECORE_ANIMATOR_SOURCE_TIMER, ECORE_ANIMATOR_SOURCE_CUSTOM } Ecore_Animator_Source
-        # FIXME
+        # enum _Ecore_Exe_Flags {...} Ecore_Exe_Flags;
+        enum :ecore_exe_flags, [ :ecore_exe_none, 0, :ecore_exe_pipe_read, 1, :ecore_exe_pipe_write, 2, :ecore_exe_pipe_error, 4,
+            :ecore_exe_pipe_read_line_buffered, 8, :ecore_exe_pipe_error_line_buffered, 16, :ecore_exe_pipe_auto, 32, :ecore_exe_respawn, 64, :ecore_exe_use_sh,
+            128, :ecore_exe_not_leader, 256, :ecore_exe_term_with_parent, 512 ]
+        # enum _Ecore_Exe_Win32_Priority {...} Ecore_Exe_Win32_Priority;
+        enum :ecore_exe_win32_priority, [ :ecore_exe_win32_priority_idle, :ecore_exe_win32_priority_below_normal, :ecore_exe_win32_priority_normal,
+            :ecore_exe_win32_priority_above_normal, :ecore_exe_win32_priority_high, :ecore_exe_win32_priority_realtime ]
+        # enum _Ecore_Fd_Handler_Flags {...} Ecore_Fd_Handler_Flags;
+        enum :ecore_fd_handler_flags, [ :ecore_fd_read, 1, :ecore_fd_write, 2, :ecore_fd_error, 4 ]
+        # enum _Ecore_Poller_Type {...} Ecore_Poller_Type;
+        enum :ecore_poller_type, [ :ecore_poller_core, 0 ]
+        # enum _Ecore_Pos_Map {...} Ecore_Pos_Map;
+        enum :ecore_pos_map, [ :ecore_pos_map_linear, :ecore_pos_map_accelerate, :ecore_pos_map_decelerate, :ecore_pos_map_sinusoidal,
+            :ecore_pos_map_accelerate_factor, :ecore_pos_map_decelerate_factor, :ecore_pos_map_sinusoidal_factor, :ecore_pos_map_divisor_interp,
+            :ecore_pos_map_bounce, :ecore_pos_map_spring ]
+        # enum _Ecore_Animator_Source {...} Ecore_Animator_Source;
+        enum :ecore_animator_source, [ :ecore_animator_source_timer, :ecore_animator_source_custom ]
         #
         # TYPEDEFS
         # typedef struct _Ecore_Version Ecore_Version;
         typedef :pointer, :ecore_version
-        typedef :pointer, :ecore_version_p
         # typedef struct _Ecore_Win32_Handler Ecore_Win32_Handler;
         typedef :pointer, :ecore_win32_handler
-        typedef :pointer, :ecore_win32_handler_p
         # typedef struct _Ecore_Event_Handler Ecore_Event_Handler;
         typedef :pointer, :ecore_event_handler
-        typedef :pointer, :ecore_event_handler_p
         # typedef struct _Ecore_Event_Filter Ecore_Event_Filter;
         typedef :pointer, :ecore_event_filter
-        typedef :pointer, :ecore_event_filter_p
         # typedef struct _Ecore_Event Ecore_Event;
         typedef :pointer, :ecore_event
-        typedef :pointer, :ecore_event_p
         # typedef struct _Ecore_Event_Signal_User Ecore_Event_Signal_User;
         typedef :pointer, :ecore_event_signal_user
         # typedef struct _Ecore_Event_Signal_Hup Ecore_Event_Signal_Hup;
@@ -61,13 +60,8 @@ module Efl
         typedef :pointer, :ecore_event_signal_power
         # typedef struct _Ecore_Event_Signal_Realtime Ecore_Event_Signal_Realtime;
         typedef :pointer, :ecore_event_signal_realtime
-        # typedef enum _Ecore_Exe_Flags Ecore_Exe_Flags;
-        typedef :pointer, :ecore_exe_flags
-        # typedef enum _Ecore_Exe_Win32_Priority Ecore_Exe_Win32_Priority;
-        typedef :pointer, :ecore_exe_win32_priority
         # typedef struct _Ecore_Exe Ecore_Exe;
         typedef :pointer, :ecore_exe
-        typedef :pointer, :ecore_exe_p
         # typedef struct _Ecore_Exe_Event_Add Ecore_Exe_Event_Add;
         typedef :pointer, :ecore_exe_event_add
         # typedef struct _Ecore_Exe_Event_Del Ecore_Exe_Event_Del;
@@ -76,81 +70,62 @@ module Efl
         typedef :pointer, :ecore_exe_event_data_line
         # typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data;
         typedef :pointer, :ecore_exe_event_data
-        typedef :pointer, :ecore_exe_event_data_p
         # typedef struct _Ecore_Fd_Handler Ecore_Fd_Handler;
         typedef :pointer, :ecore_fd_handler
-        typedef :pointer, :ecore_fd_handler_p
-        # typedef enum _Ecore_Fd_Handler_Flags Ecore_Fd_Handler_Flags;
-        typedef :pointer, :ecore_fd_handler_flags
-        # typedef enum _Ecore_Poller_Type Ecore_Poller_Type;
-        typedef :pointer, :ecore_poller_type
         # typedef struct _Ecore_Poller Ecore_Poller;
         typedef :pointer, :ecore_poller
-        typedef :pointer, :ecore_poller_p
         # typedef struct _Ecore_Animator Ecore_Animator;
         typedef :pointer, :ecore_animator
-        typedef :pointer, :ecore_animator_p
-        # typedef enum _Ecore_Pos_Map Ecore_Pos_Map;
-        typedef :pointer, :ecore_pos_map
-        # typedef enum _Ecore_Animator_Source Ecore_Animator_Source;
-        typedef :pointer, :ecore_animator_source
         # typedef struct _Ecore_Timer Ecore_Timer;
         typedef :pointer, :ecore_timer
-        typedef :pointer, :ecore_timer_p
         # typedef struct _Ecore_Idler Ecore_Idler;
         typedef :pointer, :ecore_idler
-        typedef :pointer, :ecore_idler_p
         # typedef struct _Ecore_Idle_Enterer Ecore_Idle_Enterer;
         typedef :pointer, :ecore_idle_enterer
-        typedef :pointer, :ecore_idle_enterer_p
         # typedef struct _Ecore_Idle_Exiter Ecore_Idle_Exiter;
         typedef :pointer, :ecore_idle_exiter
-        typedef :pointer, :ecore_idle_exiter_p
         # typedef struct _Ecore_Thread Ecore_Thread;
         typedef :pointer, :ecore_thread
-        typedef :pointer, :ecore_thread_p
         # typedef struct _Ecore_Pipe Ecore_Pipe;
         typedef :pointer, :ecore_pipe
-        typedef :pointer, :ecore_pipe_p
         # typedef struct _Ecore_Job Ecore_Job;
         typedef :pointer, :ecore_job
-        typedef :pointer, :ecore_job_p
         #
         # CALLBACKS
         # typedef Eina_Bool (*Ecore_Task_Cb) (void *data);
-        callback :ecore_task_cb, [ :void_p ], :eina_bool
+        callback :ecore_task_cb, [ :pointer ], :bool
         # typedef int (*Ecore_Select_Function) (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
-        callback :ecore_select_function, [ :int, :pointer, :pointer, :pointer, :pointer ], :int
+        callback :ecore_select_function_cb, [ :int, :pointer, :pointer, :pointer, :pointer ], :int
         # typedef void (*Ecore_Cb) (void *data);
-        callback :ecore_cb, [ :void_p ], :void
+        callback :ecore_cb, [ :pointer ], :void
         # typedef void *(*Ecore_Data_Cb) (void *data);
-        callback :ecore_data_cb, [ :void_p ], :void_p
+        callback :ecore_data_cb, [ :pointer ], :pointer
         # typedef Eina_Bool (*Ecore_Filter_Cb) (void *data, void *loop_data, int type, void *event);
-        callback :ecore_filter_cb, [ :void_p, :void_p, :int, :void_p ], :eina_bool
+        callback :ecore_filter_cb, [ :pointer, :pointer, :int, :pointer ], :bool
         # typedef void (*Ecore_End_Cb) (void *user_data, void *func_data);
-        callback :ecore_end_cb, [ :void_p, :void_p ], :void
+        callback :ecore_end_cb, [ :pointer, :pointer ], :void
         # typedef Eina_Bool (*Ecore_Event_Handler_Cb) (void *data, int type, void *event);
-        callback :ecore_event_handler_cb, [ :void_p, :int, :void_p ], :eina_bool
+        callback :ecore_event_handler_cb, [ :pointer, :int, :pointer ], :bool
         # typedef void (*Ecore_Exe_Cb) (void *data, const Ecore_Exe *exe);
-        callback :ecore_exe_cb, [ :void_p, :ecore_exe_p ], :void
+        callback :ecore_exe_cb, [ :pointer, :ecore_exe ], :void
         # typedef Eina_Bool (*Ecore_Fd_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
-        callback :ecore_fd_cb, [ :void_p, :ecore_fd_handler_p ], :eina_bool
+        callback :ecore_fd_cb, [ :pointer, :ecore_fd_handler ], :bool
         # typedef void (*Ecore_Fd_Prep_Cb) (void *data, Ecore_Fd_Handler *fd_handler);
-        callback :ecore_fd_prep_cb, [ :void_p, :ecore_fd_handler_p ], :void
+        callback :ecore_fd_prep_cb, [ :pointer, :ecore_fd_handler ], :void
         # 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
+        callback :ecore_win32_handle_cb, [ :pointer, :ecore_win32_handler ], :bool
         # typedef Eina_Bool (*Ecore_Timeline_Cb) (void *data, double pos);
-        callback :ecore_timeline_cb, [ :void_p, :double ], :eina_bool
+        callback :ecore_timeline_cb, [ :pointer, :double ], :bool
         # typedef void (*Ecore_Thread_Cb) (void *data, Ecore_Thread *thread);
-        callback :ecore_thread_cb, [ :void_p, :ecore_thread_p ], :void
+        callback :ecore_thread_cb, [ :pointer, :ecore_thread ], :void
         # typedef void (*Ecore_Thread_Notify_Cb) (void *data, Ecore_Thread *thread, void *msg_data);
-        callback :ecore_thread_notify_cb, [ :void_p, :ecore_thread_p, :void_p ], :void
+        callback :ecore_thread_notify_cb, [ :pointer, :ecore_thread, :pointer ], :void
         # typedef void (*Ecore_Pipe_Cb) (void *data, void *buffer, unsigned int nbyte);
-        callback :ecore_pipe_cb, [ :void_p, :void_p, :uint ], :void
+        callback :ecore_pipe_cb, [ :pointer, :pointer, :uint ], :void
         #
         # VARIABLES
         # EAPI extern Ecore_Version *ecore_version;
-        attach_variable :ecore_version, :ecore_version_p
+        attach_variable :ecore_version, :ecore_version
         # EAPI extern int ECORE_EXE_EVENT_ADD;
         attach_variable :ECORE_EXE_EVENT_ADD, :int
         # EAPI extern int ECORE_EXE_EVENT_DEL;
@@ -169,11 +144,11 @@ module Efl
         # EAPI void ecore_main_loop_iterate(void);
         [ :ecore_main_loop_iterate, [  ], :void ],
         # EAPI void ecore_main_loop_select_func_set(Ecore_Select_Function func);
-        [ :ecore_main_loop_select_func_set, [ :ecore_select_function ], :void ],
+        [ :ecore_main_loop_select_func_set, [ :ecore_select_function_cb ], :void ],
         # EAPI Ecore_Select_Function ecore_main_loop_select_func_get(void);
-        [ :ecore_main_loop_select_func_get, [  ], :ecore_select_function ],
+        [ :ecore_main_loop_select_func_get, [  ], :ecore_select_function_cb ],
         # EAPI Eina_Bool ecore_main_loop_glib_integrate(void);
-        [ :ecore_main_loop_glib_integrate, [  ], :eina_bool ],
+        [ :ecore_main_loop_glib_integrate, [  ], :bool ],
         # EAPI void ecore_main_loop_glib_always_integrate_disable(void);
         [ :ecore_main_loop_glib_always_integrate_disable, [  ], :void ],
         # EAPI void ecore_main_loop_begin(void);
@@ -181,125 +156,125 @@ module Efl
         # EAPI void ecore_main_loop_quit(void);
         [ :ecore_main_loop_quit, [  ], :void ],
         # EAPI void ecore_main_loop_thread_safe_call_async(Ecore_Cb callback, void *data);
-        [ :ecore_main_loop_thread_safe_call_async, [ :ecore_cb, :void_p ], :void ],
-        # EAPI void * ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data);
-        [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_data_cb, :void_p ], :void_p ],
+        [ :ecore_main_loop_thread_safe_call_async, [ :ecore_cb, :pointer ], :void ],
+        # EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data);
+        [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_data_cb, :pointer ], :pointer ],
         # EAPI int ecore_thread_main_loop_begin(void);
         [ :ecore_thread_main_loop_begin, [  ], :int ],
         # EAPI int ecore_thread_main_loop_end(void);
         [ :ecore_thread_main_loop_end, [  ], :int ],
-        # EAPI Ecore_Event_Handler * ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data);
-        [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :void_p ], :ecore_event_handler_p ],
-        # EAPI void * ecore_event_handler_del(Ecore_Event_Handler *event_handler);
-        [ :ecore_event_handler_del, [ :ecore_event_handler_p ], :void_p ],
-        # EAPI Ecore_Event * ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
-        [ :ecore_event_add, [ :int, :void_p, :ecore_end_cb, :void_p ], :ecore_event_p ],
-        # EAPI void * ecore_event_del(Ecore_Event *event);
-        [ :ecore_event_del, [ :ecore_event_p ], :void_p ],
-        # EAPI void * ecore_event_handler_data_get(Ecore_Event_Handler *eh);
-        [ :ecore_event_handler_data_get, [ :ecore_event_handler_p ], :void_p ],
-        # EAPI void * ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data);
-        [ :ecore_event_handler_data_set, [ :ecore_event_handler_p, :void_p ], :void_p ],
+        # EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data);
+        [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :pointer ], :ecore_event_handler ],
+        # EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
+        [ :ecore_event_handler_del, [ :ecore_event_handler ], :pointer ],
+        # EAPI Ecore_Event *ecore_event_add(int type, void *ev, Ecore_End_Cb func_free, void *data);
+        [ :ecore_event_add, [ :int, :pointer, :ecore_end_cb, :pointer ], :ecore_event ],
+        # EAPI void *ecore_event_del(Ecore_Event *event);
+        [ :ecore_event_del, [ :ecore_event ], :pointer ],
+        # EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh);
+        [ :ecore_event_handler_data_get, [ :ecore_event_handler ], :pointer ],
+        # EAPI void *ecore_event_handler_data_set(Ecore_Event_Handler *eh, const void *data);
+        [ :ecore_event_handler_data_set, [ :ecore_event_handler, :pointer ], :pointer ],
         # EAPI int ecore_event_type_new(void);
         [ :ecore_event_type_new, [  ], :int ],
-        # EAPI Ecore_Event_Filter * ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data);
-        [ :ecore_event_filter_add, [ :ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :void_p ], :ecore_event_filter_p ],
-        # EAPI void * ecore_event_filter_del(Ecore_Event_Filter *ef);
-        [ :ecore_event_filter_del, [ :ecore_event_filter_p ], :void_p ],
+        # EAPI Ecore_Event_Filter *ecore_event_filter_add(Ecore_Data_Cb func_start, Ecore_Filter_Cb func_filter, Ecore_End_Cb func_end, const void *data);
+        [ :ecore_event_filter_add, [ :ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :pointer ], :ecore_event_filter ],
+        # EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef);
+        [ :ecore_event_filter_del, [ :ecore_event_filter ], :pointer ],
         # EAPI int ecore_event_current_type_get(void);
         [ :ecore_event_current_type_get, [  ], :int ],
-        # EAPI void * ecore_event_current_event_get(void);
-        [ :ecore_event_current_event_get, [  ], :void_p ],
+        # EAPI void *ecore_event_current_event_get(void);
+        [ :ecore_event_current_event_get, [  ], :pointer ],
         # EAPI void ecore_exe_run_priority_set(int pri);
         [ :ecore_exe_run_priority_set, [ :int ], :void ],
         # EAPI int ecore_exe_run_priority_get(void);
         [ :ecore_exe_run_priority_get, [  ], :int ],
-        # EAPI Ecore_Exe * ecore_exe_run(const char *exe_cmd, const void *data);
-        [ :ecore_exe_run, [ :string, :void_p ], :ecore_exe_p ],
-        # EAPI Ecore_Exe * ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data);
-        [ :ecore_exe_pipe_run, [ :string, :ecore_exe_flags, :void_p ], :ecore_exe_p ],
+        # EAPI Ecore_Exe *ecore_exe_run(const char *exe_cmd, const void *data);
+        [ :ecore_exe_run, [ :string, :pointer ], :ecore_exe ],
+        # EAPI Ecore_Exe *ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data);
+        [ :ecore_exe_pipe_run, [ :string, :ecore_exe_flags, :pointer ], :ecore_exe ],
         # EAPI void ecore_exe_callback_pre_free_set(Ecore_Exe *exe, Ecore_Exe_Cb func);
-        [ :ecore_exe_callback_pre_free_set, [ :ecore_exe_p, :ecore_exe_cb ], :void ],
+        [ :ecore_exe_callback_pre_free_set, [ :ecore_exe, :ecore_exe_cb ], :void ],
         # EAPI Eina_Bool ecore_exe_send(Ecore_Exe *exe, const void *data, int size);
-        [ :ecore_exe_send, [ :ecore_exe_p, :void_p, :int ], :eina_bool ],
+        [ :ecore_exe_send, [ :ecore_exe, :pointer, :int ], :bool ],
         # EAPI void ecore_exe_close_stdin(Ecore_Exe *exe);
-        [ :ecore_exe_close_stdin, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_close_stdin, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_auto_limits_set(Ecore_Exe *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
-        [ :ecore_exe_auto_limits_set, [ :ecore_exe_p, :int, :int, :int, :int ], :void ],
-        # EAPI Ecore_Exe_Event_Data * ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags);
-        [ :ecore_exe_event_data_get, [ :ecore_exe_p, :ecore_exe_flags ], :ecore_exe_event_data_p ],
+        [ :ecore_exe_auto_limits_set, [ :ecore_exe, :int, :int, :int, :int ], :void ],
+        # EAPI Ecore_Exe_Event_Data *ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags);
+        [ :ecore_exe_event_data_get, [ :ecore_exe, :ecore_exe_flags ], :ecore_exe_event_data ],
         # EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data);
-        [ :ecore_exe_event_data_free, [ :ecore_exe_event_data_p ], :void ],
-        # EAPI void * ecore_exe_free(Ecore_Exe *exe);
-        [ :ecore_exe_free, [ :ecore_exe_p ], :void_p ],
+        [ :ecore_exe_event_data_free, [ :ecore_exe_event_data ], :void ],
+        # EAPI void *ecore_exe_free(Ecore_Exe *exe);
+        [ :ecore_exe_free, [ :ecore_exe ], :pointer ],
         # EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe);
-        [ :ecore_exe_pid_get, [ :ecore_exe_p ], :ulong ],
+        [ :ecore_exe_pid_get, [ :ecore_exe ], :ulong ],
         # EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag);
-        [ :ecore_exe_tag_set, [ :ecore_exe_p, :string ], :void ],
-        # EAPI const char * ecore_exe_tag_get(const Ecore_Exe *exe);
-        [ :ecore_exe_tag_get, [ :ecore_exe_p ], :string ],
-        # EAPI const char * ecore_exe_cmd_get(const Ecore_Exe *exe);
-        [ :ecore_exe_cmd_get, [ :ecore_exe_p ], :string ],
-        # EAPI void * ecore_exe_data_get(const Ecore_Exe *exe);
-        [ :ecore_exe_data_get, [ :ecore_exe_p ], :void_p ],
-        # EAPI void * ecore_exe_data_set(Ecore_Exe *exe, void *data);
-        [ :ecore_exe_data_set, [ :ecore_exe_p, :void_p ], :void_p ],
+        [ :ecore_exe_tag_set, [ :ecore_exe, :string ], :void ],
+        # EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe);
+        [ :ecore_exe_tag_get, [ :ecore_exe ], :string ],
+        # EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe);
+        [ :ecore_exe_cmd_get, [ :ecore_exe ], :string ],
+        # EAPI void *ecore_exe_data_get(const Ecore_Exe *exe);
+        [ :ecore_exe_data_get, [ :ecore_exe ], :pointer ],
+        # EAPI void *ecore_exe_data_set(Ecore_Exe *exe, void *data);
+        [ :ecore_exe_data_set, [ :ecore_exe, :pointer ], :pointer ],
         # EAPI Ecore_Exe_Flags ecore_exe_flags_get(const Ecore_Exe *exe);
-        [ :ecore_exe_flags_get, [ :ecore_exe_p ], :ecore_exe_flags ],
+        [ :ecore_exe_flags_get, [ :ecore_exe ], :ecore_exe_flags ],
         # EAPI void ecore_exe_pause(Ecore_Exe *exe);
-        [ :ecore_exe_pause, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_pause, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_continue(Ecore_Exe *exe);
-        [ :ecore_exe_continue, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_continue, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_interrupt(Ecore_Exe *exe);
-        [ :ecore_exe_interrupt, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_interrupt, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_quit(Ecore_Exe *exe);
-        [ :ecore_exe_quit, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_quit, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_terminate(Ecore_Exe *exe);
-        [ :ecore_exe_terminate, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_terminate, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_kill(Ecore_Exe *exe);
-        [ :ecore_exe_kill, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_kill, [ :ecore_exe ], :void ],
         # EAPI void ecore_exe_signal(Ecore_Exe *exe, int num);
-        [ :ecore_exe_signal, [ :ecore_exe_p, :int ], :void ],
+        [ :ecore_exe_signal, [ :ecore_exe, :int ], :void ],
         # EAPI void ecore_exe_hup(Ecore_Exe *exe);
-        [ :ecore_exe_hup, [ :ecore_exe_p ], :void ],
-        # EAPI Ecore_Fd_Handler * ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data);
-        [ :ecore_main_fd_handler_add, [ :int, :ecore_fd_handler_flags, :ecore_fd_cb, :void_p, :ecore_fd_cb, :void_p ], :ecore_fd_handler_p ],
+        [ :ecore_exe_hup, [ :ecore_exe ], :void ],
+        # EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, Ecore_Fd_Cb func, const void *data, Ecore_Fd_Cb buf_func, const void *buf_data);
+        [ :ecore_main_fd_handler_add, [ :int, :ecore_fd_handler_flags, :ecore_fd_cb, :pointer, :ecore_fd_cb, :pointer ], :ecore_fd_handler ],
         # EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data);
-        [ :ecore_main_fd_handler_prepare_callback_set, [ :ecore_fd_handler_p, :ecore_fd_prep_cb, :void_p ], :void ],
-        # EAPI void * ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
-        [ :ecore_main_fd_handler_del, [ :ecore_fd_handler_p ], :void_p ],
+        [ :ecore_main_fd_handler_prepare_callback_set, [ :ecore_fd_handler, :ecore_fd_prep_cb, :pointer ], :void ],
+        # EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
+        [ :ecore_main_fd_handler_del, [ :ecore_fd_handler ], :pointer ],
         # EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
-        [ :ecore_main_fd_handler_fd_get, [ :ecore_fd_handler_p ], :int ],
+        [ :ecore_main_fd_handler_fd_get, [ :ecore_fd_handler ], :int ],
         # EAPI Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
-        [ :ecore_main_fd_handler_active_get, [ :ecore_fd_handler_p, :ecore_fd_handler_flags ], :eina_bool ],
+        [ :ecore_main_fd_handler_active_get, [ :ecore_fd_handler, :ecore_fd_handler_flags ], :bool ],
         # EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
-        [ :ecore_main_fd_handler_active_set, [ :ecore_fd_handler_p, :ecore_fd_handler_flags ], :void ],
-        # EAPI Ecore_Win32_Handler * ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data);
-        [ :ecore_main_win32_handler_add, [ :void_p, :ecore_win32_handle_cb, :void_p ], :ecore_win32_handler_p ],
-        # EAPI void * ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
-        [ :ecore_main_win32_handler_del, [ :ecore_win32_handler_p ], :void_p ],
+        [ :ecore_main_fd_handler_active_set, [ :ecore_fd_handler, :ecore_fd_handler_flags ], :void ],
+        # EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Win32_Handle_Cb func, const void *data);
+        [ :ecore_main_win32_handler_add, [ :pointer, :ecore_win32_handle_cb, :pointer ], :ecore_win32_handler ],
+        # EAPI void *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
+        [ :ecore_main_win32_handler_del, [ :ecore_win32_handler ], :pointer ],
         # EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
         [ :ecore_poller_poll_interval_set, [ :ecore_poller_type, :double ], :void ],
         # EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
         [ :ecore_poller_poll_interval_get, [ :ecore_poller_type ], :double ],
         # EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval);
-        [ :ecore_poller_poller_interval_set, [ :ecore_poller_p, :int ], :eina_bool ],
+        [ :ecore_poller_poller_interval_set, [ :ecore_poller, :int ], :bool ],
         # EAPI int ecore_poller_poller_interval_get(Ecore_Poller *poller);
-        [ :ecore_poller_poller_interval_get, [ :ecore_poller_p ], :int ],
-        # EAPI Ecore_Poller * ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
-        [ :ecore_poller_add, [ :ecore_poller_type, :int, :ecore_task_cb, :void_p ], :ecore_poller_p ],
+        [ :ecore_poller_poller_interval_get, [ :ecore_poller ], :int ],
+        # EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
+        [ :ecore_poller_add, [ :ecore_poller_type, :int, :ecore_task_cb, :pointer ], :ecore_poller ],
         # EAPI void *ecore_poller_del(Ecore_Poller *poller);
-        [ :ecore_poller_del, [ :ecore_poller_p ], :void_p ],
+        [ :ecore_poller_del, [ :ecore_poller ], :pointer ],
         # EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_animator_add, [ :ecore_task_cb, :void_p ], :ecore_animator_p ],
-        # EAPI Ecore_Animator * ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
-        [ :ecore_animator_timeline_add, [ :double, :ecore_timeline_cb, :void_p ], :ecore_animator_p ],
-        # EAPI void * ecore_animator_del(Ecore_Animator *animator);
-        [ :ecore_animator_del, [ :ecore_animator_p ], :void_p ],
+        [ :ecore_animator_add, [ :ecore_task_cb, :pointer ], :ecore_animator ],
+        # EAPI Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
+        [ :ecore_animator_timeline_add, [ :double, :ecore_timeline_cb, :pointer ], :ecore_animator ],
+        # EAPI void *ecore_animator_del(Ecore_Animator *animator);
+        [ :ecore_animator_del, [ :ecore_animator ], :pointer ],
         # EAPI void ecore_animator_freeze(Ecore_Animator *animator);
-        [ :ecore_animator_freeze, [ :ecore_animator_p ], :void ],
+        [ :ecore_animator_freeze, [ :ecore_animator ], :void ],
         # EAPI void ecore_animator_thaw(Ecore_Animator *animator);
-        [ :ecore_animator_thaw, [ :ecore_animator_p ], :void ],
+        [ :ecore_animator_thaw, [ :ecore_animator ], :void ],
         # EAPI void ecore_animator_frametime_set(double frametime);
         [ :ecore_animator_frametime_set, [ :double ], :void ],
         # EAPI double ecore_animator_frametime_get(void);
@@ -311,9 +286,9 @@ module Efl
         # EAPI Ecore_Animator_Source ecore_animator_source_get(void);
         [ :ecore_animator_source_get, [  ], :ecore_animator_source ],
         # EAPI void ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func, const void *data);
-        [ :ecore_animator_custom_source_tick_begin_callback_set, [ :ecore_cb, :void_p ], :void ],
+        [ :ecore_animator_custom_source_tick_begin_callback_set, [ :ecore_cb, :pointer ], :void ],
         # EAPI void ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func, const void *data);
-        [ :ecore_animator_custom_source_tick_end_callback_set, [ :ecore_cb, :void_p ], :void ],
+        [ :ecore_animator_custom_source_tick_end_callback_set, [ :ecore_cb, :pointer ], :void ],
         # EAPI void ecore_animator_custom_tick(void);
         [ :ecore_animator_custom_tick, [  ], :void ],
         # EAPI double ecore_time_get(void);
@@ -322,56 +297,59 @@ module Efl
         [ :ecore_time_unix_get, [  ], :double ],
         # EAPI double ecore_loop_time_get(void);
         [ :ecore_loop_time_get, [  ], :double ],
-        # EAPI Ecore_Timer * ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
-        [ :ecore_timer_add, [ :double, :ecore_task_cb, :void_p ], :ecore_timer_p ],
-        # EAPI Ecore_Timer * ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
-        [ :ecore_timer_loop_add, [ :double, :ecore_task_cb, :void_p ], :ecore_timer_p ],
-        # EAPI void * ecore_timer_del(Ecore_Timer *timer);
-        [ :ecore_timer_del, [ :ecore_timer_p ], :void_p ],
+        # EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
+        [ :ecore_timer_add, [ :double, :ecore_task_cb, :pointer ], :ecore_timer ],
+        # EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
+        [ :ecore_timer_loop_add, [ :double, :ecore_task_cb, :pointer ], :ecore_timer ],
+        # EAPI void *ecore_timer_del(Ecore_Timer *timer);
+        [ :ecore_timer_del, [ :ecore_timer ], :pointer ],
         # EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in);
-        [ :ecore_timer_interval_set, [ :ecore_timer_p, :double ], :void ],
+        [ :ecore_timer_interval_set, [ :ecore_timer, :double ], :void ],
         # EAPI double ecore_timer_interval_get(Ecore_Timer *timer);
-        [ :ecore_timer_interval_get, [ :ecore_timer_p ], :double ],
+        [ :ecore_timer_interval_get, [ :ecore_timer ], :double ],
         # EAPI void ecore_timer_freeze(Ecore_Timer *timer);
-        [ :ecore_timer_freeze, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_freeze, [ :ecore_timer ], :void ],
         # EAPI void ecore_timer_thaw(Ecore_Timer *timer);
-        [ :ecore_timer_thaw, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_thaw, [ :ecore_timer ], :void ],
         # EAPI void ecore_timer_delay(Ecore_Timer *timer, double add);
-        [ :ecore_timer_delay, [ :ecore_timer_p, :double ], :void ],
+        [ :ecore_timer_delay, [ :ecore_timer, :double ], :void ],
+        # EAPI void ecore_timer_reset(Ecore_Timer *timer);
+        [ :ecore_timer_reset, [ :ecore_timer ], :void ],
         # EAPI double ecore_timer_pending_get(Ecore_Timer *timer);
-        [ :ecore_timer_pending_get, [ :ecore_timer_p ], :double ],
+        [ :ecore_timer_pending_get, [ :ecore_timer ], :double ],
         # EAPI double ecore_timer_precision_get(void);
         [ :ecore_timer_precision_get, [  ], :double ],
         # EAPI void ecore_timer_precision_set(double precision);
         [ :ecore_timer_precision_set, [ :double ], :void ],
-        # EAPI char * ecore_timer_dump(void);
+        # EAPI char *ecore_timer_dump(void);
         [ :ecore_timer_dump, [  ], :string ],
-        # EAPI Ecore_Idler * ecore_idler_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idler_add, [ :ecore_task_cb, :void_p ], :ecore_idler_p ],
-        # EAPI void * ecore_idler_del(Ecore_Idler *idler);
-        [ :ecore_idler_del, [ :ecore_idler_p ], :void_p ],
-        # EAPI Ecore_Idle_Enterer * ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idle_enterer_add, [ :ecore_task_cb, :void_p ], :ecore_idle_enterer_p ],
-        # EAPI Ecore_Idle_Enterer * ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idle_enterer_before_add, [ :ecore_task_cb, :void_p ], :ecore_idle_enterer_p ],
-        # EAPI void * ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
-        [ :ecore_idle_enterer_del, [ :ecore_idle_enterer_p ], :void_p ],
-        # EAPI Ecore_Idle_Exiter * ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
-        [ :ecore_idle_exiter_add, [ :ecore_task_cb, :void_p ], :ecore_idle_exiter_p ],
-        # EAPI void * ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
-        [ :ecore_idle_exiter_del, [ :ecore_idle_exiter_p ], :void_p ],
-        # 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 ],
+        # EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idler_add, [ :ecore_task_cb, :pointer ], :ecore_idler ],
+        # EAPI void *ecore_idler_del(Ecore_Idler *idler);
+        [ :ecore_idler_del, [ :ecore_idler ], :pointer ],
+        # EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idle_enterer_add, [ :ecore_task_cb, :pointer ], :ecore_idle_enterer ],
+        # EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idle_enterer_before_add, [ :ecore_task_cb, :pointer ], :ecore_idle_enterer ],
+        # EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
+        [ :ecore_idle_enterer_del, [ :ecore_idle_enterer ], :pointer ],
+        # EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
+        [ :ecore_idle_exiter_add, [ :ecore_task_cb, :pointer ], :ecore_idle_exiter ],
+        # EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
+        [ :ecore_idle_exiter_del, [ :ecore_idle_exiter ], :pointer ],
+        # 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, :pointer ], :ecore_thread ],
+        # 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, :pointer, :bool ],
+            :ecore_thread ],
         # EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
-        [ :ecore_thread_cancel, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_cancel, [ :ecore_thread ], :bool ],
         # EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread);
-        [ :ecore_thread_check, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_check, [ :ecore_thread ], :bool ],
         # EAPI Eina_Bool ecore_thread_feedback(Ecore_Thread *thread, const void *msg_data);
-        [ :ecore_thread_feedback, [ :ecore_thread_p, :void_p ], :eina_bool ],
+        [ :ecore_thread_feedback, [ :ecore_thread, :pointer ], :bool ],
         # EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread);
-        [ :ecore_thread_reschedule, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_reschedule, [ :ecore_thread ], :bool ],
         # EAPI int ecore_thread_active_get(void);
         [ :ecore_thread_active_get, [  ], :int ],
         # EAPI int ecore_thread_pending_get(void);
@@ -389,47 +367,47 @@ module Efl
         # EAPI int ecore_thread_available_get(void);
         [ :ecore_thread_available_get, [  ], :int ],
         # EAPI Eina_Bool ecore_thread_local_data_add(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct);
-        [ :ecore_thread_local_data_add, [ :ecore_thread_p, :string, :void_p, :eina_free_cb, :eina_bool ], :eina_bool ],
-        # EAPI void * ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb);
-        [ :ecore_thread_local_data_set, [ :ecore_thread_p, :string, :void_p, :eina_free_cb ], :void_p ],
-        # EAPI void * ecore_thread_local_data_find(Ecore_Thread *thread, const char *key);
-        [ :ecore_thread_local_data_find, [ :ecore_thread_p, :string ], :void_p ],
+        [ :ecore_thread_local_data_add, [ :ecore_thread, :string, :pointer, :eina_free_cb, :bool ], :bool ],
+        # EAPI void *ecore_thread_local_data_set(Ecore_Thread *thread, const char *key, void *value, Eina_Free_Cb cb);
+        [ :ecore_thread_local_data_set, [ :ecore_thread, :string, :pointer, :eina_free_cb ], :pointer ],
+        # EAPI void *ecore_thread_local_data_find(Ecore_Thread *thread, const char *key);
+        [ :ecore_thread_local_data_find, [ :ecore_thread, :string ], :pointer ],
         # EAPI Eina_Bool ecore_thread_local_data_del(Ecore_Thread *thread, const char *key);
-        [ :ecore_thread_local_data_del, [ :ecore_thread_p, :string ], :eina_bool ],
+        [ :ecore_thread_local_data_del, [ :ecore_thread, :string ], :bool ],
         # EAPI Eina_Bool ecore_thread_global_data_add(const char *key, void *value, Eina_Free_Cb cb, Eina_Bool direct);
-        [ :ecore_thread_global_data_add, [ :string, :void_p, :eina_free_cb, :eina_bool ], :eina_bool ],
-        # EAPI void * ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb);
-        [ :ecore_thread_global_data_set, [ :string, :void_p, :eina_free_cb ], :void_p ],
-        # EAPI void * ecore_thread_global_data_find(const char *key);
-        [ :ecore_thread_global_data_find, [ :string ], :void_p ],
+        [ :ecore_thread_global_data_add, [ :string, :pointer, :eina_free_cb, :bool ], :bool ],
+        # EAPI void *ecore_thread_global_data_set(const char *key, void *value, Eina_Free_Cb cb);
+        [ :ecore_thread_global_data_set, [ :string, :pointer, :eina_free_cb ], :pointer ],
+        # EAPI void *ecore_thread_global_data_find(const char *key);
+        [ :ecore_thread_global_data_find, [ :string ], :pointer ],
         # EAPI Eina_Bool ecore_thread_global_data_del(const char *key);
-        [ :ecore_thread_global_data_del, [ :string ], :eina_bool ],
-        # EAPI void * ecore_thread_global_data_wait(const char *key, double seconds);
-        [ :ecore_thread_global_data_wait, [ :string, :double ], :void_p ],
-        # EAPI Ecore_Pipe * ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
-        [ :ecore_pipe_add, [ :ecore_pipe_cb, :void_p ], :ecore_pipe_p ],
-        # EAPI void * ecore_pipe_del(Ecore_Pipe *p);
-        [ :ecore_pipe_del, [ :ecore_pipe_p ], :void_p ],
+        [ :ecore_thread_global_data_del, [ :string ], :bool ],
+        # EAPI void *ecore_thread_global_data_wait(const char *key, double seconds);
+        [ :ecore_thread_global_data_wait, [ :string, :double ], :pointer ],
+        # EAPI Ecore_Pipe *ecore_pipe_add(Ecore_Pipe_Cb handler, const void *data);
+        [ :ecore_pipe_add, [ :ecore_pipe_cb, :pointer ], :ecore_pipe ],
+        # EAPI void *ecore_pipe_del(Ecore_Pipe *p);
+        [ :ecore_pipe_del, [ :ecore_pipe ], :pointer ],
         # EAPI Eina_Bool ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes);
-        [ :ecore_pipe_write, [ :ecore_pipe_p, :void_p, :uint ], :eina_bool ],
+        [ :ecore_pipe_write, [ :ecore_pipe, :pointer, :uint ], :bool ],
         # EAPI void ecore_pipe_write_close(Ecore_Pipe *p);
-        [ :ecore_pipe_write_close, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_write_close, [ :ecore_pipe ], :void ],
         # EAPI void ecore_pipe_read_close(Ecore_Pipe *p);
-        [ :ecore_pipe_read_close, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_read_close, [ :ecore_pipe ], :void ],
         # EAPI void ecore_pipe_thaw(Ecore_Pipe *p);
-        [ :ecore_pipe_thaw, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_thaw, [ :ecore_pipe ], :void ],
         # EAPI void ecore_pipe_freeze(Ecore_Pipe *p);
-        [ :ecore_pipe_freeze, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_freeze, [ :ecore_pipe ], :void ],
         # EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
-        [ :ecore_pipe_wait, [ :ecore_pipe_p, :int, :double ], :int ],
-        # EAPI Ecore_Job * ecore_job_add(Ecore_Cb func, const void *data);
-        [ :ecore_job_add, [ :ecore_cb, :void_p ], :ecore_job_p ],
-        # EAPI void * ecore_job_del(Ecore_Job *job);
-        [ :ecore_job_del, [ :ecore_job_p ], :void_p ],
+        [ :ecore_pipe_wait, [ :ecore_pipe, :int, :double ], :int ],
+        # EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
+        [ :ecore_job_add, [ :ecore_cb, :pointer ], :ecore_job ],
+        # EAPI void *ecore_job_del(Ecore_Job *job);
+        [ :ecore_job_del, [ :ecore_job ], :pointer ],
         # EAPI void ecore_app_args_set(int argc, const char **argv);
-        [ :ecore_app_args_set, [ :int, :string_array ], :void ],
+        [ :ecore_app_args_set, [ :int, :pointer ], :void ],
         # EAPI void ecore_app_args_get(int *argc, char ***argv);
-        [ :ecore_app_args_get, [ :int_p, :string_array_p ], :void ],
+        [ :ecore_app_args_get, [ :pointer, :pointer ], :void ],
         # EAPI void ecore_app_restart(void);
         [ :ecore_app_restart, [  ], :void ],
         # EAPI void ecore_throttle_adjust(double amount);