gir_ffi 0.0.3 → 0.0.4

data/lib/gir_ffi/i_base_info.rb

@@ -32,10 +32,18 @@ module GirFFI
 
     private_class_method :new
 
-    def name; Lib.g_base_info_get_name @gobj; end
-    def type; Lib.g_base_info_get_type @gobj; end
-    def namespace; Lib.g_base_info_get_namespace @gobj; end
-    def deprecated?; Lib.g_base_info_is_deprecated @gobj; end
+    def name
+      Lib.g_base_info_get_name @gobj
+    end
+    def type
+      Lib.g_base_info_get_type @gobj
+    end
+    def namespace
+      Lib.g_base_info_get_namespace @gobj
+    end
+    def deprecated?
+      Lib.g_base_info_is_deprecated @gobj
+    end
 
     def self.wrap ptr
       return nil if ptr.null?

data/lib/gir_ffi/i_callable_info.rb

@@ -6,11 +6,21 @@ module GirFFI
   # Wraps a GICallableInfo struct; represents a callable, either
   # IFunctionInfo, ICallbackInfo or IVFuncInfo.
   class ICallableInfo < IBaseInfo
-    def return_type; ITypeInfo.wrap(Lib.g_callable_info_get_return_type @gobj); end
-    def caller_owns; Lib.g_callable_info_get_caller_owns @gobj; end
-    def may_return_null?; Lib.g_callable_info_may_return_null @gobj; end
-    def n_args; Lib.g_callable_info_get_n_args @gobj; end
-    def arg(index); IArgInfo.wrap(Lib.g_callable_info_get_arg @gobj, index); end
+    def return_type
+      ITypeInfo.wrap(Lib.g_callable_info_get_return_type @gobj)
+    end
+    def caller_owns
+      Lib.g_callable_info_get_caller_owns @gobj
+    end
+    def may_return_null?
+      Lib.g_callable_info_may_return_null @gobj
+    end
+    def n_args
+      Lib.g_callable_info_get_n_args @gobj
+    end
+    def arg(index)
+      IArgInfo.wrap(Lib.g_callable_info_get_arg @gobj, index)
+    end
     ##
     build_array_method :args
   end

data/lib/gir_ffi/i_enum_info.rb

@@ -2,12 +2,18 @@ module GirFFI
   # Wraps a GIEnumInfo struct if it represents an enum.
   # If it represents a flag, an IFlagsInfo object is used instead.
   class IEnumInfo < IRegisteredTypeInfo
-    def n_values; Lib.g_enum_info_get_n_values @gobj; end
-    def value(index); IValueInfo.wrap(Lib.g_enum_info_get_value @gobj, index); end
+    def n_values
+      Lib.g_enum_info_get_n_values @gobj
+    end
+    def value(index)
+      IValueInfo.wrap(Lib.g_enum_info_get_value @gobj, index)
+    end
     ##
     build_array_method :values
 
-    def storage_type; Lib.g_enum_info_get_storage_type @gobj; end
+    def storage_type
+      Lib.g_enum_info_get_storage_type @gobj
+    end
   end
 end
 

data/lib/gir_ffi/i_field_info.rb

@@ -2,9 +2,17 @@ module GirFFI
   # Wraps a GIFieldInfo struct.
   # Represents a field of an IStructInfo or an IUnionInfo.
   class IFieldInfo < IBaseInfo
-    def flags; Lib.g_field_info_get_flags @gobj; end
-    def size; Lib.g_field_info_get_size @gobj; end
-    def offset; Lib.g_field_info_get_offset @gobj; end
-    def type; ITypeInfo.wrap(Lib.g_field_info_get_type @gobj); end
+    def flags
+      Lib.g_field_info_get_flags @gobj
+    end
+    def size
+      Lib.g_field_info_get_size @gobj
+    end
+    def offset
+      Lib.g_field_info_get_offset @gobj
+    end
+    def type
+      ITypeInfo.wrap(Lib.g_field_info_get_type @gobj)
+    end
   end
 end

