ffi-efl 0.0.8 → 0.0.9

data/lib/efl/evas.rb

@@ -261,6 +261,10 @@ module Efl
                 Native.evas_object_size_hint_weight_set @ptr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
             end
             alias :size_hint_weight_expand :size_hint_weight_set_expand
+            def size_hint_weight_set_expand_fill
+                Native.evas_object_size_hint_weight_set @ptr, EVAS_HINT_EXPAND, EVAS_HINT_FILL
+            end
+            alias :size_hint_weight_expand_fill :size_hint_weight_set_expand_fill
             def size_hint_weight_get
                 @rd0 ||= FFI::MemoryPointer.new :double
                 @rd1 ||= FFI::MemoryPointer.new :double

data/lib/efl/ffi.rb

@@ -6,21 +6,10 @@ require 'ffi'
 module Efl
     #
     module Native
-        class VersionStruct < FFI::Struct
-            layout  :major,     :int,
-                    :minor,     :int,
-                    :micro,     :int,
-                    :revision,  :int
-
-            def full
-                [:major,:minor,:micro,:revision].collect { |e| self[e].to_s }.join '.'
-            end
-        end
-    end
-    #
-    module FFIHelper
         #
-        def attach_fcts fcts
+        extend FFI::Library
+        #
+        def self.attach_fcts fcts
             fcts.each do |func|
                 begin
                     attach_function(*func)
@@ -30,55 +19,67 @@ module Efl
             end
         end
         #
-        def ffi_typedefs
-            @ffi_typedefs
+        class << self
+            alias :ffi_lib_orig :ffi_lib
+            def ffi_lib *names
+                @all_ffi_libs||=[]
+                @all_ffi_libs += ffi_lib_orig(names)
+                @all_ffi_libs.uniq!
+            end
+            def find_variable name
+                @all_ffi_libs.each do |lib|
+                    address = lib.find_variable name
+                    return address if not address.nil?
+                end
+                return nil
+            end
         end
         #
-        def steal_ffitype mod, sym
-            typedef mod.ffi_typedefs[sym], sym
-        end
+        typedef :pointer, :char_p
+        typedef :pointer, :short_p
+        typedef :pointer, :int_p
+        typedef :pointer, :long_p
+        typedef :pointer, :float_p
+        typedef :pointer, :double_p
+        typedef :pointer, :uchar_p
+        typedef :pointer, :ushort_p
+        typedef :pointer, :uint_p
+        typedef :pointer, :ulong_p
+        typedef :pointer, :ufloat_p
+        typedef :pointer, :udouble_p
+        typedef :pointer, :void_p
+        typedef :pointer, :string_array
+        typedef :pointer, :string_array_p
+        typedef :uint_p,  :uintptr_t
         #
-        def self.extended mod
-            #
-            mod.extend FFI::Library
-            #
-            mod.typedef :pointer, :char_p
-            mod.typedef :pointer, :short_p
-            mod.typedef :pointer, :int_p
-            mod.typedef :pointer, :long_p
-            mod.typedef :pointer, :float_p
-            mod.typedef :pointer, :double_p
-            mod.typedef :pointer, :uchar_p
-            mod.typedef :pointer, :ushort_p
-            mod.typedef :pointer, :uint_p
-            mod.typedef :pointer, :ulong_p
-            mod.typedef :pointer, :ufloat_p
-            mod.typedef :pointer, :udouble_p
-            mod.typedef :pointer, :void_p
-            mod.typedef :pointer, :string_array
-            mod.typedef :pointer, :string_array_p
-            mod.typedef :uint_p,  :uintptr_t
-            #
-            mod.typedef :bool,    :eina_bool
-            mod.typedef :pointer, :eina_bool_p
-            mod.typedef :pointer, :eina_list_p
-            mod.typedef :pointer, :eina_hash_p
-            mod.typedef :pointer, :eina_iterator_p
-            mod.typedef :pointer, :eina_accessor_p
-            mod.typedef :pointer, :evas_p
-            mod.typedef :pointer, :evas_object_p
-            mod.typedef :pointer, :evas_object_pp
-            mod.typedef :pointer, :evas_gl_api_p
-            mod.typedef :pointer, :ecore_getopt_p
-            mod.typedef :pointer, :ecore_getopt_desc_p
-            mod.typedef :pointer, :ecore_getopt_value_p
-            #
-            mod.callback :eina_compare_cb, [ :void_p, :void_p ], :int
-            mod.callback :eina_each_cb, [ :void_p, :void_p, :void_p ], :eina_bool
-            mod.callback :eina_free_cb, [ :void_p ], :void
-            #
-        end
+        typedef :bool,    :eina_bool
+        typedef :pointer, :eina_bool_p
+        typedef :pointer, :eina_list_p
+        typedef :pointer, :eina_hash_p
+        typedef :pointer, :eina_iterator_p
+        typedef :pointer, :eina_accessor_p
+        typedef :pointer, :evas_p
+        typedef :pointer, :evas_object_p
+        typedef :pointer, :evas_object_pp
+        typedef :pointer, :evas_gl_api_p
+        typedef :pointer, :ecore_getopt_p
+        typedef :pointer, :ecore_getopt_desc_p
+        typedef :pointer, :ecore_getopt_value_p
+        #
+        callback :eina_compare_cb, [ :void_p, :void_p ], :int
+        callback :eina_each_cb, [ :void_p, :void_p, :void_p ], :eina_bool
+        callback :eina_free_cb, [ :void_p ], :void
         #
