gir_ffi 0.6.7 → 0.7.0

data/lib/gir_ffi/info_ext/i_callable_info.rb

@@ -5,15 +5,6 @@ module GirFFI
       def argument_ffi_types
         args.map { |arg| arg.to_ffitype }
       end
-
-      def return_ffi_type
-        return_type.to_ffitype
-      end
-
-      # TODO: Move to extension just for ICallbackInfo
-      def to_ffitype
-        Builder.build_class(self)
-      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_callback_info.rb

@@ -0,0 +1,17 @@
+module GirFFI
+  module InfoExt
+    # Extensions for GObjectIntrospection::ICallbackInfo needed by GirFFI
+    module ICallbackInfo
+      def to_ffitype
+        Builder.build_class(self)
+      end
+
+      def return_ffi_type
+        return_type.to_callback_ffitype
+      end
+    end
+  end
+end
+
+GObjectIntrospection::ICallbackInfo.send :include, GirFFI::InfoExt::ICallbackInfo
+

data/lib/gir_ffi/info_ext/i_function_info.rb

@@ -8,6 +8,10 @@ module GirFFI
           types << :pointer if throws?
         end
       end
+
+      def return_ffi_type
+        return_type.to_ffitype
+      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_property_info.rb

@@ -5,6 +5,10 @@ module GirFFI
       def getter_name
         name.gsub(/-/, '_')
       end
+
+      def setter_name
+        "#{getter_name}="
+      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -2,6 +2,7 @@ require 'gir_ffi/builder_helper'
 
 module GirFFI
   module InfoExt
+    # Extensions for GObjectIntrospection::IRegisteredTypeInfo needed by GirFFI
     module IRegisteredTypeInfo
       def to_ffitype
         to_type.to_ffitype

data/lib/gir_ffi/info_ext/i_signal_info.rb

@@ -1,7 +1,6 @@
 module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::ISignalInfo needed by GirFFI
-    # TODO: Rename methods to not include 'signal' everywhere.
     module ISignalInfo
       # Create a signal hander callback. Wraps the given block in such a way that
       # arguments and return value are cast correctly to the ruby world and back.
@@ -10,33 +9,32 @@ module GirFFI
       #
       # @return [FFI::Function] The signal handler, ready to be passed as a
       #   callback to C.
-      def signal_callback &block
-        rettype = self.return_ffi_type
-        argtypes = self.ffi_callback_argument_types
-
+      def create_callback &block
         raise ArgumentError, "Block needed" unless block
 
         # TODO: Find the signal module directly, then retrieve the info
         # from that, instead of vice versa.
         bldr = Builders::SignalBuilder.new(self)
         wrapped = bldr.build_class.from(block)
-        FFI::Function.new rettype, argtypes, &wrapped
+        FFI::Function.new return_ffi_type, ffi_callback_argument_types, &wrapped
       end
 
-      def signal_arguments_to_gvalue_array instance, *rest
-        arr = ::GObject::ValueArray.new self.n_args + 1
-
-        arr.append GObject::Value.wrap_instance(instance)
+      # TODO: Use argument info to convert out arguments and array lengths.
+      def arguments_to_gvalue_array_pointer object, args
+        arr = arguments_to_gvalues object, args
+        GirFFI::InPointer.from_array GObject::Value, arr
+      end
 
-        self.args.zip(rest).each do |info, arg|
-          arr.append info.argument_type.make_g_value.set_value(arg)
+      def arguments_to_gvalues instance, arguments
+        arg_values = self.args.zip(arguments).map do |info, arg|
+          info.argument_type.make_g_value.set_value(arg)
         end
 
-        arr
+        arg_values.unshift GObject::Value.wrap_instance(instance)
       end
 
-      def gvalue_for_signal_return_value
-        GObject::Value.for_g_type return_type.g_type
+      def gvalue_for_return_value
+        return_type.make_g_value
       end
 
       # TODO: Rename and clarify relation to argument_ffi_types:
@@ -52,7 +50,7 @@ module GirFFI
       end
 
       def return_ffi_type
-        result = super
+        result = return_type.to_ffitype
         if result == GLib::Boolean
           :bool
         else

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -2,17 +2,30 @@ require 'gir_ffi/builder_helper'
 
 module GirFFI
   module InfoExt
-    # Extensions for GObjectIntrospection::IArgInfo needed by GirFFI
+    # Extensions for GObjectIntrospection::ITypeInfo needed by GirFFI
     module ITypeInfo
-      include BuilderHelper
+
+      def self.flattened_tag_to_gtype_map
+        @flattened_tag_to_gtype_map ||= {
+          :array => GObject::TYPE_ARRAY,
+          :c => GObject::TYPE_POINTER,
+          :gboolean => GObject::TYPE_BOOLEAN,
+          :ghash => GObject::TYPE_HASH_TABLE,
+          :gint32 => GObject::TYPE_INT,
+          :gint64 => GObject::TYPE_INT64,
+          :guint64 => GObject::TYPE_UINT64,
+          :strv => GObject::TYPE_STRV,
+          :utf8 => GObject::TYPE_STRING,
+          :void => GObject::TYPE_NONE
+        }
+      end
 
       def g_type
