gir_ffi 0.0.14 → 0.1.0

data/lib/ffi-gobject/closure.rb

@@ -0,0 +1,12 @@
+module GObject
+  load_class :Closure
+
+  class Closure
+    def set_marshal marshal
+      _v1 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper(
+        "GObject", "ClosureMarshal", marshal)
+        ::GObject::Lib::CALLBACKS << _v1
+        ::GObject::Lib.g_closure_set_marshal self, _v1
+    end
+  end
+end

data/lib/ffi-gobject/helper.rb

@@ -0,0 +1,119 @@
+module GObject
+  module Helper
+    TAG_TYPE_TO_GTYPE_NAME_MAP = {
+      :utf8 => "gchararray",
+      :gboolean => "gboolean",
+      :void => "void"
+    }
+
+    def self.signal_callback_args sig, klass, &block
+      return Proc.new do |*args|
+        mapped = cast_back_signal_arguments sig, klass, *args
+        block.call(*mapped)
+      end
+    end
+
+    def self.signal_arguments_to_gvalue_array signal, instance, *rest
+      sig = instance.class._find_signal signal
+
+      arr = ::GObject::ValueArray.new sig.n_args+1
+
+      arr.append signal_reciever_to_gvalue instance
+
+      sig.args.zip(rest).each do |info, arg|
+        arr.append signal_argument_to_gvalue info, arg
+      end
+
+      arr
+    end
+
+    def self.signal_reciever_to_gvalue instance
+      val = ::GObject::Value.new
+      val.init ::GObject.type_from_instance instance
+      val.set_instance instance
+      return val
+    end
+
+    def self.signal_argument_to_gvalue info, arg
+      arg_type = info.argument_type
+
+      val = gvalue_for_type_info arg_type
+
+      if arg_type.tag == :interface
+        interface = arg_type.interface
+        case interface.info_type
+        when :struct
+          val.set_boxed arg
+        when :object
+          val.set_instance arg
+        when :enum
+          val.set_enum arg
+        else
+          raise NotImplementedError, interface.info_type
+        end
+      else
+        val.set_ruby_value arg
+      end
+
+      return val
+    end
+
+    def self.gvalue_for_type_info info
+      tag = info.tag
+      gtype = case tag
+              when :interface
+                info.interface.g_type
+              when :void
+                return nil
+              else
+                ::GObject.type_from_name(TAG_TYPE_TO_GTYPE_NAME_MAP[tag])
+              end
+      ::GObject::Value.new.tap {|val| val.init gtype}
+    end
+
+    def self.gvalue_for_signal_return_value signal, object
+      sig = object.class._find_signal signal
+      rettypeinfo = sig.return_type
+
+      gvalue_for_type_info rettypeinfo
+    end
+
+    # TODO: Generate cast back methods using existing Argument builders.
+    def self.cast_back_signal_arguments signalinfo, klass, *args
+      result = []
+
+      # Instance
+      instptr = args.shift
+      instance = klass.wrap instptr
+      result << instance
+
+      # Extra arguments
+      signalinfo.args.each do |info|
+        result << cast_signal_argument(info, args.shift)
+      end
+
+      # User Data
+      arg = args.shift
+      arg = GirFFI::ArgHelper::OBJECT_STORE[arg.address]
+      result << arg
+
+      return result
+    end
+
+    def self.cast_signal_argument info, arg
+      arg_t = info.argument_type
+      if arg_t.tag == :interface
+        iface = arg_t.interface
+        kls = GirFFI::Builder.build_class iface
+        case iface.info_type
+        when :enum, :flags
+          kls[arg]
+        else
+          kls.wrap(arg)
+        end
+      else
+        arg
+      end
+    end
+  end
+end

data/lib/ffi-gobject/initially_unowned.rb

@@ -0,0 +1,10 @@
+module GObject
+  load_class :InitiallyUnowned
+
+  class InitiallyUnowned
+    def self.constructor_wrap ptr
+      super.tap {|obj| ::GObject.object_ref_sink obj}
+    end
+  end
+end
+

data/lib/ffi-gobject/ruby_closure.rb

