gir_ffi 0.0.3 → 0.0.4

data/lib/gir_ffi/class_builder.rb

@@ -1,7 +1,9 @@
+require 'gir_ffi/builder_helper'
 module GirFFI
   # Builds a class based on information found in the introspection
   # repository.
   class ClassBuilder
+    include BuilderHelper
     def initialize namespace, classname
       @namespace = namespace
       @classname = classname
@@ -11,61 +13,120 @@ module GirFFI
       build_class
     end
 
+    def setup_method method
+      definition = prepare_method method.to_s
+
+      return false if definition.nil?
+
+      klass = build_class
+      meta = (class << klass; self; end)
+      meta.class_eval definition
+
+      true
+    end
+
+    def setup_instance_method method
+      definition = prepare_method method.to_s
+
+      if definition.nil?
+	if parent
+	  return superclass.gir_ffi_builder.setup_instance_method method
+	else
+	  return false
+	end
+      end
+
+      klass = build_class
+      klass.class_eval "undef #{method}"
+      klass.class_eval definition
+
+      true
+    end
+
+    def find_signal signal_name
+      info.signals.each do |s|
+	return s if s.name == signal_name
+      end
+      if info.parent
+	return superclass.gir_ffi_builder.find_signal signal_name
+      end
+    end
+
     private
 
     def build_class
-      get_gir_info
-      instantiate_module
-      case @info.type
-	when :object, :struct
-	  instantiate_class
-	  setup_class unless already_set_up
-	when :enum, :flags
-	  @klass = BuilderHelper.optionally_define_constant @module, @classname do
-	    vals = @info.values.map {|v| [v.name.to_sym, v.value]}.flatten
-	    @lib.enum(@classname.to_sym, vals)
-	  end
+      unless defined? @klass
+	case info.type
+	  when :object, :struct
+	    instantiate_class
+	    setup_class unless already_set_up
+	  when :union
+	    instantiate_union_class
+	    setup_class unless already_set_up
+	  when :enum, :flags
+	    @klass = optionally_define_constant namespace_module, @classname do
+	      vals = info.values.map {|v| [v.name.to_sym, v.value]}.flatten
+	      lib.enum(@classname.to_sym, vals)
+	    end
+	  else
+	    raise NotImplementedError, "Cannot build classes of type #{info.type}"
+	end
       end
       @klass
     end
 
-    def get_gir_info
-      gir = IRepository.default
-      gir.require @namespace, nil
+    def info
+      unless defined? @info
+	@info = gir.find_by_name @namespace, @classname
+	raise "Class #{@classname} not found in namespace #{@namespace}" if @info.nil?
+      end
+      @info
+    end
 
-      @info = gir.find_by_name @namespace, @classname
-      raise "Class #{@classname} not found in namespace #{@namespace}" if @info.nil?
+    def parent
+      unless defined? @parent
+	@parent = info.type == :object ? info.parent : nil
+      end
+      @parent
     end
 
-    def get_superclass
-      @parent = @info.type == :object ? @info.parent : nil
-      if @parent
-	@superclass = Builder.build_class @parent.namespace, @parent.name
-      else
-	@superclass = GirFFI::Base
+    def superclass
+      unless defined? @superclass
+	if parent
+	  @superclass = Builder.build_class parent.namespace, parent.name
+	else
+	  @superclass = GirFFI::ClassBase
+	end
       end
+      @superclass
+    end
+
+    def namespace_module
+      @namespace_module ||= Builder.build_module @namespace
     end
 
-    def instantiate_module
-      @module = Builder.build_module @namespace
-      @lib = @module.const_get :Lib
+    def lib
+      @lib ||= namespace_module.const_get :Lib
     end
 
     def instantiate_class
-      get_superclass
-      @klass = BuilderHelper.get_or_define_class @module, @classname, @superclass
-      @structklass = BuilderHelper.get_or_define_class @klass, :Struct, FFI::Struct
+      @klass = get_or_define_class namespace_module, @classname, superclass
+      @structklass = get_or_define_class @klass, :Struct, FFI::Struct
+    end
+
+    def instantiate_union_class
+      @klass = get_or_define_class namespace_module, @classname, superclass
+      @structklass = get_or_define_class @klass, :Struct, FFI::Union
     end
 
     def setup_class
-      setup_method_missing
       setup_layout
-      alias_instance_methods
-    end
+      setup_constants
+      setup_instance_methods
+      setup_gtype_getter
 
-    def setup_method_missing
-      @klass.class_eval instance_method_missing_definition
-      @klass.class_eval class_method_missing_definition
+      setup_vfunc_invokers if info.type == :object
+      provide_struct_constructor if info.type == :struct
     end
 
     def setup_layout
@@ -74,30 +135,34 @@ module GirFFI
     end
 
     def layout_specification
-      if @info.fields.empty?
-	if @parent
-	  return [:parent, @superclass.const_get(:Struct), 0]
+      fields = info.fields
+
+      if fields.empty?
+	if parent
+	  return [:parent, superclass.const_get(:Struct), 0]
 	end
       end