-        tag = self.tag
-        case tag
-        when :interface
+        if tag == :interface
           interface.g_type
         else
-          GObject::TYPE_TAG_TO_GTYPE[tag]
+          ITypeInfo.flattened_tag_to_gtype_map[flattened_tag] or
+            raise "Can't find type for #{flattened_tag} pointer? = #{pointer?}"
         end
       end
 
@@ -22,10 +35,10 @@ module GirFFI
 
       def element_type
         case tag
-        when :glist, :gslist, :array
-          subtype_tag_or_class 0
+        when :glist, :gslist, :array, :c
+          enumerable_element_type 
         when :ghash
-          [subtype_tag_or_class(0), subtype_tag_or_class(1)]
+          dictionary_element_type
         else
           nil
         end
@@ -46,18 +59,16 @@ module GirFFI
         tag == :interface && interface.info_type
       end
 
-      def subtype_tag_or_class index = 0
-        param_type(index).tag_or_class
-      end
-
       def tag_or_class
-        base = case flattened_tag
-               when :struct, :union, :object, :interface, :enum, :flags
+        base = case tag
+               when:interface
                  Builder.build_class interface
+               when :ghash
+                 [tag, *element_type]
                else
                  flattened_tag
                end
-        if pointer? && tag != :utf8 && tag != :filename || interface_type == :object
+        if pointer? && tag != :utf8 && tag != :filename
           [:pointer, base]
         else
           base