data/lib/gir_ffi/i_function_info.rb

@@ -2,15 +2,31 @@ module GirFFI
   # Wraps a GIFunctioInfo struct.
   # Represents a function.
   class IFunctionInfo < ICallableInfo
-    def symbol; Lib.g_function_info_get_symbol @gobj; end
-    def flags; Lib.g_function_info_get_flags @gobj; end
+    def symbol
+      Lib.g_function_info_get_symbol @gobj
+    end
+    def flags
+      Lib.g_function_info_get_flags @gobj
+    end
 
     #TODO: Use some sort of bitfield
-    def method?; flags & 1 != 0 end
-    def constructor?; flags & 2 != 0 end
-    def getter?; flags & 4 != 0 end
-    def setter?; flags & 8 != 0 end
-    def wraps_vfunc?; flags & 16 != 0 end
-    def throws?; flags & 32 != 0 end
+    def method?
+      flags & 1 != 0
+    end
+    def constructor?
+      flags & 2 != 0
+    end
+    def getter?
+      flags & 4 != 0
+    end
+    def setter?
+      flags & 8 != 0
+    end
+    def wraps_vfunc?
+      flags & 16 != 0
+    end
+    def throws?
+      flags & 32 != 0
+    end
   end
 end

data/lib/gir_ffi/i_object_info.rb

@@ -2,49 +2,91 @@ module GirFFI
   # Wraps a GIObjectInfo struct.
   # Represents an object.
   class IObjectInfo < IRegisteredTypeInfo
-    def type_name; Lib.g_object_info_get_type_name @gobj; end
-    def type_init; Lib.g_object_info_get_type_init @gobj; end
-    def abstract?; Lib.g_object_info_get_abstract @gobj; end
-    def parent; IObjectInfo.wrap(Lib.g_object_info_get_parent @gobj); end
+    def type_name
+      Lib.g_object_info_get_type_name @gobj
+    end
+    def type_init
+      Lib.g_object_info_get_type_init @gobj
+    end
+    def abstract?
+      Lib.g_object_info_get_abstract @gobj
+    end
+    def parent
+      IObjectInfo.wrap(Lib.g_object_info_get_parent @gobj)
+    end
 
-    def n_interfaces; Lib.g_object_info_get_n_interfaces @gobj; end
-    def interface(index); IInterfaceInfo.wrap(Lib.g_object_info_get_interface @gobj, index); end
+    def n_interfaces
+      Lib.g_object_info_get_n_interfaces @gobj
+    end
+    def interface(index)
+      IInterfaceInfo.wrap(Lib.g_object_info_get_interface @gobj, index)
+    end
     ##
     build_array_method :interfaces
 
-    def n_fields; Lib.g_object_info_get_n_fields @gobj; end
-    def field(index); IFieldInfo.wrap(Lib.g_object_info_get_field @gobj, index); end
+    def n_fields
+      Lib.g_object_info_get_n_fields @gobj
+    end
+    def field(index)
+      IFieldInfo.wrap(Lib.g_object_info_get_field @gobj, index)
+    end
     ##
     build_array_method :fields
 
-    def n_properties; Lib.g_object_info_get_n_properties @gobj; end
-    def property(index); IPropertyInfo.wrap(Lib.g_object_info_get_property @gobj, index); end
+    def n_properties
+      Lib.g_object_info_get_n_properties @gobj
+    end
+    def property(index)
+      IPropertyInfo.wrap(Lib.g_object_info_get_property @gobj, index)
+    end
     ##
     build_array_method :properties, :property
 