@@ -0,0 +1,47 @@
+require 'ffi-gobject/closure'
+
+module GObject
+  # This class encapsulates Ruby
+  # blocks as GObject Closures.
+  class RubyClosure < Closure
+    BLOCK_STORE = {}
+
+    class Struct < FFI::Struct
+      layout :parent, Closure::Struct, 0,
+        :blockhash, :int64
+    end
+
+    def block
+      self.class::BLOCK_STORE[self[:blockhash]]
+    end
+
+    def invoke_block *args
+      block.call(*args)
+    end
+
+    def self.new &block
+      raise ArgumentError unless block_given?
+      wrap(new_simple(self::Struct.size, nil).to_ptr).tap do |it|
+        h = block.object_id
+        self::BLOCK_STORE[h] = block
+        it[:blockhash] = h
+        it.set_marshal Proc.new {|*args| marshaller(*args)}
+      end
+    end
+
+    def self.marshaller(closure, return_value, n_param_values,
+                        param_values, invocation_hint, marshal_data)
+      rclosure = self.wrap(closure.to_ptr)
+
+      args = []
+      n_param_values.times {|i|
+        gv = ::GObject::Value.wrap(param_values.to_ptr +
+                                   i * ::GObject::Value::Struct.size)
+        args << gv.ruby_value
+      }
+
+      r = rclosure.invoke_block(*args)
+      return_value.set_ruby_value r unless return_value.nil?
+    end
+  end
+end

data/lib/ffi-gobject/value.rb

@@ -0,0 +1,65 @@
+module GObject
+  load_class :Value
+
+  class Value
+    def set_ruby_value val
+      if current_gtype == 0
+        init_for_ruby_value val
+      end
+
+      case current_gtype_name
+      when "gboolean"
+        set_boolean val
+      when "gint"
+        set_int val
+      when "gchararray"
+        set_string val
+      else
+        nil
+      end
+      self
+    end
+
+    def init_for_ruby_value val
+      case val
+      when true, false
+        init ::GObject.type_from_name("gboolean")
+      when Integer
+        init ::GObject.type_from_name("gint")
+      end
+      self
+    end
+
+    def current_gtype
+      self[:g_type]
+    end
+
+    def current_gtype_name
+      ::GObject.type_name current_gtype
+    end
+
+    def ruby_value
+      case current_gtype_name.to_sym
+      when :gboolean
+        get_boolean
+      when :gint
+        get_int
+      when :gchararray
+        get_string
+      when :GDate
+        ::GLib::Date.wrap(get_boxed)
+      when :GStrv
+        # FIXME: Extract this method to even lower level module.
+        GirFFI::ArgHelper.strv_to_utf8_array get_boxed
+      else
+        nil
+      end
+    end
+
+    class << self
+      def wrap_ruby_value val
+        self.new.set_ruby_value val
+      end
+    end
+  end
+end

data/lib/ffi-gobject_introspection.rb

@@ -0,0 +1,3 @@
+require 'ffi'
+require 'ffi-gobject_introspection/i_repository'
+

data/lib/{gir_ffi → ffi-gobject_introspection}/g_error.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps GObject's GError struct.
   class GError < FFI::Struct
     layout :domain, :uint32,

data/lib/ffi-gobject_introspection/gobject_lib.rb

@@ -0,0 +1,7 @@
+module GObjectIntrospection
+  module GObjectLib
+    extend FFI::Library
+    ffi_lib "gobject-2.0"
+    attach_function :g_type_init, [], :void
+  end
+end

data/lib/{gir_ffi → ffi-gobject_introspection}/i_arg_info.rb

@@ -1,5 +1,5 @@
-require 'gir_ffi/i_base_info'
-module GirFFI
+require 'ffi-gobject_introspection/i_base_info'
+module GObjectIntrospection
   # Wraps a GIArgInfo struct.
   # Represents an argument.
   class IArgInfo < IBaseInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_base_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps GIBaseInfo struct, the base \type for all info types.
   # Decendant types will be implemented as needed.
   class IBaseInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_callable_info.rb

@@ -1,8 +1,8 @@
-require 'gir_ffi/i_base_info'
-require 'gir_ffi/i_type_info'
-require 'gir_ffi/i_arg_info'
+require 'ffi-gobject_introspection/i_base_info'
+require 'ffi-gobject_introspection/i_type_info'
+require 'ffi-gobject_introspection/i_arg_info'
 
-module GirFFI
+module GObjectIntrospection
   # Wraps a GICallableInfo struct; represents a callable, either
   # IFunctionInfo, ICallbackInfo or IVFuncInfo.
   class ICallableInfo < IBaseInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_callback_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GICallbackInfo struct. Has no methods in addition to the ones
   # inherited from ICallableInfo.
   class ICallbackInfo < ICallableInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_constant_info.rb

@@ -1,10 +1,9 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIConstantInfo struct; represents an constant.
-  # Not implemented yet.
   class IConstantInfo < IBaseInfo
     def value
       val = Lib::GIArgument.new
-      size = Lib.g_constant_info_get_value @gobj, val
+      Lib.g_constant_info_get_value @gobj, val
       return val
     end
 