-      spec = []
-      @info.fields.each do |f|
-	spec << f.name.to_sym
-	spec << itypeinfo_to_ffitype_for_struct(f.type)
-	spec << f.offset
-      end
-      spec
+
+      fields.map do |f|
+	[ f.name.to_sym,
+	  itypeinfo_to_ffitype_for_struct(f.type),
+	  f.offset ]
+      end.flatten
     end
 
     def itypeinfo_to_ffitype_for_struct typeinfo
       ffitype = Builder.itypeinfo_to_ffitype typeinfo
-      if ffitype.kind_of?(Class) and BuilderHelper.const_defined_for ffitype, :Struct
+      if ffitype.kind_of?(Class) and const_defined_for ffitype, :Struct
 	ffitype = ffitype.const_get :Struct
       end
+      if ffitype == :bool
+	ffitype = :int
+      end
       ffitype
     end
 
-    def alias_instance_methods
-      @info.methods.each do |m|
+    def setup_instance_methods
+      info.methods.each do |m|
 	@klass.class_eval "
 	  def #{m.name} *args, &block
 	    method_missing :#{m.name}, *args, &block
@@ -106,16 +171,77 @@ module GirFFI
       end
     end
 
-    def instance_method_missing_definition
-      InstanceMethodMissingDefinitionBuilder.new(@lib, @module, @namespace, @classname).generate
+    def setup_gtype_getter
+      getter = info.type_init
+      return if getter.nil? or getter == "intern"
+      lib.attach_function getter.to_sym, [], :int
+      @klass.class_eval "
+	def self.get_gtype
+	  ::#{lib}.#{getter}
+	end
+      "
+    end
+
+    def setup_vfunc_invokers
+      info.vfuncs.each do |v|
+	invoker = v.invoker
+	next if invoker.nil?
+	next if invoker.name == v.name
+
+	@klass.class_eval "
+	  def #{v.name} *args, &block
+	    #{invoker.name}(*args, &block)
+	  end
+	"
+      end
+    end
+
+    def provide_struct_constructor
+      return if info.find_method 'new'
+
+      (class << @klass; self; end).class_eval {
+	alias_method :new, :_real_new
+      }
     end
 
-    def class_method_missing_definition
-      ClassMethodMissingDefinitionBuilder.new(@lib, @module, @namespace, @classname).generate
+    def setup_constants
+      @klass.const_set :GIR_INFO, info
+      @klass.const_set :GIR_FFI_BUILDER, self
     end
 
     def already_set_up
-      @klass.instance_methods(false).map(&:to_sym).include? :method_missing
+      const_defined_for @klass, :GIR_FFI_BUILDER
+    end
+
+    def method_introspection_data method
+      info.find_method method
+    end
+
+    def function_definition go
+      FunctionDefinitionBuilder.new(go, lib).generate
+    end
+
+    def prepare_method method
+      go = method_introspection_data method
+
+      return nil if go.nil?
+
+      Builder.attach_ffi_function lib, go
+      function_definition go
+    end
+
+    def gir
+      unless defined? @gir
+	@gir = IRepository.default
+	@gir.require @namespace, nil
+      end
+      @gir
+    end
+
+    def get_or_define_class namespace, name, parent
+      optionally_define_constant(namespace, name) {
+	Class.new parent
+      }
     end
   end
 end

data/lib/gir_ffi/function_definition_builder.rb

@@ -44,8 +44,10 @@ module GirFFI
 	process_inout_arg arg
       when :in
 	process_in_arg arg
+      when :out
+	process_out_arg arg
       else
-	raise NotImplementedError
+	raise ArgumentError
       end
     end
 
@@ -76,6 +78,34 @@ module GirFFI
       @retvals << postvar
     end
 
+    def process_out_arg arg
+      prevar = new_var
+      postvar = new_var
+
+      case arg.type.tag
+      when :int, :int32
+	@pre << "#{prevar} = GirFFI::ArgHelper.int_to_inoutptr 0"
+	@post << "#{postvar} = GirFFI::ArgHelper.outptr_to_int #{prevar}"
+      when :double
+	@pre << "#{prevar} = GirFFI::ArgHelper.double_to_inoutptr 0"
+	@post << "#{postvar} = GirFFI::ArgHelper.outptr_to_double #{prevar}"
+      when :interface
+	iface = arg.type.interface
+	if iface.type == :struct
+	  @pre << "#{prevar} = #{iface.namespace}::#{iface.name}.new"
+	  @post << "#{postvar} = #{prevar}"
+	else
+	  raise NotImplementedError,
+	    "Don't know what to do with interface type #{iface.type}"
+	end
+      else
+	raise NotImplementedError,
+	  "Don't know what to do with argument type #{arg.type.tag}"
+      end
+      @callargs << prevar
+      @retvals << postvar
+    end
+
     def process_in_arg arg
       name = safe arg.name
       type = arg.type