-    def n_methods; Lib.g_object_info_get_n_methods @gobj; end
-    def method(index); IFunctionInfo.wrap(Lib.g_object_info_get_method @gobj, index); end
+    def n_methods
+      Lib.g_object_info_get_n_methods @gobj
+    end
+    def method(index)
+      IFunctionInfo.wrap(Lib.g_object_info_get_method @gobj, index)
+    end
     ##
     build_array_method :methods
 
-    def find_method(name); IFunctionInfo.wrap(Lib.g_object_info_find_method @gobj, name); end
+    def find_method(name)
+      IFunctionInfo.wrap(Lib.g_object_info_find_method @gobj, name)
+    end
 
-    def n_signals; Lib.g_object_info_get_n_signals @gobj; end
-    def signal(index); ISignalInfo.wrap(Lib.g_object_info_get_signal @gobj, index); end
+    def n_signals
+      Lib.g_object_info_get_n_signals @gobj
+    end
+    def signal(index)
+      ISignalInfo.wrap(Lib.g_object_info_get_signal @gobj, index)
+    end
     ##
     build_array_method :signals
 
-    def n_vfuncs; Lib.g_object_info_get_n_vfuncs @gobj; end
-    def vfunc(index); IVFuncInfo.wrap(Lib.g_object_info_get_vfunc @gobj, index); end
-    def find_vfunc; IVFuncInfo.wrap(Lib.g_object_info_find_vfunc @gobj); end
+    def n_vfuncs
+      Lib.g_object_info_get_n_vfuncs @gobj
+    end
+    def vfunc(index)
+      IVFuncInfo.wrap(Lib.g_object_info_get_vfunc @gobj, index)
+    end
+    def find_vfunc name
+      IVFuncInfo.wrap(Lib.g_object_info_find_vfunc @gobj, name)
+    end
     ##
     build_array_method :vfuncs
 
-    def n_constants; Lib.g_object_info_get_n_constants @gobj; end
-    def constant(index); IConstantInfo.wrap(Lib.g_object_info_get_constant @gobj, index); end
+    def n_constants
+      Lib.g_object_info_get_n_constants @gobj
+    end
+    def constant(index)
+      IConstantInfo.wrap(Lib.g_object_info_get_constant @gobj, index)
+    end
     ##
     build_array_method :constants
 
-    def class_struct; IStructInfo.wrap(Lib.g_object_info_get_class_struct @gobj); end
+    def class_struct
+      IStructInfo.wrap(Lib.g_object_info_get_class_struct @gobj)
+    end
   end
 end

data/lib/gir_ffi/i_registered_type_info.rb

@@ -3,6 +3,17 @@ module GirFFI
   # Represents a registered type.
   # Not implemented yet.
   class IRegisteredTypeInfo < IBaseInfo
+    def type_name
+      Lib.g_registered_type_info_get_type_name @gobj
+    end
+
+    def type_init
+      Lib.g_registered_type_info_get_type_init @gobj
+    end
+
+    def g_type
+      Lib.g_registered_type_info_get_g_type @gobj
+    end
   end
 end
 

data/lib/gir_ffi/i_repository.rb

@@ -1,6 +1,6 @@
 require 'singleton'
 require 'gir_ffi/lib'
-require 'gir_ffi/g_type'
+require 'gir_ffi/g_object'
 require 'gir_ffi/g_error'
 require 'gir_ffi/i_base_info'
 require 'gir_ffi/i_callable_info'
@@ -52,7 +52,7 @@ module GirFFI
     }
 
     def initialize
-      GType.init
+      GObject.type_init
       @gobj = Lib::g_irepository_get_default
     end
 

data/lib/gir_ffi/i_signal_info.rb

@@ -2,6 +2,6 @@ module GirFFI
   # Wraps a GISignalInfo struct.
   # Represents a signal.
   # Not implemented yet.
-  class ISignalInfo < IBaseInfo
+  class ISignalInfo < ICallableInfo
   end
 end

data/lib/gir_ffi/i_struct_info.rb

