gobject-introspection 1.2.1 → 1.2.2

data/ext/gobject-introspection/rb-gi-interface-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIInterfaceInfo
 #define SELF(self) (RVAL2GI_INTERFACE_INFO(self))

data/ext/gobject-introspection/rb-gi-loader.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGILoader
 
@@ -138,6 +138,13 @@ rg_s_register_boxed_class_converter(VALUE klass, VALUE rb_gtype)
     return Qnil;
 }
 
+static VALUE
+rg_s_start_callback_dispatch_thread(G_GNUC_UNUSED VALUE klass)
+{
+    rbgutil_start_callback_dispatch_thread();
+    return Qnil;
+}
+
 void
 rb_gi_loader_init(VALUE rb_mGI)
 {
@@ -151,4 +158,5 @@ rb_gi_loader_init(VALUE rb_mGI)
     RG_DEF_SMETHOD(define_interface, 3);
     RG_DEF_SMETHOD(define_struct, -1);
     RG_DEF_SMETHOD(register_boxed_class_converter, 1);
+    RG_DEF_SMETHOD(start_callback_dispatch_thread, 0);
 }

data/ext/gobject-introspection/rb-gi-method-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIMethodInfo
 #define SELF(self) RVAL2GI_FUNCTION_INFO(self)
@@ -88,7 +88,11 @@ rg_invoke(int argc, VALUE *argv, VALUE self)
         if (g_type_info_get_tag(&return_value_info) != GI_TYPE_TAG_VOID) {
             rb_ary_unshift(rb_out_args, rb_return_value);
         }
-        return rb_out_args;
+        if (RARRAY_LEN(rb_out_args) == 1) {
+            return RARRAY_PTR(rb_out_args)[0];
+        } else {
+            return rb_out_args;
+        }
     }
 }
 

data/ext/gobject-introspection/rb-gi-object-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIObjectInfo
 #define SELF(self) (RVAL2GI_OBJECT_INFO(self))

data/ext/gobject-introspection/rb-gi-private.h