+        class VersionStruct < FFI::Struct
+            layout  :major,     :int,
+                    :minor,     :int,
+                    :micro,     :int,
+                    :revision,  :int
+
+            def full
+                [:major,:minor,:micro,:revision].collect { |e| self[e].to_s }.join '.'
+            end
+        end
     end
     #
     module ModuleHelper

data/lib/efl/native/ecore.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'ecore'
         #
@@ -186,10 +184,10 @@ module Efl
         [ :ecore_main_loop_thread_safe_call_async, [ :ecore_cb, :void_p ], :void ],
         # EAPI void *ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback, void *data);
         [ :ecore_main_loop_thread_safe_call_sync, [ :ecore_data_cb, :void_p ], :void_p ],
-        # EAPI Eina_Bool ecore_thread_main_loop_begin(void);
-        [ :ecore_thread_main_loop_begin, [  ], :eina_bool ],
-        # EAPI void ecore_thread_main_loop_end(void);
-        [ :ecore_thread_main_loop_end, [  ], :void ],
+        # EAPI int ecore_thread_main_loop_begin(void);
+        [ :ecore_thread_main_loop_begin, [  ], :int ],
+        # EAPI int ecore_thread_main_loop_end(void);
+        [ :ecore_thread_main_loop_end, [  ], :int ],
         # EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data);
         [ :ecore_event_handler_add, [ :int, :ecore_event_handler_cb, :void_p ], :ecore_event_handler_p ],
         # EAPI void *ecore_event_handler_del(Ecore_Event_Handler *event_handler);

data/lib/efl/native/ecore_evas.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'ecore_evas'
         #

data/lib/efl/native/ecore_getopt.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'ecore'
         #

data/lib/efl/native/ecore_input.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'ecore_input'
         #

data/lib/efl/native/edje.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'edje'
         #
@@ -71,6 +69,9 @@ module Efl
         enum :edje_external_param_flags, [ :edje_external_param_flags_none, 0, :edje_external_param_flags_get, :edje_external_param_flags_set,
             :edje_external_param_flags_state, :edje_external_param_flags_constructor, :edje_external_param_flags_regular, :edje_external_param_flags_set,
             :edje_external_param_flags_state ]
+        # typedef enum {...} Edje_Input_Panel_Layout;
+        enum :edje_input_panel_layout, [ :edje_input_panel_layout_normal, :edje_input_panel_layout_number, :edje_input_panel_layout_email, :edje_input_panel_layout_url,
+            :edje_input_panel_layout_phonenumber, :edje_input_panel_layout_ip, :edje_input_panel_layout_month, :edje_input_panel_layout_numberonly, :edje_input_panel_layout_invalid ]
         #
         # TYPEDEFS
         # typedef struct _Edje_Version Edje_Version;