@@ -67,8 +78,7 @@ module GirFFI
       TAG_TO_WRAPPER_CLASS_MAP = {
         :array => 'GLib::Array',
         :byte_array => 'GLib::ByteArray',
-        :c => 'GLib::SizedArray',
-        :callback => 'GirFFI::Callback',
+        :c => 'GirFFI::SizedArray',
         :error => 'GLib::Error',
         :ghash => 'GLib::HashTable',
         :glist => 'GLib::List',
@@ -82,8 +92,7 @@ module GirFFI
 
       # TODO: Use class rather than class name
       def argument_class_name
-        case flattened_tag
-        when :struct, :union, :object, :interface, :enum, :flags, :callback
+        if tag == :interface
           interface.full_type_name
         else
           TAG_TO_WRAPPER_CLASS_MAP[flattened_tag]
@@ -93,28 +102,20 @@ module GirFFI
       def to_ffitype
         return :pointer if pointer?
 
-        type_tag = tag
-        case type_tag
+        case tag
         when :interface
           interface.to_ffitype
         when :array
-          subtype = param_type(0).to_ffitype
-          # NOTE: Don't use pointer directly to appease JRuby.
-          if subtype == :pointer
-            subtype = :"uint#{FFI.type_size(:pointer)*8}"
-          end
-          [subtype, array_fixed_size]
+          [subtype_ffitype(0), array_fixed_size]
         else
-          TypeMap.map_basic_type type_tag
+          TypeMap.map_basic_type tag
         end
       end
 
       def to_callback_ffitype
-        type_tag = tag
-
         return :pointer if pointer?
 
-        if type_tag == :interface
+        if tag == :interface
           case interface.info_type
           when :enum, :flags
             :int32
@@ -122,16 +123,31 @@ module GirFFI
             :pointer
           end
         else
-          return TypeMap.map_basic_type type_tag
+          TypeMap.map_basic_type tag
         end
       end
 
+      def needs_ruby_to_c_conversion_for_functions?
+        [ :array, :c, :callback, :ghash, :glist, :gslist, :object, :ptr_array,
+          :struct, :strv, :utf8, :void, :zero_terminated ].include?(flattened_tag)
+      end
+
+      def needs_conversion_for_functions?
+        [ :array, :byte_array, :c, :error, :filename, :ghash, :glist,
+          :gslist, :interface, :object, :ptr_array, :struct, :strv, :union,
+          :utf8, :zero_terminated ].include?(flattened_tag)
+      end
+
+      def needs_conversion_for_callbacks?
+        flattened_tag == :enum || needs_conversion_for_functions?
+      end
+
       def extra_conversion_arguments
         case flattened_tag
         when :utf8, :void
           [flattened_tag]
         when :c
-          [subtype_tag_or_class, array_fixed_size]
+          [element_type, array_fixed_size]
         when :array, :ghash, :glist, :gslist, :ptr_array, :zero_terminated
           [element_type]
         else
@@ -141,6 +157,28 @@ module GirFFI
 
       private
 
+      def subtype_tag_or_class index
+        param_type(index).tag_or_class
+      end
+
+      def dictionary_element_type
+        [subtype_tag_or_class(0), subtype_tag_or_class(1)]
+      end
+
+      def enumerable_element_type
+        subtype_tag_or_class 0
+      end
+
+      def subtype_ffitype(index)
+        subtype = param_type(index).to_ffitype
+        if subtype == :pointer
+          # NOTE: Don't use pointer directly to appease JRuby.
+          :"uint#{FFI.type_size(:pointer)*8}"
+        else
+          subtype
+        end
+      end
+
       def flattened_array_type
         if zero_terminated?
           zero_terminated_array_type

data/lib/gir_ffi/info_ext/i_vfunc_info.rb

@@ -0,0 +1,12 @@
+module GirFFI
+  module InfoExt
+    # Extensions for GObjectIntrospection::IVFuncInfo needed by GirFFI
+    module IVFuncInfo
+      def return_ffi_type
+        return_type.to_callback_ffitype
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IVFuncInfo.send :include, GirFFI::InfoExt::IVFuncInfo

data/lib/gir_ffi/info_ext/safe_constant_name.rb

@@ -13,9 +13,9 @@ module GirFFI
         end
       end
 
-      # FIXME: Remove leading colons.
+      # FIXME: This is invalid for ISignalInfo and IVFuncInfo
       def full_type_name
-        "::#{safe_namespace}::#{safe_name}"
+        "#{safe_namespace}::#{safe_name}"
       end
     end
   end
@@ -25,3 +25,4 @@ GObjectIntrospection::ICallbackInfo.send :include, GirFFI::InfoExt::SafeConstant
 GObjectIntrospection::IConstantInfo.send :include, GirFFI::InfoExt::SafeConstantName
 GObjectIntrospection::IRegisteredTypeInfo.send :include, GirFFI::InfoExt::SafeConstantName
 GObjectIntrospection::ISignalInfo.send :include, GirFFI::InfoExt::SafeConstantName
+GObjectIntrospection::IVFuncInfo.send :include, GirFFI::InfoExt::SafeConstantName

data/lib/gir_ffi/interface_base.rb

@@ -1,8 +1,9 @@
+require 'gir_ffi/type_base'
+
 module GirFFI
+  # Base module for modules representing GLib interfaces.
   module InterfaceBase
-    def gir_ffi_builder
-      self.const_get :GIR_FFI_BUILDER
-    end
+    include TypeBase
 
     def setup_instance_method name
       gir_ffi_builder.setup_instance_method name
@@ -11,5 +12,9 @@ module GirFFI
     def wrap ptr
       ptr.to_object
     end
+
+    def to_ffitype
+      :pointer
+    end
   end
 end

data/lib/gir_ffi/module_base.rb

@@ -1,4 +1,5 @@
 module GirFFI
+  # Base module for modules representing GLib namespaces.
   module ModuleBase
     def method_missing method, *arguments, &block
       result = setup_method method.to_s
@@ -10,15 +11,12 @@ module GirFFI
       load_class(classname) || super
     end
 
-    # @deprecated Compatibility function. Remove in 0.7.0.
-    def load_class classname
-      setup_class classname
-    end
-
     def setup_class classname
       gir_ffi_builder.build_namespaced_class classname.to_s
     end
 
+    alias load_class setup_class
+
     def gir_ffi_builder
       self.const_get :GIR_FFI_BUILDER
     end

data/lib/gir_ffi/object_base.rb

@@ -48,5 +48,13 @@ module GirFFI
     def self.to_ffitype
       :pointer
     end
+
+    def self.copy_value_to_pointer value, pointer, offset=0
+      pointer.put_pointer offset, value.to_ptr
+    end
+
+    def self.object_class
+      gir_ffi_builder.object_class
+    end
   end
 end

data/lib/gir_ffi/receiver_argument_info.rb

@@ -0,0 +1,21 @@
+# Class to represent the info for the receiver argument of a callback or signal
+# handler. Implements the necessary parts of IArgumentInfo's interface.
+class GirFFI::ReceiverArgumentInfo
+  attr_reader :argument_type
+
+  def initialize type
+    @argument_type = type
+  end
+
+  def direction
+    :in
+  end
+
+  def skip?
+    false
+  end
+
+  def name
+    "_instance"
+  end
+end

data/lib/gir_ffi/receiver_type_info.rb

@@ -0,0 +1,27 @@
+module GirFFI
+  # Represents the type of the receiver of a signal or vfunc, conforming, as
+  # needed, to the interface of GObjectIntrospection::ITypeInfo
+  class ReceiverTypeInfo
+    include InfoExt::ITypeInfo
+
+    def initialize interface_info
+      @interface_info = interface_info
+    end
+
+    def interface
+      @interface_info
+    end
+
+    def tag
+      :interface
+    end
+
+    def pointer?
+      false
+    end
+
+    def array_length
+      -1
+    end
+  end
+end