@@ -87,7 +117,7 @@ module GirFFI
 	# TODO: Use arg.scope to decide if this is needed.
 	procvar = new_var
 	@pre << "#{procvar} = GirFFI::ArgHelper.mapped_callback_args #{name}"
-	@pre << "#{@libmodule}::CALLBACKS << #{procvar}"
+	@pre << "::#{@libmodule}::CALLBACKS << #{procvar}"
 	@callargs << procvar
       elsif tag == :void
 	raise NotImplementedError unless arg.type.pointer?
@@ -103,15 +133,22 @@ module GirFFI
       type = @info.return_type
       tag = type.tag
       return if tag == :void
-      retval = new_var
-      @capture = "#{retval} = "
+      cvar = new_var
+      @capture = "#{cvar} = "
 
       if tag == :interface
 	interface = type.interface
-	GirFFI::Builder.build_class interface.namespace, interface.name
-	@retvals << "#{interface.namespace}::#{interface.name}._real_new(#{retval})"
-      else
+	namespace = interface.namespace
+	name = interface.name
+	GirFFI::Builder.build_class namespace, name
+	retval = new_var
+	@post << "#{retval} = ::#{namespace}::#{name}._real_new(#{cvar})"
+	if interface.type == :object
+	  @post << "GirFFI::ArgHelper.sink_if_floating(#{retval})"
+	end
 	@retvals << retval
+      else
+	@retvals << cvar
       end
     end
 
@@ -119,7 +156,7 @@ module GirFFI
       if @info.throws?
 	errvar = new_var
 	@pre << "#{errvar} = FFI::MemoryPointer.new(:pointer).write_pointer nil"
-	@post << "GirFFI::ArgHelper.check_error(#{errvar})"
+	@post.unshift "GirFFI::ArgHelper.check_error(#{errvar})"
 	@callargs << errvar
       end
 
@@ -134,7 +171,7 @@ module GirFFI
       return <<-CODE
 	def #{@info.name} #{@inargs.join(', ')}
 	  #{@pre.join("\n")}
-	  #{@capture}#{@libmodule}.#{@info.symbol} #{@callargs.join(', ')}
+	  #{@capture}::#{@libmodule}.#{@info.symbol} #{@callargs.join(', ')}
 	  #{@post.join("\n")}
 	end
       CODE

data/lib/gir_ffi/g_object.rb

@@ -0,0 +1,37 @@
+require 'ffi'
+
+module GirFFI
+  module GObject
+    def self.type_init
+      Lib::g_type_init
+    end
+
+    def self.object_ref o
+      Lib::g_object_ref o.to_ptr
+    end
+
+    def self.object_ref_sink o
+      Lib::g_object_ref_sink o.to_ptr
+    end
+
+    def self.object_unref o
+      Lib::g_object_unref o.to_ptr
+    end
+
+    def self.object_is_floating o
+      Lib::g_object_is_floating o.to_ptr
+    end
+
+    module Lib
+      extend FFI::Library
+      ffi_lib "gobject-2.0"
+      attach_function :g_type_init, [], :void
+      attach_function :g_object_ref, [:pointer], :void
+      attach_function :g_object_ref_sink, [:pointer], :void
+      attach_function :g_object_unref, [:pointer], :void
+      attach_function :g_object_is_floating, [:pointer], :bool
+    end
+  end
+end
+
+

data/lib/gir_ffi/i_arg_info.rb

@@ -3,14 +3,32 @@ module GirFFI
   # Wraps a GIArgInfo struct.
   # Represents an argument.
   class IArgInfo < IBaseInfo
-    def direction; Lib.g_arg_info_get_direction @gobj; end
-    def return_value?; Lib.g_arg_info_is_return_value @gobj; end
-    def optional?; Lib.g_arg_info_is_optional @gobj; end
-    def may_be_null?; Lib.g_arg_info_may_be_null @gobj; end
-    def ownership_transfer; Lib.g_arg_info_get_ownership_transfer @gobj; end
-    def scope; Lib.g_arg_info_get_scope @gobj; end
-    def closure; Lib.g_arg_info_get_closure @gobj; end
-    def destroy; Lib.g_arg_info_get_destroy @gobj; end
-    def type; ITypeInfo.wrap(Lib.g_arg_info_get_type @gobj); end
+    def direction
+      Lib.g_arg_info_get_direction @gobj
+    end
+    def return_value?
+      Lib.g_arg_info_is_return_value @gobj
+    end
+    def optional?
+      Lib.g_arg_info_is_optional @gobj
+    end
+    def may_be_null?
+      Lib.g_arg_info_may_be_null @gobj
+    end
+    def ownership_transfer
+      Lib.g_arg_info_get_ownership_transfer @gobj
+    end
+    def scope
+      Lib.g_arg_info_get_scope @gobj
+    end
+    def closure
+      Lib.g_arg_info_get_closure @gobj
+    end
+    def destroy
+      Lib.g_arg_info_get_destroy @gobj
+    end
+    def type
+      ITypeInfo.wrap(Lib.g_arg_info_get_type @gobj)
+    end
   end
 end