@@ -337,6 +338,10 @@ module Efl
         [ :edje_object_part_text_cursor_pos_set, [ :evas_object_p, :string, :edje_cursor, :int ], :void ],
         # EAPI int edje_object_part_text_cursor_pos_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
         [ :edje_object_part_text_cursor_pos_get, [ :evas_object_p, :string, :edje_cursor ], :int ],
+        # EAPI void edje_object_part_text_input_panel_layout_set (const Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout);
+        [ :edje_object_part_text_input_panel_layout_set, [ :evas_object_p, :string, :edje_input_panel_layout ], :void ],
+        # EAPI Edje_Input_Panel_Layout edje_object_part_text_input_panel_layout_get (const Evas_Object *obj, const char *part);
+        [ :edje_object_part_text_input_panel_layout_get, [ :evas_object_p, :string ], :edje_input_panel_layout ],
         # EAPI void edje_object_text_insert_filter_callback_add (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data);
         [ :edje_object_text_insert_filter_callback_add, [ :evas_object_p, :string, :edje_text_filter_cb, :void_p ], :void ],
         # EAPI void *edje_object_text_insert_filter_callback_del (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func);

data/lib/efl/native/eet.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'eet'
         #

data/lib/efl/native/eina.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'eina'
         #

data/lib/efl/native/eina_hash.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'eina'
         #

data/lib/efl/native/eina_list.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'eina'
         #

data/lib/efl/native/eina_log.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'eina'
         #

data/lib/efl/native/eina_types.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'eina'
         #

data/lib/efl/native/elementary.rb

@@ -19,8 +19,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'libelementary-ver-pre-svn-09.so.0'
         #
@@ -39,6 +37,9 @@ module Efl
         typedef :pointer, :elm_text_format_p
         # typedef enum _Elm_Wrap_Type {...} Elm_Wrap_Type;
         enum :elm_wrap_type, [ :elm_wrap_none, 0, :elm_wrap_char, :elm_wrap_word, :elm_wrap_mixed, :elm_wrap_last ]
