update ecore_* native, and specs

9 files changed, 403 insertions, 404 deletions

diff --git a/lib/efl/ecore.rb b/lib/efl/ecore.rb
index 5216763..cf0a865 100644
--- a/lib/efl/ecore.rb
+++ b/lib/efl/ecore.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/ecore'
 #
 module Efl
diff --git a/lib/efl/ecore_evas.rb b/lib/efl/ecore_evas.rb
index 09ff03c..d5e01b0 100644
--- a/lib/efl/ecore_evas.rb
+++ b/lib/efl/ecore_evas.rb
@@ -1,6 +1,8 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
+require 'efl/evas'
 require 'efl/native/ecore_evas'
 #
 module Efl
diff --git a/lib/efl/ecore_getopt.rb b/lib/efl/ecore_getopt.rb
index e403e22..bda40af 100644
--- a/lib/efl/ecore_getopt.rb
+++ b/lib/efl/ecore_getopt.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/ecore_getopt'
 #
 module Efl
@@ -9,16 +10,16 @@ module Efl
         #
         class EcoreGetoptValue < FFI::Union
             layout  :strp,          :pointer,
-                    :boolp,         :eina_bool_p,
-                    :shortp,        :short_p,
-                    :intp,          :int_p,
-                    :longp,         :long_p,
-                    :ushortp,       :ushort_p,
-                    :uintp,         :uint_p,
-                    :ulongp,        :ulong_p,
-                    :doublep,       :double_p,
-                    :listp,         :eina_list_p,
-                    :ptrp,          :void_p
+                    :boolp,         :pointer,
+                    :shortp,        :pointer,
+                    :intp,          :pointer,
+                    :longp,         :pointer,
+                    :ushortp,       :pointer,
+                    :uintp,         :pointer,
+                    :ulongp,        :pointer,
+                    :doublep,       :pointer,
+                    :listp,         :pointer,
+                    :ptrp,          :pointer
 
             def value_ptr idx
                 Native::EcoreGetoptValue.new to_ptr+(idx*Native::EcoreGetoptValue.size)
@@ -43,7 +44,7 @@ module Efl
                     :def,           EcoreGetoptDescStoreDef
         end
         #
-        callback :ecore_getopt_desc_cb, [:ecore_getopt_p, :ecore_getopt_desc_p, :string, :pointer, :ecore_getopt_value_p ], :eina_bool
+        callback :ecore_getopt_desc_cb, [:pointer, :pointer, :string, :pointer, :pointer ], :eina_bool
         #
         class EcoreGetoptDescCallback < FFI::Struct
             layout  :func,          :ecore_getopt_desc_cb,
diff --git a/lib/efl/ecore_input.rb b/lib/efl/ecore_input.rb
index a317039..3677432 100644
--- a/lib/efl/ecore_input.rb
+++ b/lib/efl/ecore_input.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'efl'
 require 'efl/native/ecore_input'
 #
 module Efl
diff --git a/lib/efl/native/ecore.rb b/lib/efl/native/ecore.rb
index 683904b..4abdea0 100644
--- a/lib/efl/native/ecore.rb
+++ b/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, &block; 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 ], :eina_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 ], :eina_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 ], :eina_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, :pointer ], :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, :pointer ], :eina_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, :pointer ], :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, :pointer ], :eina_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 ], :eina_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, :pointer ], :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, :pointer, :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, :pointer
         # EAPI extern int ECORE_EXE_EVENT_ADD;
         attach_variable :ECORE_EXE_EVENT_ADD, :int
         # EAPI extern int ECORE_EXE_EVENT_DEL;
@@ -169,9 +144,9 @@ 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 ],
         # EAPI void ecore_main_loop_glib_always_integrate_disable(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 ],
+        [ :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, :void_p ], :void_p ],
+        [ :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 ],
+        [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :pointer ], :pointer ],
         # EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