@@ -0,0 +1,110 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#ifndef RB_GI_PRIVATE_H
+#define RB_GI_PRIVATE_H
+
+#include <ruby.h>
+#include <rbgobject.h>
+#include <glib-enum-types.h>
+
+#include <girffi.h>
+#include "gobject-introspection-enum-types.h"
+
+#include "rbgiversion.h"
+
+#include "rb-gi-types.h"
+#include "rb-gi-conversions.h"
+
+#include "rb-gobject-introspection.h"
+
+#ifndef RB_TYPE_P
+#  define RB_TYPE_P(object, type) (TYPE(object) == type)
+#endif
+
+#ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
+#  define RUBY_T_FIXNUM T_FIXNUM
+#endif
+
+extern void Init_gobject_introspection(void);
+
+void rb_gi_argument_init             (void);
+
+void rb_gi_type_tag_init             (VALUE rb_mGI);
+void rb_gi_base_info_init            (VALUE rb_mGI);
+void rb_gi_callable_info_init        (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_function_info_init        (VALUE rb_mGI,
+                                      VALUE rb_cGICallableInfo);
+void rb_gi_method_info_init          (VALUE rb_mGI,
+                                      VALUE rb_cGIFunctionInfo);
+void rb_gi_constructor_info_init     (VALUE rb_mGI,
+                                      VALUE rb_cGIFunctionInfo);
+void rb_gi_callback_info_init        (VALUE rb_mGI,
+                                      VALUE rb_cGICallableInfo);
+void rb_gi_registered_type_info_init (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_struct_info_init          (VALUE rb_mGI,
+                                      VALUE rb_cGIRegisteredTypeInfo);
+void rb_gi_boxed_info_init           (VALUE rb_mGI,
+                                      VALUE rb_cGIRegisteredTypeInfo);
+void rb_gi_enum_info_init            (VALUE rb_mGI,
+                                      VALUE rb_cGIRegisteredTypeInfo);
+void rb_gi_flags_info_init           (VALUE rb_mGI,
+                                      VALUE rb_cGIEnumInfo);
+void rb_gi_object_info_init          (VALUE rb_mGI,
+                                      VALUE rb_cGIRegisteredTypeInfo);
+void rb_gi_interface_info_init       (VALUE rb_mGI,
+                                      VALUE rb_cGIRegisteredTypeInfo);
+void rb_gi_constant_info_init        (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_union_info_init           (VALUE rb_mGI,
+                                      VALUE rb_cGIRegisteredTypeInfo);
+void rb_gi_value_info_init           (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_signal_info_init          (VALUE rb_mGI,
+                                      VALUE rb_cGICallableInfo);
+void rb_gi_vfunc_info_init           (VALUE rb_mGI,
+                                      VALUE rb_cGICallableInfo);
+void rb_gi_property_info_init        (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_field_info_init           (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_arg_info_init             (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_type_info_init            (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_unresolved_info_init      (VALUE rb_mGI,
+                                      VALUE rb_cGIBaseInfo);
+void rb_gi_repository_init           (VALUE rb_mGI);
+void rb_gi_loader_init               (VALUE rb_mGI);
+
+VALUE rb_gi_function_info_invoke_raw (GIFunctionInfo *info,
+                                      GIArgument *receiver,
+                                      int argc, VALUE *argv,
+                                      GIArgument *return_value);
+
+VALUE rb_gi_field_info_get_field_raw (GIFieldInfo *info,
+                                      gpointer     memory);
+void  rb_gi_field_info_set_field_raw (GIFieldInfo *info,
+                                      gpointer     memory,
+                                      VALUE        rb_field_value);
+
+#endif

data/ext/gobject-introspection/rb-gi-property-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIPropertyInfo
 #define SELF(self) RVAL2GI_BASE_INFO(self)

data/ext/gobject-introspection/rb-gi-registered-type-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIRegisteredTypeInfo
 #define SELF(self) (RVAL2GI_REGISTERED_TYPE_INFO(self))

data/ext/gobject-introspection/rb-gi-repository.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIRepository
 #define SELF(self) RVAL2GI_REPOSITORY(self)

data/ext/gobject-introspection/rb-gi-signal-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGISignalInfo
 #define SELF(self) RVAL2GI_BASE_INFO(self)

data/ext/gobject-introspection/rb-gi-struct-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIStructInfo
 #define SELF(self) (RVAL2GI_STRUCT_INFO(self))

data/ext/gobject-introspection/rb-gi-type-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGITypeInfo
 #define SELF(self) (RVAL2GI_TYPE_INFO(self))

data/ext/gobject-introspection/rb-gi-type-tag.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGITypeTag
 #define SELF(self) (RVAL2GI_TYPE_TAG(self))

data/ext/gobject-introspection/rb-gi-union-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIUnionInfo
 #define SELF(self) (RVAL2GI_UNION_INFO(self))

data/ext/gobject-introspection/rb-gi-unresolved-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TUNRESOLVEDET_NAMESPACE rb_cGIUnresolvedInfo
 

data/ext/gobject-introspection/rb-gi-value-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIValueInfo
 #define SELF(self) (RVAL2GI_VALUE_INFO(self))

data/ext/gobject-introspection/rb-gi-vfunc-info.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIVFuncInfo
 #define SELF(self) RVAL2GI_BASE_INFO(self)

data/ext/gobject-introspection/rb-gobject-introspection.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_mGObjectIntrospection
 

data/ext/gobject-introspection/rb-gobject-introspection.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -23,86 +23,35 @@
 
 #include <ruby.h>
 #include <rbgobject.h>
-#include <glib-enum-types.h>
 
-#include <girffi.h>
-#include "gobject-introspection-enum-types.h"
-
-#include "rbgiversion.h"
-
-#include "rb-gi-types.h"
-#include "rb-gi-conversions.h"
-
-#ifndef RB_TYPE_P
-#  define RB_TYPE_P(object, type) (TYPE(object) == type)
-#endif
-
-#ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
-#  define RUBY_T_FIXNUM T_FIXNUM
-#endif
-
-extern void Init_gobject_introspection(void);
-
-void rb_gi_argument_init             (void);
-
-void rb_gi_type_tag_init             (VALUE rb_mGI);
-void rb_gi_base_info_init            (VALUE rb_mGI);
-void rb_gi_callable_info_init        (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_function_info_init        (VALUE rb_mGI,
-                                      VALUE rb_cGICallableInfo);
-void rb_gi_method_info_init          (VALUE rb_mGI,
-                                      VALUE rb_cGIFunctionInfo);
-void rb_gi_constructor_info_init     (VALUE rb_mGI,
-                                      VALUE rb_cGIFunctionInfo);
-void rb_gi_callback_info_init        (VALUE rb_mGI,
-                                      VALUE rb_cGICallableInfo);
-void rb_gi_registered_type_info_init (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_struct_info_init          (VALUE rb_mGI,
-                                      VALUE rb_cGIRegisteredTypeInfo);
-void rb_gi_boxed_info_init           (VALUE rb_mGI,
-                                      VALUE rb_cGIRegisteredTypeInfo);
-void rb_gi_enum_info_init            (VALUE rb_mGI,
-                                      VALUE rb_cGIRegisteredTypeInfo);
-void rb_gi_flags_info_init           (VALUE rb_mGI,
-                                      VALUE rb_cGIEnumInfo);
-void rb_gi_object_info_init          (VALUE rb_mGI,
-                                      VALUE rb_cGIRegisteredTypeInfo);
-void rb_gi_interface_info_init       (VALUE rb_mGI,
-                                      VALUE rb_cGIRegisteredTypeInfo);
-void rb_gi_constant_info_init        (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_union_info_init           (VALUE rb_mGI,
-                                      VALUE rb_cGIRegisteredTypeInfo);
-void rb_gi_value_info_init           (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_signal_info_init          (VALUE rb_mGI,
-                                      VALUE rb_cGICallableInfo);
-void rb_gi_vfunc_info_init           (VALUE rb_mGI,
-                                      VALUE rb_cGICallableInfo);
-void rb_gi_property_info_init        (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_field_info_init           (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_arg_info_init             (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_type_info_init            (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_unresolved_info_init      (VALUE rb_mGI,
-                                      VALUE rb_cGIBaseInfo);
-void rb_gi_repository_init           (VALUE rb_mGI);
-void rb_gi_loader_init               (VALUE rb_mGI);
-
-VALUE rb_gi_function_info_invoke_raw (GIFunctionInfo *info,
-                                      GIArgument *receiver,
-                                      int argc, VALUE *argv,
-                                      GIArgument *return_value);
-
-VALUE rb_gi_field_info_get_field_raw (GIFieldInfo *info,
-                                      gpointer     memory);
-void  rb_gi_field_info_set_field_raw (GIFieldInfo *info,
-                                      gpointer     memory,
-                                      VALUE        rb_field_value);
+#include <girepository.h>
+
+typedef gpointer (*RBGICallbackFinderFunc)(GIArgInfo *info);
+
+typedef struct
+{
+    GIArgInfo arg_info;
+    GIScopeType scope_type;
+    GIDirection direction;
+    gboolean callback_p;
+    gboolean closure_p;
+    gboolean destroy_p;
+    gboolean inout_argv_p;
+    gint in_arg_index;
+    gint closure_in_arg_index;
+    gint destroy_in_arg_index;
+    gint rb_arg_index;
+    gint out_arg_index;
+    gint inout_argc_arg_index;
+} RBGIArgMetadata;
+
+typedef struct {
+    RBGIArgMetadata *metadata;
+    VALUE rb_gc_guard_key;
+    VALUE rb_callback;
+} RBGICallbackData;
+
+void rb_gi_callback_register_finder (RBGICallbackFinderFunc  finder);
+void rb_gi_callback_data_free       (RBGICallbackData       *callback_data);
 
 #endif

data/lib/gobject-introspection/callable-info.rb

@@ -23,20 +23,56 @@ module GObjectIntrospection
     collection_reader("args")
 
     def in_args
-      args.find_all do |arg|
+      callback_indexes = []
+      closure_indexes = []
+      destroy_indexes = []
+      args.each_with_index do |arg, i|
+        next if arg.scope == ScopeType::INVALID
+        callback_indexes << i
+        closure_index = arg.closure
+        closure_indexes << closure_index if closure_index != -1
+        destroy_index = arg.destroy
+        destroy_indexes << destroy_index if destroy_index != -1
+      end
+
+      args.find_all.with_index do |arg, i|
         case arg.direction
         when Direction::IN, Direction::INOUT
-          true
+          if callback_indexes.include?(i)
+            false
+          elsif closure_indexes.include?(i)
+            false
+          elsif destroy_indexes.include?(i)
+            false
+          else
+            true
+          end
         else
           false
         end
       end
     end
 
+    def required_in_args
+      in_args.reject do |arg|
+        arg.may_be_null?
+      end
+    end
+
     def n_in_args
       in_args.size
     end
 
+    def n_required_in_args
+      required_in_args.size
+    end
+
+    def require_callback?
+      args.any? do |arg|
+        arg.direction == Direction::IN and arg.scope != ScopeType::INVALID
+      end
+    end
+
     def out_args
       args.find_all do |arg|
         case arg.direction