+        # typedef enum {...} Elm_Input_Panel_Layout;
+        enum :elm_input_panel_layout, [ :elm_input_panel_layout_normal, :elm_input_panel_layout_number, :elm_input_panel_layout_email, :elm_input_panel_layout_url,
+            :elm_input_panel_layout_phonenumber, :elm_input_panel_layout_ip, :elm_input_panel_layout_month, :elm_input_panel_layout_numberonly, :elm_input_panel_layout_invalid ]
         # typedef enum _Elm_Win_Type {...} Elm_Win_Type;
         enum :elm_win_type, [ :elm_win_basic, :elm_win_dialog_basic, :elm_win_desktop, :elm_win_dock, :m, :elm_win_toolbar, :elm_win_menu, :elm_win_utility,
             :elm_win_splash, :elm_win_dropdown_menu, :elm_win_popup_menu, :elm_win_tooltip, :t, :elm_win_notification, :elm_win_combo, :elm_win_dnd, :elm_win_inlined_image, :t, :e,
@@ -87,7 +88,7 @@ module Efl
         # typedef enum _Elm_List_Mode {...} Elm_List_Mode;
         enum :elm_list_mode, [ :elm_list_compress, 0, :elm_list_scroll, :elm_list_limit, :elm_list_expand, :elm_list_last ]
         # typedef enum _Elm_Actionslider_Pos {...} Elm_Actionslider_Pos;
-        enum :elm_actionslider_pos, [ :elm_actionslider_none, 0, :elm_actionslider_left, 1, :elm_actionslider_center, 1, :elm_actionslider_right, 1, :elm_actionslider_all
+        enum :elm_actionslider_pos, [ :elm_actionslider_none, 0, :elm_actionslider_left, 1, :elm_actionslider_center, 2, :elm_actionslider_right, 4, :elm_actionslider_all, 7
             ]
         # typedef enum _Elm_Genlist_Item_Flags {...} Elm_Genlist_Item_Flags;
         enum :elm_genlist_item_flags, [ :elm_genlist_item_none, 0, :elm_genlist_item_subitems, :elm_genlist_item_group ]
@@ -120,7 +121,8 @@ module Efl
         # typedef enum _Elm_Calendar_Mark_Repeat {...} Elm_Calendar_Mark_Repeat;
         enum :elm_calendar_mark_repeat, [ :elm_calendar_unique, :elm_calendar_daily, :elm_calendar_weekly, :elm_calendar_monthly, :elm_calendar_annually ]
         # typedef enum _Elm_Ctxpopup_Direction {...} Elm_Ctxpopup_Direction;
-        enum :elm_ctxpopup_direction, [ :elm_ctxpopup_direction_down, :elm_ctxpopup_direction_right, :elm_ctxpopup_direction_left, :elm_ctxpopup_direction_up ]
+        enum :elm_ctxpopup_direction, [ :elm_ctxpopup_direction_down, :elm_ctxpopup_direction_right, :elm_ctxpopup_direction_left, :elm_ctxpopup_direction_up,
+            :elm_ctxpopup_direction_dont_know ]
         typedef :pointer, :elm_ctxpopup_direction_p
         # typedef enum {...} Elm_Transit_Tween_Mode;
         enum :elm_transit_tween_mode, [ :elm_transit_tween_mode_linear, :elm_transit_tween_mode_sinusoidal, :elm_transit_tween_mode_decelerate,
@@ -157,6 +159,7 @@ module Efl
         typedef :pointer, :elm_theme_p
         # typedef struct _Elm_Box_Transition Elm_Box_Transition;
         typedef :pointer, :elm_box_transition
+        typedef :pointer, :elm_box_transition_p
         # typedef struct _Elm_Gengrid_Item_Class Elm_Gengrid_Item_Class;
         typedef :pointer, :elm_gengrid_item_class
         typedef :pointer, :elm_gengrid_item_class_p
@@ -371,6 +374,8 @@ module Efl
         callback :elm_store_item_unfetch_cb, [ :void_p, :elm_store_item_p ], :void
         # typedef void *(*Elm_Store_Item_Mapping_Cb) (void *data, Elm_Store_Item *sti, const char *part);
         callback :elm_store_item_mapping_cb, [ :void_p, :elm_store_item_p, :string ], :void_p
+        # void(*transition_end_cb)(void *data)
+        callback :elm_box_transition_end_cb, [ :void_p ], :void
         #
         # VARIABLES
         # EAPI extern Elm_Version *elm_version;
@@ -466,6 +471,10 @@ module Efl
         [ :elm_object_item_text_part_set, [ :elm_object_item_p, :string, :string ], :void ],
         # EAPI const char *elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part);
         [ :elm_object_item_text_part_get, [ :elm_object_item_p, :string ], :string ],
+        # EAPI void elm_object_access_info_set(Evas_Object *obj, const char *txt);
+        [ :elm_object_access_info_set, [ :evas_object_p, :string ], :void ],
+        # EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt);
+        [ :elm_object_item_access_info_set, [ :elm_object_item_p, :string ], :void ],
         # EAPI void elm_all_flush(void);
         [ :elm_all_flush, [  ], :void ],
         # EAPI int elm_cache_flush_interval_get(void);
@@ -514,6 +523,14 @@ module Efl
         [ :elm_object_scale_set, [ :evas_object_p, :double ], :void ],
         # EAPI double elm_object_scale_get(const Evas_Object *obj);
         [ :elm_object_scale_get, [ :evas_object_p ], :double ],
+        # EAPI Eina_Bool elm_password_show_last_get(void);
+        [ :elm_password_show_last_get, [  ], :eina_bool ],
+        # EAPI void elm_password_show_last_set(Eina_Bool password_show_last);
+        [ :elm_password_show_last_set, [ :eina_bool ], :void ],
+        # EAPI double elm_password_show_last_timeout_get(void);
+        [ :elm_password_show_last_timeout_get, [  ], :double ],
+        # EAPI void elm_password_show_last_timeout_set(double password_show_last_timeout);
+        [ :elm_password_show_last_timeout_set, [ :double ], :void ],
         # EAPI Eina_Bool elm_mirrored_get(void);
         [ :elm_mirrored_get, [  ], :eina_bool ],
         # EAPI void elm_mirrored_set(Eina_Bool mirrored);
@@ -1063,11 +1080,11 @@ module Efl
         # EAPI void elm_box_align_get(const Evas_Object *obj, double *horizontal, double *vertical);
         [ :elm_box_align_get, [ :evas_object_p, :double_p, :double_p ], :void ],
         # EAPI void elm_box_layout_set(Evas_Object *obj, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-        # FIXME
+        [ :elm_box_layout_set, [ :evas_object_p, :evas_object_box_layout, :void_p, :evas_free_data_cb ], :void ],
         # EAPI void elm_box_layout_transition(Evas_Object *obj, Evas_Object_Box_Data *priv, void *data);
         [ :elm_box_layout_transition, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void ],
         # EAPI Elm_Box_Transition *elm_box_transition_new(const double duration, Evas_Object_Box_Layout start_layout, void *start_layout_data, void(*start_layout_free_data)(void *data), Evas_Object_Box_Layout end_layout, void *end_layout_data, void(*end_layout_free_data)(void *data), void(*transition_end_cb)(void *data), void *transition_end_data);
-        # FIXME
+        [ :elm_box_transition_new, [ :double, :evas_object_box_layout, :void_p, :evas_free_data_cb, :evas_object_box_layout, :void_p, :evas_free_data_cb, :elm_box_transition_end_cb, :void_p ], :elm_box_transition_p ],
         # EAPI void elm_box_transition_free(void *data);
         [ :elm_box_transition_free, [ :void_p ], :void ],
         # EAPI Evas_Object *elm_button_add(Evas_Object *parent);
@@ -1671,6 +1688,10 @@ module Efl
         [ :elm_entry_filter_limit_size, [ :void_p, :evas_object_p, :string_array ], :void ],
         # EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text);
         [ :elm_entry_filter_accept_set, [ :void_p, :evas_object_p, :string_array ], :void ],
+        # EAPI void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout);
+        [ :elm_entry_input_panel_layout_set, [ :evas_object_p, :elm_input_panel_layout ], :void ],
+        # EAPI Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(Evas_Object *obj);
+        [ :elm_entry_input_panel_layout_get, [ :evas_object_p ], :elm_input_panel_layout ],
         # EAPI Evas_Object *elm_anchorview_add(Evas_Object *parent);
         [ :elm_anchorview_add, [ :evas_object_p ], :evas_object_p ],
         # EAPI void elm_anchorview_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
@@ -2123,8 +2144,8 @@ module Efl
         [ :elm_list_item_end_get, [ :elm_list_item_p ], :evas_object_p ],
         # EAPI void elm_list_item_end_set(Elm_List_Item *item, Evas_Object *end);
         [ :elm_list_item_end_set, [ :elm_list_item_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *elm_list_item_base_get(const Elm_List_Item *item);
-        [ :elm_list_item_base_get, [ :elm_list_item_p ], :evas_object_p ],
+        # EAPI Evas_Object *elm_list_item_object_get(const Elm_List_Item *item);
+        [ :elm_list_item_object_get, [ :elm_list_item_p ], :evas_object_p ],
         # EAPI const char *elm_list_item_label_get(const Elm_List_Item *item);
         [ :elm_list_item_label_get, [ :elm_list_item_p ], :string ],
         # EAPI void elm_list_item_label_set(Elm_List_Item *item, const char *text);
@@ -3113,6 +3134,8 @@ module Efl
         # EAPI void elm_ctxpopup_direction_priority_get(Evas_Object *obj, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth);
         [ :elm_ctxpopup_direction_priority_get, [ :evas_object_p, :elm_ctxpopup_direction_p, :elm_ctxpopup_direction_p, :elm_ctxpopup_direction_p,
             :elm_ctxpopup_direction_p ], :void ],
+        # EAPI Elm_Ctxpopup_Direction elm_ctxpopup_direction_get(const Evas_Object *obj);
+        [ :elm_ctxpopup_direction_get, [ :evas_object_p ], :elm_ctxpopup_direction ],
         # EAPI Elm_Transit *elm_transit_add(void);
         [ :elm_transit_add, [  ], :elm_transit_p ],
         # EAPI void elm_transit_del(Elm_Transit *transit);
@@ -3279,6 +3302,12 @@ module Efl
         [ :elm_factory_content_set, [ :evas_object_p, :evas_object_p ], :void ],
         # EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj);
         [ :elm_factory_content_get, [ :evas_object_p ], :evas_object_p ],
+        # EAPI void elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled);
+        [ :elm_factory_maxmin_mode_set, [ :evas_object_p, :eina_bool ], :void ],
+        # EAPI Eina_Bool elm_factory_maxmin_mode_get(const Evas_Object *obj);
+        [ :elm_factory_maxmin_mode_get, [ :evas_object_p ], :eina_bool ],
+        # EAPI void elm_factory_maxmin_reset_set(Evas_Object *obj);
+        [ :elm_factory_maxmin_reset_set, [ :evas_object_p ], :void ],
         # EAPI Evas_Object *elm_video_add(Evas_Object *parent);
         [ :elm_video_add, [ :evas_object_p ], :evas_object_p ],
         # EAPI void elm_video_file_set(Evas_Object *video, const char *filename);

data/lib/efl/native/emap.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'emap'
         #

data/lib/efl/native/evas.rb

@@ -18,8 +18,6 @@ module Efl
     end
     #
     module Native
-        #
-        extend Efl::FFIHelper
         #
         ffi_lib 'evas'
         #
@@ -42,7 +40,7 @@ module Efl
         enum :evas_font_hinting_flags, [ :evas_font_hinting_none, :evas_font_hinting_auto, :evas_font_hinting_bytecode ]
         # typedef enum _Evas_Colorspace {...} Evas_Colorspace;
         enum :evas_colorspace, [ :evas_colorspace_argb8888, :evas_colorspace_ycbcr422p601_pl, :evas_colorspace_ycbcr422p709_pl, :evas_colorspace_rgb565_a5p,
-            :evas_colorspace_gry8, :evas_colorspace_ycbcr422601_pl ]
+            :evas_colorspace_gry8, :evas_colorspace_ycbcr422601_pl, :evas_colorspace_ycbcr420nv12601_pl, :evas_colorspace_ycbcr420tm12601_pl ]
         # typedef enum _Evas_Object_Table_Homogeneous_Mode {...} Evas_Object_Table_Homogeneous_Mode;
         enum :evas_object_table_homogeneous_mode, [ :evas_object_table_homogeneous_none, 0, :evas_object_table_homogeneous_table, 1, :evas_object_table_homogeneous_item,
             2 ]
@@ -253,6 +251,8 @@ module Efl
         callback :evas_object_image_pixels_get_cb, [ :void_p, :evas_object_p ], :void
         # typedef void (*Evas_Object_Box_Layout) (Evas_Object *o, Evas_Object_Box_Data *priv, void *user_data);
         callback :evas_object_box_layout, [ :evas_object_p, :evas_object_box_data_p, :void_p ], :void
+        # void (*free_data)(void *data)
+        callback :evas_free_data_cb, [ :void_p ], :void
         #
         # VARIABLES
         # EAPI extern Evas_Version *evas_version;
@@ -1118,6 +1118,8 @@ module Efl
         [ :evas_object_smart_calculate, [ :evas_object_p ], :void ],
         # EAPI void evas_smart_objects_calculate (Evas *e);
         [ :evas_smart_objects_calculate, [ :evas_p ], :void ],
+        # EAPI int evas_smart_objects_calculate_count_get (const Evas *e);
+        [ :evas_smart_objects_calculate_count_get, [ :evas_p ], :int ],
         # EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy);
         [ :evas_object_smart_move_children_relative, [ :evas_object_p, :int, :int ], :void ],
         # EAPI Evas_Object *evas_object_smart_clipped_clipper_get (Evas_Object *obj);
@@ -1131,7 +1133,7 @@ module Efl
         # EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get (void);
         [ :evas_object_box_smart_class_get, [  ], :evas_object_box_api_p ],
         # EAPI void evas_object_box_layout_set (Evas_Object *o, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data));
-        # FIXME
+        [ :evas_object_box_layout_set, [ :evas_object_p, :evas_object_box_layout, :void_p, :evas_free_data_cb ], :void ],
         # EAPI Evas_Object *evas_object_box_add (Evas *evas);
         [ :evas_object_box_add, [ :evas_p ], :evas_object_p ],
         # EAPI Evas_Object *evas_object_box_add_to (Evas_Object *parent);