-        [ :ecore_event_handler_del, [ :ecore_event_handler_p ], :void_p ],
+        [ :ecore_event_handler_del, [ :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_event_add, [ :int, :pointer, :ecore_end_cb, :pointer ], :pointer ],
         # EAPI void *ecore_event_del(Ecore_Event *event);
-        [ :ecore_event_del, [ :ecore_event_p ], :void_p ],
+        [ :ecore_event_del, [ :pointer ], :pointer ],
         # EAPI void *ecore_event_handler_data_get(Ecore_Event_Handler *eh);
-        [ :ecore_event_handler_data_get, [ :ecore_event_handler_p ], :void_p ],
+        [ :ecore_event_handler_data_get, [ :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_event_handler_data_set, [ :pointer, :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 ],
+        [ :ecore_event_filter_add, [ :ecore_data_cb, :ecore_filter_cb, :ecore_end_cb, :pointer ], :pointer ],
         # EAPI void *ecore_event_filter_del(Ecore_Event_Filter *ef);
-        [ :ecore_event_filter_del, [ :ecore_event_filter_p ], :void_p ],
+        [ :ecore_event_filter_del, [ :pointer ], :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 ],
+        [ :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 ],
+        [ :ecore_exe_run, [ :string, :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_exe_pipe_run, [ :string, :ecore_exe_flags, :pointer ], :pointer ],
         # 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, [ :pointer, :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, [ :pointer, :pointer, :int ], :eina_bool ],
         # EAPI void ecore_exe_close_stdin(Ecore_Exe *exe);
-        [ :ecore_exe_close_stdin, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_close_stdin, [ :pointer ], :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 ],
+        [ :ecore_exe_auto_limits_set, [ :pointer, :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_event_data_get, [ :pointer, :ecore_exe_flags ], :pointer ],
         # EAPI void ecore_exe_event_data_free(Ecore_Exe_Event_Data *data);
-        [ :ecore_exe_event_data_free, [ :ecore_exe_event_data_p ], :void ],
+        [ :ecore_exe_event_data_free, [ :pointer ], :void ],
         # EAPI void *ecore_exe_free(Ecore_Exe *exe);
-        [ :ecore_exe_free, [ :ecore_exe_p ], :void_p ],
+        [ :ecore_exe_free, [ :pointer ], :pointer ],
         # EAPI pid_t ecore_exe_pid_get(const Ecore_Exe *exe);
-        [ :ecore_exe_pid_get, [ :ecore_exe_p ], :ulong ],
+        [ :ecore_exe_pid_get, [ :pointer ], :ulong ],
         # EAPI void ecore_exe_tag_set(Ecore_Exe *exe, const char *tag);
-        [ :ecore_exe_tag_set, [ :ecore_exe_p, :string ], :void ],
+        [ :ecore_exe_tag_set, [ :pointer, :string ], :void ],
         # EAPI const char *ecore_exe_tag_get(const Ecore_Exe *exe);
-        [ :ecore_exe_tag_get, [ :ecore_exe_p ], :string ],
+        [ :ecore_exe_tag_get, [ :pointer ], :string ],
         # EAPI const char *ecore_exe_cmd_get(const Ecore_Exe *exe);
-        [ :ecore_exe_cmd_get, [ :ecore_exe_p ], :string ],
+        [ :ecore_exe_cmd_get, [ :pointer ], :string ],
         # EAPI void *ecore_exe_data_get(const Ecore_Exe *exe);
-        [ :ecore_exe_data_get, [ :ecore_exe_p ], :void_p ],
+        [ :ecore_exe_data_get, [ :pointer ], :pointer ],
         # EAPI void *ecore_exe_data_set(Ecore_Exe *exe, void *data);
-        [ :ecore_exe_data_set, [ :ecore_exe_p, :void_p ], :void_p ],
+        [ :ecore_exe_data_set, [ :pointer, :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, [ :pointer ], :ecore_exe_flags ],
         # EAPI void ecore_exe_pause(Ecore_Exe *exe);
-        [ :ecore_exe_pause, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_pause, [ :pointer ], :void ],
         # EAPI void ecore_exe_continue(Ecore_Exe *exe);
-        [ :ecore_exe_continue, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_continue, [ :pointer ], :void ],
         # EAPI void ecore_exe_interrupt(Ecore_Exe *exe);
-        [ :ecore_exe_interrupt, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_interrupt, [ :pointer ], :void ],
         # EAPI void ecore_exe_quit(Ecore_Exe *exe);
-        [ :ecore_exe_quit, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_quit, [ :pointer ], :void ],
         # EAPI void ecore_exe_terminate(Ecore_Exe *exe);
-        [ :ecore_exe_terminate, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_terminate, [ :pointer ], :void ],
         # EAPI void ecore_exe_kill(Ecore_Exe *exe);
-        [ :ecore_exe_kill, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_kill, [ :pointer ], :void ],
         # EAPI void ecore_exe_signal(Ecore_Exe *exe, int num);
-        [ :ecore_exe_signal, [ :ecore_exe_p, :int ], :void ],
+        [ :ecore_exe_signal, [ :pointer, :int ], :void ],
         # EAPI void ecore_exe_hup(Ecore_Exe *exe);
-        [ :ecore_exe_hup, [ :ecore_exe_p ], :void ],
+        [ :ecore_exe_hup, [ :pointer ], :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_main_fd_handler_add, [ :int, :ecore_fd_handler_flags, :ecore_fd_cb, :pointer, :ecore_fd_cb, :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_main_fd_handler_prepare_callback_set, [ :pointer, :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_p ], :void_p ],
+        [ :ecore_main_fd_handler_del, [ :pointer ], :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, [ :pointer ], :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, [ :pointer, :ecore_fd_handler_flags ], :eina_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 ],
+        [ :ecore_main_fd_handler_active_set, [ :pointer, :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 ],
+        [ :ecore_main_win32_handler_add, [ :pointer, :ecore_win32_handle_cb, :pointer ], :pointer ],
         # 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_win32_handler_del, [ :pointer ], :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, [ :pointer, :int ], :eina_bool ],
         # EAPI int ecore_poller_poller_interval_get(Ecore_Poller *poller);
-        [ :ecore_poller_poller_interval_get, [ :ecore_poller_p ], :int ],
+        [ :ecore_poller_poller_interval_get, [ :pointer ], :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_add, [ :ecore_poller_type, :int, :ecore_task_cb, :pointer ], :pointer ],
         # EAPI void *ecore_poller_del(Ecore_Poller *poller);
-        [ :ecore_poller_del, [ :ecore_poller_p ], :void_p ],
+        [ :ecore_poller_del, [ :pointer ], :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 ],
+        [ :ecore_animator_add, [ :ecore_task_cb, :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_animator_timeline_add, [ :double, :ecore_timeline_cb, :pointer ], :pointer ],
         # EAPI void *ecore_animator_del(Ecore_Animator *animator);
-        [ :ecore_animator_del, [ :ecore_animator_p ], :void_p ],
+        [ :ecore_animator_del, [ :pointer ], :pointer ],
         # EAPI void ecore_animator_freeze(Ecore_Animator *animator);
-        [ :ecore_animator_freeze, [ :ecore_animator_p ], :void ],
+        [ :ecore_animator_freeze, [ :pointer ], :void ],
         # EAPI void ecore_animator_thaw(Ecore_Animator *animator);
-        [ :ecore_animator_thaw, [ :ecore_animator_p ], :void ],
+        [ :ecore_animator_thaw, [ :pointer ], :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);
@@ -323,25 +298,25 @@ module Efl
         # 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 ],
+        [ :ecore_timer_add, [ :double, :ecore_task_cb, :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_timer_loop_add, [ :double, :ecore_task_cb, :pointer ], :pointer ],
         # EAPI void *ecore_timer_del(Ecore_Timer *timer);
-        [ :ecore_timer_del, [ :ecore_timer_p ], :void_p ],
+        [ :ecore_timer_del, [ :pointer ], :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, [ :pointer, :double ], :void ],
         # EAPI double ecore_timer_interval_get(Ecore_Timer *timer);
-        [ :ecore_timer_interval_get, [ :ecore_timer_p ], :double ],
+        [ :ecore_timer_interval_get, [ :pointer ], :double ],
         # EAPI void ecore_timer_freeze(Ecore_Timer *timer);
-        [ :ecore_timer_freeze, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_freeze, [ :pointer ], :void ],
         # EAPI void ecore_timer_thaw(Ecore_Timer *timer);
-        [ :ecore_timer_thaw, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_thaw, [ :pointer ], :void ],
         # EAPI void ecore_timer_delay(Ecore_Timer *timer, double add);
-        [ :ecore_timer_delay, [ :ecore_timer_p, :double ], :void ],
+        [ :ecore_timer_delay, [ :pointer, :double ], :void ],
         # EAPI void ecore_timer_reset(Ecore_Timer *timer);
-        [ :ecore_timer_reset, [ :ecore_timer_p ], :void ],
+        [ :ecore_timer_reset, [ :pointer ], :void ],
         # EAPI double ecore_timer_pending_get(Ecore_Timer *timer);
-        [ :ecore_timer_pending_get, [ :ecore_timer_p ], :double ],
+        [ :ecore_timer_pending_get, [ :pointer ], :double ],
         # EAPI double ecore_timer_precision_get(void);
         [ :ecore_timer_precision_get, [  ], :double ],
         # EAPI void ecore_timer_precision_set(double precision);
@@ -349,31 +324,32 @@ module Efl
         # 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 ],
+        [ :ecore_idler_add, [ :ecore_task_cb, :pointer ], :pointer ],
         # EAPI void *ecore_idler_del(Ecore_Idler *idler);
-        [ :ecore_idler_del, [ :ecore_idler_p ], :void_p ],
+        [ :ecore_idler_del, [ :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_idle_enterer_add, [ :ecore_task_cb, :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_idle_enterer_before_add, [ :ecore_task_cb, :pointer ], :pointer ],
         # EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
-        [ :ecore_idle_enterer_del, [ :ecore_idle_enterer_p ], :void_p ],
+        [ :ecore_idle_enterer_del, [ :pointer ], :pointer ],
         # 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 ],
+        [ :ecore_idle_exiter_add, [ :ecore_task_cb, :pointer ], :pointer ],
         # EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
-        [ :ecore_idle_exiter_del, [ :ecore_idle_exiter_p ], :void_p ],
+        [ :ecore_idle_exiter_del, [ :pointer ], :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, :void_p ], :ecore_thread_p ],
+        [ :ecore_thread_run, [ :ecore_thread_cb, :ecore_thread_cb, :ecore_thread_cb, :pointer ], :pointer ],
         # 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, :pointer, :eina_bool ],
+            :pointer ],
         # EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
-        [ :ecore_thread_cancel, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_cancel, [ :pointer ], :eina_bool ],
         # EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread);
-        [ :ecore_thread_check, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_check, [ :pointer ], :eina_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, [ :pointer, :pointer ], :eina_bool ],
         # EAPI Eina_Bool ecore_thread_reschedule(Ecore_Thread *thread);
-        [ :ecore_thread_reschedule, [ :ecore_thread_p ], :eina_bool ],
+        [ :ecore_thread_reschedule, [ :pointer ], :eina_bool ],
         # EAPI int ecore_thread_active_get(void);
         [ :ecore_thread_active_get, [  ], :int ],
         # EAPI int ecore_thread_pending_get(void);
@@ -391,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 ],
+        [ :ecore_thread_local_data_add, [ :pointer, :string, :pointer, :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 ],
+        [ :ecore_thread_local_data_set, [ :pointer, :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_p, :string ], :void_p ],
+        [ :ecore_thread_local_data_find, [ :pointer, :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, [ :pointer, :string ], :eina_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 ],
+        [ :ecore_thread_global_data_add, [ :string, :pointer, :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 ],
+        [ :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 ], :void_p ],
+        [ :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 ],
+        [ :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, :void_p ], :ecore_pipe_p ],
+        [ :ecore_pipe_add, [ :ecore_pipe_cb, :pointer ], :pointer ],
         # EAPI void *ecore_pipe_del(Ecore_Pipe *p);
-        [ :ecore_pipe_del, [ :ecore_pipe_p ], :void_p ],
+        [ :ecore_pipe_del, [ :pointer ], :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, [ :pointer, :pointer, :uint ], :eina_bool ],
         # EAPI void ecore_pipe_write_close(Ecore_Pipe *p);
-        [ :ecore_pipe_write_close, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_write_close, [ :pointer ], :void ],
         # EAPI void ecore_pipe_read_close(Ecore_Pipe *p);
-        [ :ecore_pipe_read_close, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_read_close, [ :pointer ], :void ],
         # EAPI void ecore_pipe_thaw(Ecore_Pipe *p);
-        [ :ecore_pipe_thaw, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_thaw, [ :pointer ], :void ],
         # EAPI void ecore_pipe_freeze(Ecore_Pipe *p);
-        [ :ecore_pipe_freeze, [ :ecore_pipe_p ], :void ],
+        [ :ecore_pipe_freeze, [ :pointer ], :void ],
         # EAPI int ecore_pipe_wait(Ecore_Pipe *p, int message_count, double wait);
-        [ :ecore_pipe_wait, [ :ecore_pipe_p, :int, :double ], :int ],
+        [ :ecore_pipe_wait, [ :pointer, :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 ],
+        [ :ecore_job_add, [ :ecore_cb, :pointer ], :pointer ],
         # EAPI void *ecore_job_del(Ecore_Job *job);
-        [ :ecore_job_del, [ :ecore_job_p ], :void_p ],
+        [ :ecore_job_del, [ :pointer ], :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);
diff --git a/lib/efl/native/ecore_evas.rb b/lib/efl/native/ecore_evas.rb
index cb53c26..657bf27 100644
--- a/lib/efl/native/ecore_evas.rb
+++ b/lib/efl/native/ecore_evas.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EcoreEvas
         #
-        FCT_PREFIX = 'ecore_evas_'
+        FCT_PREFIX = 'ecore_evas_' 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, &block; 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
@@ -24,37 +23,35 @@ 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_opengl_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_ews, :ecore_evas_engine_psl1ght ]
+            :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_opengl_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_ews, :ecore_evas_engine_psl1ght, :ecore_evas_engine_wayland_shm, :ecore_evas_engine_wayland_egl ]
         # 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<<0,
+            :ecore_evas_object_associate_layer, 1<<1, :ecore_evas_object_associate_del, 1<<2 ]
         #
         # TYPEDEFS
         # typedef unsigned int Ecore_X_Window;
         typedef :uint, :ecore_x_window
         # typedef struct _Ecore_DirectFB_Window Ecore_DirectFB_Window;
         typedef :pointer, :ecore_directfb_window
-        typedef :pointer, :ecore_directfb_window_p
         # typedef struct _Ecore_Win32_Window Ecore_Win32_Window;
         typedef :pointer, :ecore_win32_window
-        typedef :pointer, :ecore_win32_window_p
         # typedef struct _Ecore_WinCE_Window Ecore_WinCE_Window;
         typedef :pointer, :ecore_wince_window
-        typedef :pointer, :ecore_wince_window_p
         # typedef struct _Ecore_Cocoa_Window Ecore_Cocoa_Window;
         typedef :pointer, :ecore_cocoa_window
         # typedef struct _Ecore_Evas Ecore_Evas;
         typedef :pointer, :ecore_evas
-        typedef :pointer, :ecore_evas_p
         #
         # CALLBACKS
         # void (*func) (Ecore_Evas *ee)
-        callback :ecore_evas_event_cb, [:ecore_evas_p], :void
+        callback :ecore_evas_cb, [ :pointer ], :void
         #
         # VARIABLES
         # EAPI extern int ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE;
@@ -109,354 +106,372 @@ module Efl
         # EAPI Eina_Bool ecore_evas_app_comp_sync_get(void);
         [ :ecore_evas_app_comp_sync_get, [  ], :eina_bool ],
         # EAPI Eina_List *ecore_evas_engines_get(void);
-        [ :ecore_evas_engines_get, [  ], :eina_list_p ],
+        [ :ecore_evas_engines_get, [  ], :pointer ],
         # EAPI void ecore_evas_engines_free(Eina_List *engines);
-        [ :ecore_evas_engines_free, [ :eina_list_p ], :void ],
+        [ :ecore_evas_engines_free, [ :pointer ], :void ],
         # EAPI Ecore_Evas *ecore_evas_new(const char *engine_name, int x, int y, int w, int h, const char *extra_options);
-        [ :ecore_evas_new, [ :string, :int, :int, :int, :int, :string ], :ecore_evas_p ],
+        [ :ecore_evas_new, [ :string, :int, :int, :int, :int, :string ], :pointer ],
         # EAPI void ecore_evas_alpha_set(Ecore_Evas *ee, Eina_Bool alpha);
-        [ :ecore_evas_alpha_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_alpha_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_alpha_get(const Ecore_Evas *ee);
-        [ :ecore_evas_alpha_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_alpha_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_transparent_set(Ecore_Evas *ee, Eina_Bool transparent);
-        [ :ecore_evas_transparent_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_transparent_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_transparent_get(const Ecore_Evas *ee);
-        [ :ecore_evas_transparent_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_transparent_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h);
-        [ :ecore_evas_geometry_get, [ :ecore_evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_request_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h);
-        [ :ecore_evas_request_geometry_get, [ :ecore_evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_request_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_focus_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_focus_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_focus_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_focus_get(const Ecore_Evas *ee);
-        [ :ecore_evas_focus_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_focus_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_iconified_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_iconified_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_iconified_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_iconified_get(const Ecore_Evas *ee);
-        [ :ecore_evas_iconified_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_iconified_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_borderless_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_borderless_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_borderless_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_borderless_get(const Ecore_Evas *ee);
-        [ :ecore_evas_borderless_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_borderless_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_fullscreen_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_fullscreen_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_fullscreen_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_fullscreen_get(const Ecore_Evas *ee);
-        [ :ecore_evas_fullscreen_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_fullscreen_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_ignore_events_set(Ecore_Evas *ee, Eina_Bool ignore);
-        [ :ecore_evas_ignore_events_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_ignore_events_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_ignore_events_get(const Ecore_Evas *ee);
-        [ :ecore_evas_ignore_events_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_ignore_events_get, [ :pointer ], :eina_bool ],
         # EAPI int ecore_evas_visibility_get(const Ecore_Evas *ee);
-        [ :ecore_evas_visibility_get, [ :ecore_evas_p ], :int ],
+        [ :ecore_evas_visibility_get, [ :pointer ], :int ],
         # EAPI void ecore_evas_layer_set(Ecore_Evas *ee, int layer);
-        [ :ecore_evas_layer_set, [ :ecore_evas_p, :int ], :void ],
+        [ :ecore_evas_layer_set, [ :pointer, :int ], :void ],
         # EAPI int ecore_evas_layer_get(const Ecore_Evas *ee);
-        [ :ecore_evas_layer_get, [ :ecore_evas_p ], :int ],
+        [ :ecore_evas_layer_get, [ :pointer ], :int ],
         # EAPI void ecore_evas_maximized_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_maximized_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_maximized_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_maximized_get(const Ecore_Evas *ee);
-        [ :ecore_evas_maximized_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_maximized_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_move(Ecore_Evas *ee, int x, int y);
-        [ :ecore_evas_move, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_move, [ :pointer, :int, :int ], :void ],
         # EAPI void ecore_evas_resize(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_resize, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_resize, [ :pointer, :int, :int ], :void ],
         # EAPI void ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_move_resize, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_move_resize, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_rotation_set(Ecore_Evas *ee, int rot);
-        [ :ecore_evas_rotation_set, [ :ecore_evas_p, :int ], :void ],
+        [ :ecore_evas_rotation_set, [ :pointer, :int ], :void ],
         # EAPI void ecore_evas_rotation_with_resize_set(Ecore_Evas *ee, int rot);
-        [ :ecore_evas_rotation_with_resize_set, [ :ecore_evas_p, :int ], :void ],
+        [ :ecore_evas_rotation_with_resize_set, [ :pointer, :int ], :void ],
         # EAPI int ecore_evas_rotation_get(const Ecore_Evas *ee);
-        [ :ecore_evas_rotation_get, [ :ecore_evas_p ], :int ],
+        [ :ecore_evas_rotation_get, [ :pointer ], :int ],
         # EAPI void ecore_evas_raise(Ecore_Evas *ee);
-        [ :ecore_evas_raise, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_raise, [ :pointer ], :void ],
         # EAPI void ecore_evas_lower(Ecore_Evas *ee);
-        [ :ecore_evas_lower, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_lower, [ :pointer ], :void ],
         # EAPI void ecore_evas_title_set(Ecore_Evas *ee, const char *t);
-        [ :ecore_evas_title_set, [ :ecore_evas_p, :string ], :void ],
+        [ :ecore_evas_title_set, [ :pointer, :string ], :void ],
         # EAPI const char *ecore_evas_title_get(const Ecore_Evas *ee);
-        [ :ecore_evas_title_get, [ :ecore_evas_p ], :string ],
+        [ :ecore_evas_title_get, [ :pointer ], :string ],
         # EAPI void ecore_evas_name_class_set(Ecore_Evas *ee, const char *n, const char *c);
-        [ :ecore_evas_name_class_set, [ :ecore_evas_p, :string, :string ], :void ],
+        [ :ecore_evas_name_class_set, [ :pointer, :string, :string ], :void ],
         # EAPI void ecore_evas_name_class_get(const Ecore_Evas *ee, const char **n, const char **c);
-        [ :ecore_evas_name_class_get, [ :ecore_evas_p, :string_array, :string_array ], :void ],
+        [ :ecore_evas_name_class_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI Ecore_Window ecore_evas_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_window_get, [ :ecore_evas_p ], :uintptr_t ],
+        [ :ecore_evas_window_get, [ :pointer ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_software_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_x11_new, [ :string, :uint, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_window_get, [ :pointer ], :uint ],
         # EAPI void ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_software_x11_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_software_x11_direct_resize_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_software_x11_direct_resize_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_software_x11_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_software_x11_extra_event_window_add, [ :pointer, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_gl_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_gl_x11_new, [ :string, :uint, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_gl_x11_options_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h, const int *opt);
-        [ :ecore_evas_gl_x11_options_new, [ :string, :uint, :int, :int, :int, :int, :int_p ], :ecore_evas_p ],
+        [ :ecore_evas_gl_x11_options_new, [ :string, :uint, :int, :int, :int, :int, :pointer ], :pointer ],
         # EAPI Ecore_X_Window ecore_evas_gl_x11_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_gl_x11_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_gl_x11_window_get, [ :pointer ], :uint ],
         # EAPI void ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_gl_x11_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_gl_x11_direct_resize_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_gl_x11_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_gl_x11_direct_resize_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_gl_x11_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_gl_x11_extra_event_window_add, [ :pointer, :uint ], :void ],
         # EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
         # FIXME
         # EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_xrender_x11_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_xrender_x11_new, [ :string, :uint, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_xrender_x11_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_xrender_x11_window_get, [ :pointer ], :uint ],
         # EAPI void ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_xrender_x11_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_xrender_x11_direct_resize_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_xrender_x11_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_xrender_x11_direct_resize_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_xrender_x11_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_xrender_x11_extra_event_window_add, [ :pointer, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_software_x11_8_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_x11_8_new, [ :string, :uint, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_8_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_8_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_8_window_get, [ :pointer ], :uint ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_8_subwindow_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_8_subwindow_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_8_subwindow_get, [ :pointer ], :uint ],
         # EAPI void ecore_evas_software_x11_8_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_software_x11_8_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_software_x11_8_direct_resize_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_software_x11_8_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_8_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_software_x11_8_direct_resize_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_software_x11_8_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_software_x11_8_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_software_x11_8_extra_event_window_add, [ :pointer, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-        [ :ecore_evas_software_x11_16_new, [ :string, :uint, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_x11_16_new, [ :string, :uint, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_X_Window ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_16_window_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_software_x11_16_window_get, [ :pointer ], :uint ],
         # EAPI void ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_software_x11_16_direct_resize_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_software_x11_16_direct_resize_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee);
-        [ :ecore_evas_software_x11_16_direct_resize_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_software_x11_16_direct_resize_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_software_x11_16_extra_event_window_add, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_software_x11_16_extra_event_window_add, [ :pointer, :uint ], :void ],
         # EAPI Ecore_Evas *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h);
-        [ :ecore_evas_fb_new, [ :string, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_fb_new, [ :string, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w, int h);
-        [ :ecore_evas_directfb_new, [ :string, :int, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_directfb_new, [ :string, :int, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_DirectFB_Window *ecore_evas_directfb_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_directfb_window_get, [ :ecore_evas_p ], :ecore_directfb_window_p ],
+        [ :ecore_evas_directfb_window_get, [ :pointer ], :pointer ],
+        # EAPI Ecore_Evas *ecore_evas_wayland_shm_new(const char *disp_name, int x, int y, int w, int h, int frame);
+        [ :ecore_evas_wayland_shm_new, [ :string, :int, :int, :int, :int, :int ], :pointer ],
+        # EAPI Ecore_Evas *ecore_evas_wayland_egl_new(const char *disp_name, int x, int y, int w, int h, int frame);
+        [ :ecore_evas_wayland_egl_new, [ :string, :int, :int, :int, :int, :int ], :pointer ],
+        # EAPI void ecore_evas_wayland_resize(Ecore_Evas *ee, int location);
+        [ :ecore_evas_wayland_resize, [ :pointer, :int ], :void ],
+        # EAPI void ecore_evas_wayland_drag_start(Ecore_Evas *ee, Ecore_Evas *drag_ee, void *source);
+        [ :ecore_evas_wayland_drag_start, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI Ecore_Evas *ecore_evas_buffer_new(int w, int h);
-        [ :ecore_evas_buffer_new, [ :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_buffer_new, [ :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_buffer_allocfunc_new(int w, int h, void *(*alloc_func) (void *data, int size), void (*free_func) (void *data, void *pix), const void *data);
         # FIXME
         # EAPI const void *ecore_evas_buffer_pixels_get(Ecore_Evas *ee);
-        [ :ecore_evas_buffer_pixels_get, [ :ecore_evas_p ], :void_p ],
+        [ :ecore_evas_buffer_pixels_get, [ :pointer ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_ews_new(int x, int y, int w, int h);
-        [ :ecore_evas_ews_new, [ :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_ews_new, [ :int, :int, :int, :int ], :pointer ],
         # EAPI Evas_Object *ecore_evas_ews_backing_store_get(const Ecore_Evas *ee);
-        [ :ecore_evas_ews_backing_store_get, [ :ecore_evas_p ], :evas_object_p ],
+        [ :ecore_evas_ews_backing_store_get, [ :pointer ], :pointer ],
         # EAPI void ecore_evas_ews_delete_request(Ecore_Evas *ee);
-        [ :ecore_evas_ews_delete_request, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_ews_delete_request, [ :pointer ], :void ],
         # EAPI Evas_Object *ecore_evas_object_image_new(Ecore_Evas *ee_target);
-        [ :ecore_evas_object_image_new, [ :ecore_evas_p ], :evas_object_p ],
+        [ :ecore_evas_object_image_new, [ :pointer ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_object_ecore_evas_get(Evas_Object *obj);
-        [ :ecore_evas_object_ecore_evas_get, [ :evas_object_p ], :ecore_evas_p ],
+        [ :ecore_evas_object_ecore_evas_get, [ :pointer ], :pointer ],
         # EAPI Evas *ecore_evas_object_evas_get(Evas_Object *obj);
-        [ :ecore_evas_object_evas_get, [ :evas_object_p ], :evas_p ],
+        [ :ecore_evas_object_evas_get, [ :pointer ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_gdi_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_gdi_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_gdi_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_ddraw_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_ddraw_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_16_ddraw_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_16_ddraw_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_direct3d_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_direct3d_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_direct3d_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_gl_glew_new(Ecore_Win32_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_gl_glew_new, [ :ecore_win32_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_gl_glew_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Win32_Window *ecore_evas_win32_window_get(const Ecore_Evas *ee);
-        [ :ecore_evas_win32_window_get, [ :ecore_evas_p ], :ecore_win32_window_p ],
+        [ :ecore_evas_win32_window_get, [ :pointer ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
-        [ :ecore_evas_sdl_new, [ :string, :int, :int, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_sdl_new, [ :pointer, :int, :int, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
-        [ :ecore_evas_sdl16_new, [ :string, :int, :int, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_sdl16_new, [ :pointer, :int, :int, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_gl_sdl_new(const char* name, int w, int h, int fullscreen, int noframe);
-        [ :ecore_evas_gl_sdl_new, [ :string, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_gl_sdl_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_fb_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_fb_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_gapi_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_gapi_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_ddraw_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_ddraw_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # EAPI Ecore_Evas *ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent, int x, int y, int width, int height);
-        [ :ecore_evas_software_wince_gdi_new, [ :ecore_wince_window_p, :int, :int, :int, :int ], :ecore_evas_p ],
+        [ :ecore_evas_software_wince_gdi_new, [ :pointer, :int, :int, :int, :int ], :pointer ],
         # 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 ],
+        [ :ecore_evas_software_wince_window_get, [ :pointer ], :pointer ],
+        # EAPI Ecore_Evas *ecore_evas_psl1ght_new(const char* name, int w, int h);
+        [ :ecore_evas_psl1ght_new, [ :pointer, :int, :int ], :pointer ],
         # EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee);
-        [ :ecore_evas_engine_name_get, [ :ecore_evas_p ], :string ],
+        [ :ecore_evas_engine_name_get, [ :pointer ], :string ],
         # EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e);
-        [ :ecore_evas_ecore_evas_get, [ :evas_p ], :ecore_evas_p ],
+        [ :ecore_evas_ecore_evas_get, [ :pointer ], :pointer ],
         # EAPI void ecore_evas_free(Ecore_Evas *ee);
-        [ :ecore_evas_free, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_free, [ :pointer ], :void ],
         # EAPI void *ecore_evas_data_get(const Ecore_Evas *ee, const char *key);
-        [ :ecore_evas_data_get, [ :ecore_evas_p, :string ], :void_p ],
+        [ :ecore_evas_data_get, [ :pointer, :string ], :pointer ],
         # EAPI void ecore_evas_data_set(Ecore_Evas *ee, const char *key, const void *data);
-        [ :ecore_evas_data_set, [ :ecore_evas_p, :string, :void_p ], :void ],
+        [ :ecore_evas_data_set, [ :pointer, :string, :pointer ], :void ],
         # EAPI void ecore_evas_callback_resize_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_resize_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_resize_set, [:pointer, :ecore_evas_cb], :void ],
         # EAPI void ecore_evas_callback_move_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_move_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_move_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_show_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_show_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_show_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_hide_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_hide_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_hide_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_delete_request_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_delete_request_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_delete_request_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_destroy_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_destroy_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_destroy_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_focus_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_focus_in_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_focus_in_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_focus_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_focus_out_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_focus_out_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_sticky_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_sticky_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_sticky_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_unsticky_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_unsticky_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_unsticky_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_mouse_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_mouse_in_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_mouse_in_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_mouse_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_mouse_out_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_mouse_out_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_pre_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_pre_render_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_pre_render_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_post_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_post_render_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_post_render_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI void ecore_evas_callback_pre_free_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-        [ :ecore_evas_callback_pre_free_set, [:ecore_evas_p, :ecore_evas_event_cb], :void],
+        [ :ecore_evas_callback_pre_free_set, [ :pointer, :ecore_evas_cb ], :void ],
         # EAPI Evas *ecore_evas_get(const Ecore_Evas *ee);
-        [ :ecore_evas_get, [ :ecore_evas_p ], :evas_p ],
+        [ :ecore_evas_get, [ :pointer ], :pointer ],
         # EAPI void ecore_evas_managed_move(Ecore_Evas *ee, int x, int y);
-        [ :ecore_evas_managed_move, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_managed_move, [ :pointer, :int, :int ], :void ],
         # EAPI void ecore_evas_shaped_set(Ecore_Evas *ee, Eina_Bool shaped);
-        [ :ecore_evas_shaped_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_shaped_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_shaped_get(const Ecore_Evas *ee);
-        [ :ecore_evas_shaped_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_shaped_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_show(Ecore_Evas *ee);
-        [ :ecore_evas_show, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_show, [ :pointer ], :void ],
         # EAPI void ecore_evas_hide(Ecore_Evas *ee);
-        [ :ecore_evas_hide, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_hide, [ :pointer ], :void ],
         # EAPI void ecore_evas_activate(Ecore_Evas *ee);
-        [ :ecore_evas_activate, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_activate, [ :pointer ], :void ],
         # EAPI void ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_min_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_min_set, [ :pointer, :int, :int ], :void ],
         # EAPI void ecore_evas_size_min_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_min_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_min_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_max_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_max_set, [ :pointer, :int, :int ], :void ],
         # EAPI void ecore_evas_size_max_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_max_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_max_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_base_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_base_set, [ :pointer, :int, :int ], :void ],
         # EAPI void ecore_evas_size_base_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_base_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_base_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h);
-        [ :ecore_evas_size_step_set, [ :ecore_evas_p, :int, :int ], :void ],
+        [ :ecore_evas_size_step_set, [ :pointer, :int, :int ], :void ],
         # EAPI void ecore_evas_size_step_get(const Ecore_Evas *ee, int *w, int *h);
-        [ :ecore_evas_size_step_get, [ :ecore_evas_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_size_step_get, [ :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_cursor_set(Ecore_Evas *ee, const char *file, int layer, int hot_x, int hot_y);
-        [ :ecore_evas_cursor_set, [ :ecore_evas_p, :string, :int, :int, :int ], :void ],
+        [ :ecore_evas_cursor_set, [ :pointer, :string, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_cursor_get(const Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y);
-        [ :ecore_evas_cursor_get, [ :ecore_evas_p, :evas_object_pp, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_cursor_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
         # EAPI void ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
-        [ :ecore_evas_object_cursor_set, [ :ecore_evas_p, :evas_object_p, :int, :int, :int ], :void ],
+        [ :ecore_evas_object_cursor_set, [ :pointer, :pointer, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_override_set(Ecore_Evas *ee, Eina_Bool on);
-        [ :ecore_evas_override_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_override_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_override_get(const Ecore_Evas *ee);
-        [ :ecore_evas_override_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_override_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_avoid_damage_set(Ecore_Evas *ee, Ecore_Evas_Avoid_Damage_Type on);
-        [ :ecore_evas_avoid_damage_set, [ :ecore_evas_p, :ecore_evas_avoid_damage_type ], :void ],
+        [ :ecore_evas_avoid_damage_set, [ :pointer, :ecore_evas_avoid_damage_type ], :void ],
         # EAPI Ecore_Evas_Avoid_Damage_Type ecore_evas_avoid_damage_get(const Ecore_Evas *ee);
-        [ :ecore_evas_avoid_damage_get, [ :ecore_evas_p ], :ecore_evas_avoid_damage_type ],
+        [ :ecore_evas_avoid_damage_get, [ :pointer ], :ecore_evas_avoid_damage_type ],
         # EAPI void ecore_evas_withdrawn_set(Ecore_Evas *ee, Eina_Bool withdrawn);
-        [ :ecore_evas_withdrawn_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_withdrawn_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_withdrawn_get(const Ecore_Evas *ee);
-        [ :ecore_evas_withdrawn_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_withdrawn_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool sticky);
-        [ :ecore_evas_sticky_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_sticky_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_sticky_get(const Ecore_Evas *ee);
-        [ :ecore_evas_sticky_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_sticky_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_manual_render_set(Ecore_Evas *ee, Eina_Bool manual_render);
-        [ :ecore_evas_manual_render_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_manual_render_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_manual_render_get(const Ecore_Evas *ee);
-        [ :ecore_evas_manual_render_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_manual_render_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_input_event_register(Ecore_Evas *ee);
-        [ :ecore_evas_input_event_register, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_input_event_register, [ :pointer ], :void ],
         # EAPI void ecore_evas_input_event_unregister(Ecore_Evas *ee);
-        [ :ecore_evas_input_event_unregister, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_input_event_unregister, [ :pointer ], :void ],
         # EAPI void ecore_evas_manual_render(Ecore_Evas *ee);
-        [ :ecore_evas_manual_render, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_manual_render, [ :pointer ], :void ],
         # EAPI void ecore_evas_comp_sync_set(Ecore_Evas *ee, Eina_Bool do_sync);
-        [ :ecore_evas_comp_sync_set, [ :ecore_evas_p, :eina_bool ], :void ],
+        [ :ecore_evas_comp_sync_set, [ :pointer, :eina_bool ], :void ],
         # EAPI Eina_Bool ecore_evas_comp_sync_get(const Ecore_Evas *ee);
-        [ :ecore_evas_comp_sync_get, [ :ecore_evas_p ], :eina_bool ],
+        [ :ecore_evas_comp_sync_get, [ :pointer ], :eina_bool ],
         # EAPI void ecore_evas_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h);
-        [ :ecore_evas_screen_geometry_get, [ :ecore_evas_p, :int_p, :int_p, :int_p, :int_p ], :void ],
+        [ :ecore_evas_screen_geometry_get, [ :pointer, :pointer, :pointer, :pointer, :pointer ], :void ],
+        # EAPI void ecore_evas_draw_frame_set(Ecore_Evas *ee, Eina_Bool draw_frame);
+        [ :ecore_evas_draw_frame_set, [ :pointer, :eina_bool ], :void ],
+        # EAPI Eina_Bool ecore_evas_draw_frame_get(const Ecore_Evas *ee);
+        [ :ecore_evas_draw_frame_get, [ :pointer ], :eina_bool ],
         # EAPI Eina_Bool ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags);
-        [ :ecore_evas_object_associate, [ :ecore_evas_p, :evas_object_p, :ecore_evas_object_associate_flags ], :eina_bool ],
+        [ :ecore_evas_object_associate, [ :pointer, :pointer, :ecore_evas_object_associate_flags ], :eina_bool ],
         # EAPI Eina_Bool ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj);
-        [ :ecore_evas_object_dissociate, [ :ecore_evas_p, :evas_object_p ], :eina_bool ],
+        [ :ecore_evas_object_dissociate, [ :pointer, :pointer ], :eina_bool ],
         # EAPI Evas_Object *ecore_evas_object_associate_get(const Ecore_Evas *ee);
-        [ :ecore_evas_object_associate_get, [ :ecore_evas_p ], :evas_object_p ],
+        [ :ecore_evas_object_associate_get, [ :pointer ], :pointer ],
         # 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 ], :eina_bool ],
+        [ :ecore_getopt_callback_ecore_evas_list_engines, [ :pointer, :pointer, :string, :pointer, :pointer ], :uchar ],
         # EAPI Eina_List *ecore_evas_ecore_evas_list_get(void);
-        [ :ecore_evas_ecore_evas_list_get, [  ], :eina_list_p ],
+        [ :ecore_evas_ecore_evas_list_get, [  ], :pointer ],
         # EAPI void ecore_evas_x11_leader_set(Ecore_Evas *ee, Ecore_X_Window win);
-        [ :ecore_evas_x11_leader_set, [ :ecore_evas_p, :uint ], :void ],
+        [ :ecore_evas_x11_leader_set, [ :pointer, :uint ], :void ],
         # EAPI Ecore_X_Window ecore_evas_x11_leader_get(Ecore_Evas *ee);
-        [ :ecore_evas_x11_leader_get, [ :ecore_evas_p ], :uint ],
+        [ :ecore_evas_x11_leader_get, [ :pointer ], :uint ],
         # EAPI void ecore_evas_x11_leader_default_set(Ecore_Evas *ee);
-        [ :ecore_evas_x11_leader_default_set, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_leader_default_set, [ :pointer ], :void ],
         # EAPI void ecore_evas_x11_shape_input_rectangle_set(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_x11_shape_input_rectangle_set, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_x11_shape_input_rectangle_set, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_x11_shape_input_rectangle_add(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_x11_shape_input_rectangle_add, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_x11_shape_input_rectangle_add, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_x11_shape_input_rectangle_subtract(Ecore_Evas *ee, int x, int y, int w, int h);
-        [ :ecore_evas_x11_shape_input_rectangle_subtract, [ :ecore_evas_p, :int, :int, :int, :int ], :void ],
+        [ :ecore_evas_x11_shape_input_rectangle_subtract, [ :pointer, :int, :int, :int, :int ], :void ],
         # EAPI void ecore_evas_x11_shape_input_empty(Ecore_Evas *ee);
-        [ :ecore_evas_x11_shape_input_empty, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_shape_input_empty, [ :pointer ], :void ],
         # EAPI void ecore_evas_x11_shape_input_reset(Ecore_Evas *ee);
-        [ :ecore_evas_x11_shape_input_reset, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_shape_input_reset, [ :pointer ], :void ],
         # EAPI void ecore_evas_x11_shape_input_apply(Ecore_Evas *ee);
-        [ :ecore_evas_x11_shape_input_apply, [ :ecore_evas_p ], :void ],
+        [ :ecore_evas_x11_shape_input_apply, [ :pointer ], :void ],
         # EAPI Eina_Bool ecore_evas_ews_engine_set(const char *engine, const char *options);
         [ :ecore_evas_ews_engine_set, [ :string, :string ], :eina_bool ],
         # EAPI Eina_Bool ecore_evas_ews_setup(int x, int y, int w, int h);
         [ :ecore_evas_ews_setup, [ :int, :int, :int, :int ], :eina_bool ],
         # EAPI Ecore_Evas *ecore_evas_ews_ecore_evas_get(void);
-        [ :ecore_evas_ews_ecore_evas_get, [  ], :ecore_evas_p ],
+        [ :ecore_evas_ews_ecore_evas_get, [  ], :pointer ],
         # EAPI Evas *ecore_evas_ews_evas_get(void);
-        [ :ecore_evas_ews_evas_get, [  ], :evas_p ],
+        [ :ecore_evas_ews_evas_get, [  ], :pointer ],
         # EAPI Evas_Object *ecore_evas_ews_background_get(void);
-        [ :ecore_evas_ews_background_get, [  ], :evas_object_p ],
+        [ :ecore_evas_ews_background_get, [  ], :pointer ],
         # EAPI void ecore_evas_ews_background_set(Evas_Object *o);
-        [ :ecore_evas_ews_background_set, [ :evas_object_p ], :void ],
+        [ :ecore_evas_ews_background_set, [ :pointer ], :void ],
         # EAPI const Eina_List *ecore_evas_ews_children_get(void);
-        [ :ecore_evas_ews_children_get, [  ], :eina_list_p ],
+        [ :ecore_evas_ews_children_get, [  ], :pointer ],
         # EAPI void ecore_evas_ews_manager_set(const void *manager);
-        [ :ecore_evas_ews_manager_set, [ :void_p ], :void ],
+        [ :ecore_evas_ews_manager_set, [ :pointer ], :void ],
         # EAPI const void *ecore_evas_ews_manager_get(void);
-        [ :ecore_evas_ews_manager_get, [  ], :void_p ],
-        # EAPI Evas_Object *ecore_evas_extn_socket_new(Ecore_Evas *ee_target, const char *svcname, int svcnum, Eina_Bool svcsys);
-        [ :ecore_evas_extn_socket_new, [ :ecore_evas_p, :string, :int, :eina_bool ], :evas_object_p ],
-        # EAPI void ecore_evas_extn_socket_object_data_lock(Evas_Object *obj);
-        [ :ecore_evas_extn_socket_object_data_lock, [ :evas_object_p ], :void ],
-        # EAPI void ecore_evas_extn_socket_object_data_unlock(Evas_Object *obj);
-        [ :ecore_evas_extn_socket_object_data_unlock, [ :evas_object_p ], :void ],
-        # EAPI Ecore_Evas *ecore_evas_extn_plug_new(const char *svcname, int svcnum, Eina_Bool svcsys);
-        [ :ecore_evas_extn_plug_new, [ :string, :int, :eina_bool ], :ecore_evas_p ],
+        [ :ecore_evas_ews_manager_get, [  ], :pointer ],
+        # EAPI Ecore_Evas *ecore_evas_extn_socket_new(int w, int h);
+        [ :ecore_evas_extn_socket_new, [ :int, :int ], :pointer ],
+        # EAPI Eina_Bool ecore_evas_extn_socket_listen(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
+        [ :ecore_evas_extn_socket_listen, [ :pointer, :string, :int, :eina_bool ], :eina_bool ],
+        # EAPI void ecore_evas_extn_plug_object_data_lock(Evas_Object *obj);
+        [ :ecore_evas_extn_plug_object_data_lock, [ :pointer ], :void ],
+        # EAPI void ecore_evas_extn_plug_object_data_unlock(Evas_Object *obj);
+        [ :ecore_evas_extn_plug_object_data_unlock, [ :pointer ], :void ],
+        # EAPI Evas_Object *ecore_evas_extn_plug_new(Ecore_Evas *ee_target);
+        [ :ecore_evas_extn_plug_new, [ :pointer ], :pointer ],
+        # EAPI Eina_Bool ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys);
+        [ :ecore_evas_extn_plug_connect, [ :pointer, :string, :int, :eina_bool ], :eina_bool ],
         ]
         if RUBY_PLATFORM =~ /darwin/
-            # EAPI Ecore_Evas *ecore_evas_cocoa_new(const char* name, int w, int h);
+            # EAPI Ecore_Evas *ecore_evas_cocoa_new(Ecore_Cocoa_Window *parent, int x, int y, int w, int h);
             fcts << [ :ecore_evas_cocoa_new, [ :string, :int, :int ], :ecore_evas_p ]
         end
         #
diff --git a/lib/efl/native/ecore_getopt.rb b/lib/efl/native/ecore_getopt.rb
index f84e15b..b003911 100644
--- a/lib/efl/native/ecore_getopt.rb
+++ b/lib/efl/native/ecore_getopt.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EcoreGetopt
         #
-        FCT_PREFIX = 'ecore_getopt_'
+        FCT_PREFIX = 'ecore_getopt_' 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, &block; 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
@@ -23,12 +22,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 ]
@@ -36,17 +35,14 @@ module Efl
         # TYPEDEFS
         # typedef union _Ecore_Getopt_Value Ecore_Getopt_Value;
         typedef :pointer, :ecore_getopt_value
-        typedef :pointer, :ecore_getopt_value_p
         # typedef struct _Ecore_Getopt_Desc_Store Ecore_Getopt_Desc_Store;
         typedef :pointer, :ecore_getopt_desc_store
         # typedef struct _Ecore_Getopt_Desc_Callback Ecore_Getopt_Desc_Callback;
         typedef :pointer, :ecore_getopt_desc_callback
         # typedef struct _Ecore_Getopt_Desc Ecore_Getopt_Desc;
         typedef :pointer, :ecore_getopt_desc
-        typedef :pointer, :ecore_getopt_desc_p
         # typedef struct _Ecore_Getopt Ecore_Getopt;
         typedef :pointer, :ecore_getopt
-        typedef :pointer, :ecore_getopt_p
         #
         # CALLBACKS
         #
@@ -55,17 +51,17 @@ module Efl
         # FUNCTIONS
         fcts = [
         # EAPI void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);
-        [ :ecore_getopt_help, [ :pointer, :ecore_getopt_p ], :void ],
+        [ :ecore_getopt_help, [ :pointer, :pointer ], :void ],
         # EAPI Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser);
-        [ :ecore_getopt_parser_has_duplicates, [ :ecore_getopt_p ], :eina_bool ],
+        [ :ecore_getopt_parser_has_duplicates, [ :pointer ], :eina_bool ],
         # EAPI int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv);
-        [ :ecore_getopt_parse, [ :ecore_getopt_p, :ecore_getopt_value_p, :int, :string_array ], :int ],
+        [ :ecore_getopt_parse, [ :pointer, :pointer, :int, :pointer ], :int ],
         # EAPI Eina_List *ecore_getopt_list_free(Eina_List *list);
-        [ :ecore_getopt_list_free, [ :eina_list_p ], :eina_list_p ],
+        [ :ecore_getopt_list_free, [ :pointer ], :pointer ],
         # EAPI Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
-        [ :ecore_getopt_callback_geometry_parse, [ :ecore_getopt_p, :ecore_getopt_desc_p, :string, :void_p, :ecore_getopt_value_p ], :eina_bool ],
+        [ :ecore_getopt_callback_geometry_parse, [ :pointer, :pointer, :string, :pointer, :pointer ], :eina_bool ],
         # EAPI Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
-        [ :ecore_getopt_callback_size_parse, [ :ecore_getopt_p, :ecore_getopt_desc_p, :string, :void_p, :ecore_getopt_value_p ], :eina_bool ],
+        [ :ecore_getopt_callback_size_parse, [ :pointer, :pointer, :string, :pointer, :pointer ], :eina_bool ],
         ]
         #
         attach_fcts fcts
diff --git a/lib/efl/native/ecore_input.rb b/lib/efl/native/ecore_input.rb
index d1a81d0..da74014 100644
--- a/lib/efl/native/ecore_input.rb
+++ b/lib/efl/native/ecore_input.rb
@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EcoreInput
         #
-        FCT_PREFIX = 'ecore_event_'
+        FCT_PREFIX = 'ecore_event_' 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, &block; 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
@@ -31,7 +30,7 @@ module Efl
         #
         # TYPEDEFS
         # typedef uintptr_t Ecore_Window;
-        typedef :uintptr_t, :ecore_window
+        typedef :pointer, :ecore_window
         # typedef struct _Ecore_Event_Key Ecore_Event_Key;
         typedef :pointer, :ecore_event_key
         # typedef struct _Ecore_Event_Mouse_Button Ecore_Event_Mouse_Button;
@@ -44,7 +43,6 @@ module Efl
         typedef :pointer, :ecore_event_mouse_io
         # typedef struct _Ecore_Event_Modifiers Ecore_Event_Modifiers;
         typedef :pointer, :ecore_event_modifiers
-        typedef :pointer, :ecore_event_modifiers_p
         #
         # CALLBACKS
         #
@@ -75,7 +73,7 @@ module Efl
         # EAPI unsigned int ecore_event_modifier_mask(Ecore_Event_Modifier modifier);
         [ :ecore_event_modifier_mask, [ :ecore_event_modifier ], :uint ],
         # EAPI Ecore_Event_Modifier ecore_event_update_modifier(const char *key, Ecore_Event_Modifiers *modifiers, int inc);
-        [ :ecore_event_update_modifier, [ :string, :ecore_event_modifiers_p, :int ], :ecore_event_modifier ],
+        [ :ecore_event_update_modifier, [ :string, :pointer, :int ], :ecore_event_modifier ],
         ]
         #
         attach_fcts fcts
diff --git a/spec/ecore_evas_spec.rb b/spec/ecore_evas_spec.rb
index 7ded12e..07243d9 100644
--- a/spec/ecore_evas_spec.rb
+++ b/spec/ecore_evas_spec.rb
@@ -2,6 +2,7 @@
 # -*- coding: UTF-8 -*-
 #
 require 'efl/eina_list'
+require 'efl/ecore'
 require 'efl/ecore_evas'
 require './spec/helper'
 #
@@ -29,7 +30,6 @@ describe 'Efl::EcoreEvas' do
         EcoreEvas.engines_free EcoreEvas.engines_get
         l = EcoreEvas.engines_list
         r = l.inject("\t") do |s,e| s+=e.read_string+' ' end
-        puts r
         EcoreEvas.engines_free l
     end
     #
@@ -82,23 +82,34 @@ describe 'Efl::EcoreEvas' do
         it "move, resize move_resize and geometry_get  (and check association)" do
             @e.geometry_get.should == [10,10,100,120]
             @bg.geometry_get.should == [0,0,100,120]
-            @e.move 20, 20
+            @e.move 50, 50
             ecore_loop 3
             g = @e.geometry_get
-            g.delete_at 1
-            g.should == [20,100,120]
+            g[0].should >=50
+            g[0].should <=60
+            g[1].should >=60
+            g[1].should <=80
+            g.delete_at 0
+            g.delete_at 0
+            g.should == [100,120]
             @bg.geometry_get.should == [0,0,100,120]
             @e.resize 200,150
             ecore_loop 3
             g = @e.geometry_get
-            g.delete_at 1
-            g.should == [20,200,150]
+            g.delete_at 0
+            g.delete_at 0
+            g.should == [200,150]
             @bg.geometry_get.should == [0,0,200,150]
             @e.move_resize 10, 0, 130, 100
             ecore_loop 3
             g = @e.geometry_get
-            g.delete_at 1
-            g.should == [10,130,100]
+            g[0].should >=10
+            g[0].should <=20
+            g[1].should >=20
+            g[1].should <=30
+            g.delete_at 0
+            g.delete_at 0
+            g.should == [130,100]
             @bg.geometry_get.should == [0,0,130,100]
             g = @e.geometry_get
         end
@@ -203,8 +214,6 @@ describe 'Efl::EcoreEvas' do
             bool_check @e, 'override'
         end
         #
-        # FIXME maximized
-        # ecore/src/lib/ecore_evas/ecore_evas.c => ecore_evas_maximized_set => IFC => return
         it "maximized set/get " do
             bool_check @e, 'maximized', 5
         end