@@ -2,21 +2,37 @@ module GirFFI
   # Wraps a GIStructInfo struct.
   # Represents a struct.
   class IStructInfo < IRegisteredTypeInfo
-    def n_fields; Lib.g_struct_info_get_n_fields @gobj; end
-    def field(index); IFieldInfo.wrap(Lib.g_struct_info_get_field @gobj, index); end
+    def n_fields
+      Lib.g_struct_info_get_n_fields @gobj
+    end
+    def field(index)
+      IFieldInfo.wrap(Lib.g_struct_info_get_field @gobj, index)
+    end
 
     ##
     build_array_method :fields
 
-    def n_methods; Lib.g_struct_info_get_n_methods @gobj; end
-    def method(index); IFunctionInfo.wrap(Lib.g_struct_info_get_method @gobj, index); end
+    def n_methods
+      Lib.g_struct_info_get_n_methods @gobj
+    end
+    def method(index)
+      IFunctionInfo.wrap(Lib.g_struct_info_get_method @gobj, index)
+    end
 
     ##
     build_array_method :methods
 
-    def find_method(name); IFunctionInfo.wrap(Lib.g_struct_info_find_method @gobj, name); end
-    def size; Lib.g_struct_info_get_size @gobj; end
-    def alignment; Lib.g_struct_info_get_alignment @gobj; end
-    def gtype_struct?; Lib.g_struct_info_is_gtype_struct @gobj; end
+    def find_method(name)
+      IFunctionInfo.wrap(Lib.g_struct_info_find_method @gobj, name)
+    end
+    def size
+      Lib.g_struct_info_get_size @gobj
+    end
+    def alignment
+      Lib.g_struct_info_get_alignment @gobj
+    end
+    def gtype_struct?
+      Lib.g_struct_info_is_gtype_struct @gobj
+    end
   end
 end

data/lib/gir_ffi/i_type_info.rb

@@ -2,18 +2,34 @@ module GirFFI
   # Wraps a GITypeInfo struct.
   # Represents type information, direction, transfer etc.
   class ITypeInfo < IBaseInfo
-    def pointer?; Lib.g_type_info_is_pointer @gobj; end
-    def tag; Lib.g_type_info_get_tag @gobj; end
-    def param_type(index); ITypeInfo.wrap(Lib.g_type_info_get_param_type @gobj, index); end
+    def pointer?
+      Lib.g_type_info_is_pointer @gobj
+    end
+    def tag
+      Lib.g_type_info_get_tag @gobj
+    end
+    def param_type(index)
+      ITypeInfo.wrap(Lib.g_type_info_get_param_type @gobj, index)
+    end
     def interface
       ptr = Lib.g_type_info_get_interface @gobj
       IRepository.wrap_ibaseinfo_pointer ptr
     end
-    def array_length; Lib.g_type_info_get_array_length @gobj; end
-    def array_fixed_size; Lib.g_type_info_get_array_fixed_size @gobj; end
-    def zero_terminated?; Lib.g_type_info_is_zero_terminated @gobj; end
-    def n_error_domains; Lib.g_type_info_get_n_error_domains @gobj; end
-    def error_domain(index); IErrorDomainInfo.wrap(Lib.g_type_info_get_error_domain @gobj, index); end
+    def array_length
+      Lib.g_type_info_get_array_length @gobj
+    end
+    def array_fixed_size
+      Lib.g_type_info_get_array_fixed_size @gobj
+    end
+    def zero_terminated?
+      Lib.g_type_info_is_zero_terminated @gobj
+    end
+    def n_error_domains
+      Lib.g_type_info_get_n_error_domains @gobj
+    end
+    def error_domain(index)
+      IErrorDomainInfo.wrap(Lib.g_type_info_get_error_domain @gobj, index)
+    end
     ##
     build_array_method :error_domains
 

data/lib/gir_ffi/i_union_info.rb

