gir_ffi 0.6.7 → 0.7.0

data/lib/ffi-glib.rb

@@ -9,7 +9,6 @@ require 'ffi-glib/hash_table'
 require 'ffi-glib/list'
 require 'ffi-glib/ptr_array'
 require 'ffi-glib/s_list'
-require 'ffi-glib/sized_array'
 require 'ffi-glib/strv'
 require 'ffi-glib/variant'
 

data/lib/ffi-glib/array.rb

@@ -1,3 +1,6 @@
+require 'ffi-glib/container_class_methods'
+require 'ffi-glib/array_methods'
+
 module GLib
   load_class :Array
 
@@ -5,12 +8,10 @@ module GLib
   # be necessary to create objects of this class from Ruby directly.
   class Array
     include Enumerable
+    include ArrayMethods
+    extend ContainerClassMethods
 
     attr_reader :element_type
-    def element_type= val
-      @element_type = val
-      check_element_size_match
-    end
 
     class << self
       undef :new
@@ -26,15 +27,6 @@ module GLib
       self
     end
 
-    # Re-implementation of the g_array_index macro
-    def index idx
-      if idx >= length or idx < 0
-        raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
-      end
-      ptr = GirFFI::InOutPointer.new element_type, data_ptr + idx * get_element_size
-      ptr.to_ruby_value
-    end
-
     def each
       length.times do |idx|
         yield index(idx)
@@ -49,32 +41,24 @@ module GLib
       @struct[:data]
     end
 
-    undef :data
-
-    # @deprecated From 0.7.0, data will return the actual data as a string,
-    # as generated by GirFFI.
-    alias data data_ptr
-
     def get_element_size
       Lib.g_array_get_element_size self
     end
 
+    alias element_size get_element_size
+
     def ==(other)
       self.to_a == other.to_a
     end
 
-    def self.wrap elmttype, ptr
-      super(ptr).tap do |array|
-        array.element_type = elmttype if array
-      end
+    def reset_typespec typespec
+      @element_type = typespec
+      check_element_size_match
+      self
     end
 
-    def self.from elmtype, it
-      case it
-      when self then it
-      when FFI::Pointer then wrap elmtype, it
-      else self.new(elmtype).tap {|arr| arr.append_vals it }
-      end
+    def self.from_enumerable elmtype, it
+      self.new(elmtype).tap {|arr| arr.append_vals it }
     end
 
     private

data/lib/ffi-glib/array_methods.rb

@@ -0,0 +1,13 @@
+module GLib
+  # Common methods for GLib::Array and GLib::PtrArray
+  module ArrayMethods
+    # Re-implementation of the g_array_index and g_ptr_array_index macros
+    def index idx
+      if idx >= length or idx < 0
+        raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
+      end
+      ptr = GirFFI::InOutPointer.new element_type, data_ptr + idx * element_size
+      ptr.to_ruby_value
+    end
+  end
+end

data/lib/ffi-glib/container_class_methods.rb

@@ -1,4 +1,6 @@
 module GLib
+  # Common methods for container classes: Array, PtrArray, List, SList and
+  # HashTable.
   module ContainerClassMethods
     def wrap typespec, ptr
       super(ptr).tap do |container|
@@ -6,7 +8,10 @@ module GLib
       end
     end
 
-    def from typespec, it
+    # FIXME: Drop Ruby 1.8.7 support and make first argument optional.
+    def from *args
+      it, typespec = *args.reverse
+      typespec ||= :void
       case it
       when nil
         nil

data/lib/ffi-glib/hash_table.rb

@@ -12,12 +12,13 @@ module GLib
     attr_reader :value_type
 
     def each