data/lib/{gir_ffi → ffi-gobject_introspection}/i_enum_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIEnumInfo struct if it represents an enum.
   # If it represents a flag, an IFlagsInfo object is used instead.
   class IEnumInfo < IRegisteredTypeInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_field_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIFieldInfo struct.
   # Represents a field of an IStructInfo or an IUnionInfo.
   class IFieldInfo < IBaseInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_flags_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIEnumInfo struct, if it represents a flag type.
   # TODO: Perhaps just use IEnumInfo. Seems to make more sense.
   class IFlagsInfo < IEnumInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_function_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIFunctioInfo struct.
   # Represents a function.
   class IFunctionInfo < ICallableInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_interface_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a IInterfaceInfo struct.
   # Represents an interface.
   class IInterfaceInfo < IRegisteredTypeInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_object_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIObjectInfo struct.
   # Represents an object.
   class IObjectInfo < IRegisteredTypeInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_property_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIPropertyInfo struct.
   # Represents a property of an IObjectInfo or an IInterfaceInfo.
   # Not implemented yet.

data/lib/{gir_ffi → ffi-gobject_introspection}/i_registered_type_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIRegisteredTypeInfo struct.
   # Represents a registered type.
   class IRegisteredTypeInfo < IBaseInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_repository.rb

@@ -1,26 +1,28 @@
 require 'singleton'
-require 'gir_ffi/lib'
-require 'gir_ffi/g_error'
-require 'gir_ffi/i_base_info'
-require 'gir_ffi/i_callable_info'
-require 'gir_ffi/i_callback_info'
-require 'gir_ffi/i_function_info'
-require 'gir_ffi/i_constant_info'
-require 'gir_ffi/i_field_info'
-require 'gir_ffi/i_registered_type_info'
-require 'gir_ffi/i_interface_info'
-require 'gir_ffi/i_property_info'
-require 'gir_ffi/i_vfunc_info'
-require 'gir_ffi/i_signal_info'
-require 'gir_ffi/i_object_info'
-require 'gir_ffi/i_struct_info'
-require 'gir_ffi/i_value_info'
-require 'gir_ffi/i_union_info'
-require 'gir_ffi/i_enum_info'
-require 'gir_ffi/i_flags_info'
-require 'gir_ffi/arg_helper'
-
-module GirFFI
+require 'ffi-gobject_introspection/lib'
+require 'ffi-gobject_introspection/gobject_lib'
+require 'ffi-gobject_introspection/g_error'
+require 'ffi-gobject_introspection/i_base_info'
+require 'ffi-gobject_introspection/i_callable_info'
+require 'ffi-gobject_introspection/i_callback_info'
+require 'ffi-gobject_introspection/i_function_info'
+require 'ffi-gobject_introspection/i_constant_info'
+require 'ffi-gobject_introspection/i_field_info'
+require 'ffi-gobject_introspection/i_registered_type_info'
+require 'ffi-gobject_introspection/i_interface_info'
+require 'ffi-gobject_introspection/i_property_info'
+require 'ffi-gobject_introspection/i_vfunc_info'
+require 'ffi-gobject_introspection/i_signal_info'
+require 'ffi-gobject_introspection/i_object_info'
+require 'ffi-gobject_introspection/i_struct_info'
+require 'ffi-gobject_introspection/i_value_info'
+require 'ffi-gobject_introspection/i_union_info'
+require 'ffi-gobject_introspection/i_enum_info'
+require 'ffi-gobject_introspection/i_flags_info'
+
+module GObjectIntrospection
+  GObjectLib::g_type_init
+
   # The Gobject Introspection Repository. This class is the point of
   # access to the introspection typelibs.
   # This class wraps the GIRepository struct.
@@ -50,6 +52,8 @@ module GirFFI
       :unresolved => IBaseInfo
     }
 
+    POINTER_SIZE = FFI.type_size(:pointer)
+
     def initialize
       @gobj = Lib::g_irepository_get_default
     end
@@ -105,7 +109,7 @@ module GirFFI
 
     def dependencies namespace
       strv = Lib.g_irepository_get_dependencies @gobj, namespace
-      ArgHelper.strv_to_utf8_array strv
+      strv_to_utf8_array strv
     end
 
     def shared_library namespace
@@ -126,5 +130,15 @@ module GirFFI
     def wrap ptr
       IRepository.wrap_ibaseinfo_pointer ptr
     end
+
+    def strv_to_utf8_array strv
+      return [] if strv.null?
+      arr, offset = [], 0
+      until (ptr = strv.get_pointer offset).null? do
+        arr << ptr.read_string
+        offset += POINTER_SIZE
+      end
+      return arr
+    end
   end
 end