@@ -3,5 +3,20 @@ module GirFFI
   # Represents a union.
   # Not implemented yet.
   class IUnionInfo < IRegisteredTypeInfo
+    def n_fields; Lib.g_union_info_get_n_fields @gobj; end
+    def field(index); IFieldInfo.wrap(Lib.g_union_info_get_field @gobj, index); end
+
+    ##
+    build_array_method :fields
+
+    def n_methods; Lib.g_union_info_get_n_methods @gobj; end
+    def method(index); IFunctionInfo.wrap(Lib.g_union_info_get_method @gobj, index); end
+
+    ##
+    build_array_method :methods
+
+    def find_method(name); IFunctionInfo.wrap(Lib.g_union_info_find_method @gobj, name); end
+    def size; Lib.g_union_info_get_size @gobj; end
+    def alignment; Lib.g_union_info_get_alignment @gobj; end
   end
 end

data/lib/gir_ffi/i_value_info.rb

@@ -2,7 +2,9 @@ module GirFFI
   # Wraps a GIValueInfo struct.
   # Represents one of the enum values of an IEnumInfo.
   class IValueInfo < IBaseInfo
-    def value; Lib.g_value_info_get_value @gobj; end
+    def value
+      Lib.g_value_info_get_value @gobj
+    end
   end
 end
 

data/lib/gir_ffi/i_vfunc_info.rb

@@ -1,7 +1,18 @@
 module GirFFI
   # Wraps a GIVFuncInfo struct.
   # Represents a virtual function.
-  # Not implemented yet.
   class IVFuncInfo < IBaseInfo
+    def flags
+      Lib.g_vfunc_info_get_flags @gobj
+    end
+    def offset
+      Lib.g_vfunc_info_get_offset @gobj
+    end
+    def signal
+      ISignalInfo.wrap(Lib.g_vfunc_info_get_signal @gobj)
+    end
+    def invoker
+      IFunctionInfo.wrap(Lib.g_vfunc_info_get_invoker @gobj)
+    end
   end
 end

data/lib/gir_ffi/lib.rb

@@ -139,8 +139,18 @@ module GirFFI
     attach_function :g_field_info_get_type, [:pointer], :pointer
 
     # IUnionInfo
-    # IStructInfo
+    attach_function :g_union_info_get_n_fields, [:pointer], :int
+    attach_function :g_union_info_get_field, [:pointer, :int], :pointer
+    attach_function :g_union_info_get_n_methods, [:pointer], :int
+    attach_function :g_union_info_get_method, [:pointer, :int], :pointer
+    attach_function :g_union_info_find_method, [:pointer, :string], :pointer
+    attach_function :g_union_info_get_size, [:pointer], :int
+    attach_function :g_union_info_get_alignment, [:pointer], :int
+ 
     # IRegisteredTypeInfo
+    attach_function :g_registered_type_info_get_type_name, [:pointer], :string
+    attach_function :g_registered_type_info_get_type_init, [:pointer], :string
+    attach_function :g_registered_type_info_get_g_type, [:pointer], :int
 
     # IEnumInfo
     attach_function :g_enum_info_get_storage_type, [:pointer], :ITypeTag
@@ -170,5 +180,17 @@ module GirFFI
     attach_function :g_object_info_get_constant, [:pointer, :int], :pointer
     attach_function :g_object_info_get_class_struct, [:pointer], :pointer
 
+    # IVFuncInfo
+
+    enum :IVFuncInfoFlags, [
+      :must_chain_up, (1 << 0),
+      :must_override, (1 << 1),
+      :must_not_override, (1 << 2)
+    ]
+
+    attach_function :g_vfunc_info_get_flags, [:pointer], :IVFuncInfoFlags
+    attach_function :g_vfunc_info_get_offset, [:pointer], :int
+    attach_function :g_vfunc_info_get_signal, [:pointer], :pointer
+    attach_function :g_vfunc_info_get_invoker, [:pointer], :pointer
   end
 end