-      prc = Proc.new {|keyptr, valptr, userdata|
+      prc = proc {|keyptr, valptr, userdata|
         key = GirFFI::ArgHelper.cast_from_pointer key_type, keyptr
         val = GirFFI::ArgHelper.cast_from_pointer value_type, valptr
         yield key, val
       }
-      ::GLib::Lib.g_hash_table_foreach self.to_ptr, prc, nil
+      callback = GLib::HFunc.from prc
+      ::GLib::Lib.g_hash_table_foreach self.to_ptr, callback, nil
     end
 
     def to_hash

data/lib/ffi-glib/list.rb

@@ -7,27 +7,13 @@ module GLib
   class List
     include ListMethods
 
-    class << self
-      remove_method :new
-    end
-
-    def self.new type
-      _real_new.tap do |it|
-        struct = self::Struct.new(FFI::Pointer.new(0))
-        it.instance_variable_set :@struct, struct
-        it.element_type = type
-      end
-    end
-
     def self.from_enumerable type, arr
-      arr.inject(self.new type) { |lst, val|
-        lst.append val }
+      arr.inject(self.new type) { |lst, val| lst.append val }
     end
 
     def append data
-      elm_t = element_type
-      data_ptr = GirFFI::InPointer.from(elm_t, data)
-      self.class.wrap(elm_t, Lib.g_list_append(self, data_ptr))
+      self.class.wrap(element_type,
+                      Lib.g_list_append(self, element_ptr_for(data)))
     end
   end
 end

data/lib/ffi-glib/list_methods.rb

@@ -1,15 +1,20 @@
 require 'ffi-glib/container_class_methods'
 
 module GLib
+  # Common methods for List and SList.
   module ListMethods
     include Enumerable
-    attr_accessor :element_type
+    attr_reader :element_type
 
     def self.included base
-      base.extend ContainerClassMethods
       # Override default field accessors.
       replace_method base, :next, :tail
       replace_method base, :data, :head
+
+      class << base; self end.send :remove_method, :new
+      base.extend ListClassMethods
+
+      base.extend ContainerClassMethods
     end
 
     def self.replace_method base, old, new
@@ -35,7 +40,7 @@ module GLib
     end
 
     def reset_typespec typespec
-      self.element_type = typespec
+      @element_type = typespec
       self
     end
 
@@ -55,6 +60,20 @@ module GLib
       @current = @current.tail
       element
     end
+
+    def element_ptr_for data
+      GirFFI::InPointer.from(element_type, data)
+    end
+
+    module ListClassMethods
+      def new type
+        _real_new.tap do |it|
+          struct = self::Struct.new(FFI::Pointer.new(0))
+          it.instance_variable_set :@struct, struct
+          it.instance_variable_set :@element_type, type
+        end
+      end
+    end
   end
 end
 

data/lib/ffi-glib/ptr_array.rb

@@ -1,3 +1,6 @@
+require 'ffi-glib/container_class_methods'
+require 'ffi-glib/array_methods'
+
 module GLib
   load_class :PtrArray
 
@@ -5,8 +8,10 @@ module GLib
   # pointers.
   class PtrArray
     include Enumerable
+    include ArrayMethods
+    extend ContainerClassMethods
 
-    attr_accessor :element_type
+    attr_reader :element_type
 
     POINTER_SIZE = FFI.type_size(:pointer)
 
@@ -20,23 +25,19 @@ module GLib
       wrap(type, Lib.g_ptr_array_new)
     end
 
-    def self.wrap type, ptr
-      super(ptr).tap {|it|
-        it.element_type = type}
-    end
-
-    def self.from type, it
-      case it
-      when self then it
-      when FFI::Pointer then wrap type, it
-      else self.new(type).tap {|arr| arr.add_array it}
-      end
+    def self.from_enumerable(type, it)
+      self.new(type).tap {|arr| arr.add_array it}
     end
 
     def self.add array, data
       array.add data
     end
 
+    def reset_typespec typespec
+      @element_type = typespec
+      self
+    end
+
     def add data
       ptr = GirFFI::InPointer.from element_type, data
       Lib.g_ptr_array_add self, ptr
@@ -46,13 +47,12 @@ module GLib
       ary.each {|item| add item}
     end
 
-    # Re-implementation of the g_ptr_array_index macro
-    def index idx
-      if idx >= length or idx < 0
-        raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
-      end
-      ptr = GirFFI::InOutPointer.new element_type, @struct[:pdata] + idx * POINTER_SIZE
-      ptr.to_ruby_value
+    def data_ptr
+      @struct[:pdata]
+    end
+
+    def element_size
+      POINTER_SIZE
     end
 
     def each

data/lib/ffi-glib/s_list.rb

@@ -7,27 +7,13 @@ module GLib
   class SList
     include ListMethods
 
-    class << self
-      remove_method :new
-    end
-
-    def self.new type
-      _real_new.tap do |it|
-        struct = self::Struct.new(FFI::Pointer.new(0))
-        it.instance_variable_set :@struct, struct
-        it.element_type = type
-      end
-    end
-
     def self.from_enumerable type, arr
-      arr.reverse.inject(self.new type) { |lst, val|
-        lst.prepend val }
+      arr.reverse.inject(self.new type) { |lst, val| lst.prepend val }
     end
 
     def prepend data
-      elm_t = element_type
-      data_ptr = GirFFI::InPointer.from(elm_t, data)
-      self.class.wrap(elm_t, Lib.g_slist_prepend(self, data_ptr))
+      self.class.wrap(element_type,
+                      Lib.g_slist_prepend(self, element_ptr_for(data)))
     end
   end
 end

data/lib/ffi-gobject.rb

@@ -9,9 +9,11 @@ require 'ffi-gobject/value'
 require 'ffi-gobject/initially_unowned'
 require 'ffi-gobject/closure'
 require 'ffi-gobject/object'
+require 'ffi-gobject/object_class'
 require 'ffi-gobject/ruby_closure'
 require 'gir_ffi/builders/user_defined_builder'
 
+# Module representing GLib's GObject namespace.
 module GObject
   def self.object_ref obj
     Lib::g_object_ref obj.to_ptr
@@ -32,6 +34,7 @@ module GObject
   def self.type_from_instance_pointer inst_ptr
     return nil if inst_ptr.null?
     klsptr = inst_ptr.get_pointer 0
+    # TODO: Cache the message name somewhere.
     klsptr.send "get_#{GirFFI::TypeMap::TAG_TYPE_MAP[:GType]}", 0
   end
 
@@ -60,10 +63,12 @@ module GObject
     signal_id = signal_lookup_from_instance signal, object
     detail_quark = GLib.quark_from_string(detail)
     sig_info = object.class.find_signal signal
-    arr = sig_info.signal_arguments_to_gvalue_array object, *args
-    rval = sig_info.gvalue_for_signal_return_value
 
-    Lib.g_signal_emitv arr.values, signal_id, detail_quark, rval
+    arr_ptr = sig_info.arguments_to_gvalue_array_pointer object, args
+
+    rval = sig_info.gvalue_for_return_value
+
+    Lib.g_signal_emitv arr_ptr, signal_id, detail_quark, rval
 
     return rval
   end
@@ -71,10 +76,10 @@ module GObject
   def self.signal_connect object, detailed_signal, data=nil, &block
     signal, _ = detailed_signal.split('::')
     sig_info = object.class.find_signal signal
-    callback = sig_info.signal_callback(&block)
+    callback = sig_info.create_callback(&block)
     GirFFI::CallbackBase.store_callback callback
 
-    data_ptr = GirFFI::InPointer.from_object data
+    data_ptr = GirFFI::InPointer.from_closure_data data
 
     Lib.g_signal_connect_data object, detailed_signal, callback, data_ptr, nil, 0
   end
@@ -119,16 +124,4 @@ module GObject
   TYPE_ARRAY = Lib.g_array_get_type
   TYPE_HASH_TABLE = Lib.g_hash_table_get_type
   TYPE_STRV = Lib.g_strv_get_type
-
-  TYPE_TAG_TO_GTYPE = {
-    :array => TYPE_ARRAY,
-    :gboolean => TYPE_BOOLEAN,
-    :gdouble => TYPE_DOUBLE,
-    :gfloat => TYPE_FLOAT,
-    :ghash => TYPE_HASH_TABLE,
-    :gint32 => TYPE_INT,
-    :glist => TYPE_POINTER,
-    :utf8 => TYPE_STRING,
-    :void => TYPE_NONE
-  }
 end

data/lib/ffi-gobject/object.rb

@@ -24,13 +24,9 @@ module GObject
     setup_instance_method "get_property"
     setup_instance_method "set_property"
 
-    def get_property_with_override property_name
+    def get_property_extended property_name
+      gvalue = get_property property_name
       type_info = get_property_type property_name
-      pspec = type_class.find_property property_name
-
-      gvalue = GObject::Value.for_g_type pspec.value_type
-      get_property_without_override property_name, gvalue
-
       case type_info.tag
       when :ghash, :glist
         adjust_value_to_type gvalue.get_value_plain, type_info
@@ -39,12 +35,26 @@ module GObject
       end
     end
 
-    def set_property_with_override property_name, value
-      type_info = get_property_type property_name
+    def get_property_with_override property_name
       pspec = type_class.find_property property_name
 
       gvalue = GObject::Value.for_g_type pspec.value_type
-      gvalue.set_value adjust_value_to_type(value, type_info)
+      get_property_without_override property_name, gvalue
+
+      gvalue
+    end
+
+    def set_property_extended property_name, value
+      type_info = get_property_type property_name
+      adjusted_value = adjust_value_to_type(value, type_info)
+
+      set_property property_name, adjusted_value
+    end
+
+    def set_property_with_override property_name, value
+      pspec = type_class.find_property property_name
+      gvalue = GObject::Value.for_g_type pspec.value_type
+      gvalue.set_value value
       set_property_without_override property_name, gvalue
     end
 

data/lib/ffi-gobject/object_class.rb

@@ -0,0 +1,14 @@
+module GObject
+  load_class :ObjectClass
+
+  # Overrides for GObjectClass, a struct containing GObject's class data
+  class ObjectClass
+    def set_property= callback
+      @struct[:set_property] = GObject::ObjectSetPropertyFunc.from callback
+    end
+
+    def get_property= callback
+      @struct[:get_property] = GObject::ObjectGetPropertyFunc.from callback
+    end
+  end
+end