gobject-introspection 1.2.1 → 1.2.2

data/ext/gobject-introspection/depend

@@ -0,0 +1,10 @@
+install-so: install-headers
+install-headers:
+	$(INSTALL_DATA) $(srcdir)/rb-gobject-introspection.h $(RUBYARCHDIR)
+
+install: install-pc
+install-pc:
+	if test -n "$(pkgconfigdir)"; then				\
+	  $(MAKEDIRS) $(pkgconfigdir);					\
+	  $(INSTALL_DATA) ruby-gobject-introspection.pc $(pkgconfigdir);\
+	fi

data/ext/gobject-introspection/rb-gi-arg-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_cGIArgInfo
 #define SELF(self) (RVAL2GI_ARG_INFO(self))

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

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 static VALUE rb_cGLibValue = Qnil;
 
@@ -121,10 +121,18 @@ interface_to_ruby(GIArgument *argument, GITypeInfo *type_info)
                  "TODO: GIArgument(interface)[boxed] -> Ruby");
         break;
       case GI_INFO_TYPE_ENUM:
-        rb_interface = GENUM2RVAL(argument->v_int32, gtype);
+        if (gtype == G_TYPE_NONE) {
+            rb_interface = INT2NUM(argument->v_int32);
+        } else {
+            rb_interface = GENUM2RVAL(argument->v_int32, gtype);
+        }
         break;
       case GI_INFO_TYPE_FLAGS:
-        rb_interface = GFLAGS2RVAL(argument->v_int32, gtype);
+        if (gtype == G_TYPE_NONE) {
+            rb_interface = INT2NUM(argument->v_int32);
+        } else {
+            rb_interface = GFLAGS2RVAL(argument->v_int32, gtype);
+        }
         break;
       case GI_INFO_TYPE_OBJECT:
         rb_interface = GOBJ2RVAL(argument->v_pointer);
@@ -250,7 +258,7 @@ rb_gi_argument_to_ruby(GIArgument *argument, GITypeInfo *type_info)
         rb_raise(rb_eNotImpError, "TODO: GIArgument(unichar) -> Ruby");
         break;
       case GI_TYPE_TAG_ERROR:
-        RG_RAISE_ERROR(argument->v_pointer);
+        rb_argument = GERROR2RVAL(argument->v_pointer);
         break;
       case GI_TYPE_TAG_UNICHAR:
         rb_raise(rb_eNotImpError,
@@ -574,10 +582,18 @@ rb_gi_argument_from_ruby_interface(GIArgument *argument, GITypeInfo *type_info,
                  g_base_info_get_name(interface_info));
         break;
       case GI_INFO_TYPE_ENUM:
-        argument->v_int32 = RVAL2GENUM(rb_argument, gtype);
+        if (gtype == G_TYPE_NONE) {
+            argument->v_int32 = NUM2INT(rb_argument);
+        } else {
+            argument->v_int32 = RVAL2GENUM(rb_argument, gtype);
+        }
         break;
       case GI_INFO_TYPE_FLAGS:
-        argument->v_int32 = RVAL2GFLAGS(rb_argument, gtype);
+        if (gtype == G_TYPE_NONE) {
+            argument->v_int32 = NUM2INT(rb_argument);
+        } else {
+            argument->v_int32 = RVAL2GFLAGS(rb_argument, gtype);
+        }
         break;
       case GI_INFO_TYPE_OBJECT:
       case GI_INFO_TYPE_INTERFACE:
@@ -828,17 +844,19 @@ rb_gi_in_argument_free_interface(GIArgument *argument, GITypeInfo *type_info)
 {
     GIBaseInfo *interface_info;
     GIInfoType interface_type;
-    GType gtype;
 
     interface_info = g_type_info_get_interface(type_info);
     interface_type = g_base_info_get_type(interface_info);
 
-    gtype = g_registered_type_info_get_g_type(interface_info);
+    if (interface_type == GI_INFO_TYPE_STRUCT) {
+        GType gtype;
+        gtype = g_registered_type_info_get_g_type(interface_info);
 
-    if (interface_type == GI_INFO_TYPE_STRUCT && gtype == G_TYPE_VALUE) {
-        GValue *gvalue = argument->v_pointer;
-        g_value_unset(gvalue);
-        xfree(argument->v_pointer);
+        if (gtype == G_TYPE_VALUE) {
+            GValue *gvalue = argument->v_pointer;
+            g_value_unset(gvalue);
+            xfree(argument->v_pointer);
+        }
     }
 
     g_base_info_unref(interface_info);

data/ext/gobject-introspection/rb-gi-base-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_cGIBaseInfo
 #define SELF(self) RVAL2GI_BASE_INFO(self)

data/ext/gobject-introspection/rb-gi-boxed-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_cGIBoxedInfo
 #define SELF(self) (RVAL2GI_BOXED_INFO(self))

data/ext/gobject-introspection/rb-gi-callable-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_cGICallableInfo
 #define SELF(self) ((GICallableInfo *)(RVAL2GI_BASE_INFO(self)))

data/ext/gobject-introspection/rb-gi-callback-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_cGICallbackInfo
 #define SELF(self) RVAL2GI_BASE_INFO(self)

data/ext/gobject-introspection/rb-gi-constant-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_cGIConstantInfo
 #define SELF(self) (RVAL2GI_CONSTANT_INFO(self))

data/ext/gobject-introspection/rb-gi-constructor-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_cGIConstructorInfo
 #define SELF(self) RVAL2GI_FUNCTION_INFO(self)

data/ext/gobject-introspection/rb-gi-enum-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_cGIEnumInfo
 #define SELF(self) (RVAL2GI_ENUM_INFO(self))

data/ext/gobject-introspection/rb-gi-field-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_cGIFieldInfo
 #define SELF(self) (RVAL2GI_FIELD_INFO(self))

data/ext/gobject-introspection/rb-gi-flags-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_cGIFlagsInfo
 

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

@@ -18,13 +18,15 @@
  *  MA  02110-1301  USA
  */
 
-#include "rb-gobject-introspection.h"
+#include "rb-gi-private.h"
 
 #define RG_TARGET_NAMESPACE rb_cGIFunctionInfo
 #define SELF(self) RVAL2GI_FUNCTION_INFO(self)
 
 static VALUE RG_TARGET_NAMESPACE;
+static VALUE rb_cGLibError;
 static const char *callbacks_key = "gi_callbacks";
+static GPtrArray *callback_finders;
 
 GType
 gi_function_info_get_type(void)
@@ -74,23 +76,6 @@ rg_vfunc(VALUE self)
     return GI_BASE_INFO2RVAL(g_function_info_get_vfunc(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;
-} ArgMetadata;
-
 static void
 allocate_arguments(GICallableInfo *info,
                    GArray *in_args, GArray *out_args,
@@ -102,13 +87,13 @@ allocate_arguments(GICallableInfo *info,
     n_args = g_callable_info_get_n_args(info);
     for (i = 0; i < n_args; i++) {
         GIArgument argument;
-        ArgMetadata *metadata;
+        RBGIArgMetadata *metadata;
         GIArgInfo *arg_info;
         GIDirection direction;
 
         memset(&argument, 0, sizeof(GIArgument));
 
-        metadata = ALLOC(ArgMetadata);
+        metadata = ALLOC(RBGIArgMetadata);
         arg_info = &(metadata->arg_info);
         g_callable_info_load_arg(info, i, arg_info);
         metadata->scope_type = g_arg_info_get_scope(arg_info);
@@ -146,7 +131,7 @@ fill_metadata_inout_argv(GPtrArray *args_metadata)
     gint inout_argc_arg_index = -1;
 
     for (i = 0; i < args_metadata->len; i++) {
-        ArgMetadata *metadata;
+        RBGIArgMetadata *metadata;
         GIArgInfo *arg_info;
         const gchar *name;
 
@@ -171,7 +156,7 @@ fill_metadata_callback(GPtrArray *args_metadata)
     guint i;
 
     for (i = 0; i < args_metadata->len; i++) {
-        ArgMetadata *metadata;
+        RBGIArgMetadata *metadata;
         GIArgInfo *arg_info;
         gint closure_index;
         gint destroy_index;
@@ -184,7 +169,7 @@ fill_metadata_callback(GPtrArray *args_metadata)
         arg_info = &(metadata->arg_info);
         closure_index = g_arg_info_get_closure(arg_info);
         if (closure_index != -1) {
-            ArgMetadata *closure_metadata;
+            RBGIArgMetadata *closure_metadata;
             closure_metadata = g_ptr_array_index(args_metadata, closure_index);
             closure_metadata->closure_p = TRUE;
             metadata->closure_in_arg_index = closure_metadata->in_arg_index;
@@ -193,7 +178,7 @@ fill_metadata_callback(GPtrArray *args_metadata)
 
         destroy_index = g_arg_info_get_destroy(arg_info);
         if (destroy_index != -1) {
-            ArgMetadata *destroy_metadata;
+            RBGIArgMetadata *destroy_metadata;
             destroy_metadata = g_ptr_array_index(args_metadata, destroy_index);
             destroy_metadata->destroy_p = TRUE;
             metadata->destroy_in_arg_index = destroy_metadata->in_arg_index;
@@ -209,8 +194,67 @@ fill_metadata(GPtrArray *args_metadata)
     fill_metadata_callback(args_metadata);
 }
 
+static void
+callback_data_guard_from_gc(RBGICallbackData *callback_data)
+{
+    VALUE rb_callbacks;
+
+    rb_callbacks = rb_iv_get(RG_TARGET_NAMESPACE, callbacks_key);
+    callback_data->rb_gc_guard_key = rb_class_new_instance(0, NULL, rb_cObject);
+    rb_hash_aset(rb_callbacks,
+                 callback_data->rb_gc_guard_key,
+                 callback_data->rb_callback);
+}
+
+static void
+callback_data_unguard_from_gc(RBGICallbackData *callback_data)
+{
+    VALUE rb_callbacks;
+
+    rb_callbacks = rb_iv_get(RG_TARGET_NAMESPACE, callbacks_key);
+    rb_hash_delete(rb_callbacks, callback_data->rb_gc_guard_key);
+}
+
+void
+rb_gi_callback_data_free(RBGICallbackData *callback_data)
+{
+    callback_data_unguard_from_gc(callback_data);
+    xfree(callback_data->metadata);
+    xfree(callback_data);
+}
+
+static void
+destroy_notify(gpointer data)
+{
+    RBGICallbackData *callback_data = data;
+    rb_gi_callback_data_free(callback_data);
+}
+
+static gpointer
+find_callback_function(GIArgInfo *info)
+{
+    guint i;
+    gpointer callback = NULL;
+
+    for (i = 0; i < callback_finders->len; i++) {
+        RBGICallbackFinderFunc finder = g_ptr_array_index(callback_finders, i);
+        callback = finder(info);
+        if (callback) {
+            break;
+        }
+    }
+
+    return callback;
+}
+
+void
+rb_gi_callback_register_finder(RBGICallbackFinderFunc finder)
+{
+    g_ptr_array_add(callback_finders, finder);
+}
+
 static gboolean
-source_callback_p(GIArgInfo *info)
+source_func_p(GIArgInfo *info)
 {
     GITypeInfo type_info;
     GIBaseInfo *interface_info;
@@ -253,84 +297,64 @@ source_callback_p(GIArgInfo *info)
     return TRUE;
 }
 
-typedef struct {
-    ArgMetadata *metadata;
-    VALUE rb_gc_guard_key;
-    VALUE rb_callback;
-} CallbackData;
-
-static void
-callback_data_guard_from_gc(CallbackData *callback_data)
-{
-    VALUE rb_callbacks;
-
-    rb_callbacks = rb_iv_get(RG_TARGET_NAMESPACE, callbacks_key);
-    callback_data->rb_gc_guard_key = rb_class_new_instance(0, NULL, rb_cObject);
-    rb_hash_aset(rb_callbacks,
-                 callback_data->rb_gc_guard_key,
-                 callback_data->rb_callback);
-}
-
-static void
-callback_data_unguard_from_gc(CallbackData *callback_data)
-{
-    VALUE rb_callbacks;
-
-    rb_callbacks = rb_iv_get(RG_TARGET_NAMESPACE, callbacks_key);
-    rb_hash_delete(rb_callbacks, callback_data->rb_gc_guard_key);
-}
-
-static void
-callback_data_free(CallbackData *callback_data)
-{
-    callback_data_unguard_from_gc(callback_data);
-    xfree(callback_data->metadata);
-    xfree(callback_data);
-}
-
 static gboolean
-source_callback(gpointer user_data)
+source_func_callback(gpointer user_data)
 {
-    CallbackData *callback_data = user_data;
+    RBGICallbackData *callback_data = user_data;
     VALUE rb_keep;
     ID id_call;
 
     CONST_ID(id_call, "call");
     rb_keep = rb_funcall(callback_data->rb_callback, id_call, 0);
     if (callback_data->metadata->scope_type == GI_SCOPE_TYPE_ASYNC) {
-        callback_data_free(callback_data);
+        rb_gi_callback_data_free(callback_data);
     }
     return RVAL2CBOOL(rb_keep);
 }
 
-static void
-destroy_notify(gpointer data)
+static gpointer
+source_func_callback_finder(GIArgInfo *arg_info)
 {
-    CallbackData *callback_data = data;
-    callback_data_free(callback_data);
+    if (!source_func_p(arg_info)) {
+        return NULL;
+    }
+    return source_func_callback;
 }
 
 static void
-in_callback_argument_from_ruby(ArgMetadata *metadata, VALUE *argv,
+in_callback_argument_from_ruby(RBGIArgMetadata *metadata, VALUE *argv,
                                GArray *in_args)
 {
+    gpointer callback;
+    GIArgInfo *arg_info;
     GIArgument *callback_argument;
 
-    if (!source_callback_p(&(metadata->arg_info))) {
+    arg_info = &(metadata->arg_info);
+    callback = find_callback_function(arg_info);
+    if (!callback) {
+        GITypeInfo type_info;
+        GIBaseInfo *interface_info;
+        VALUE rb_type_name;
+        g_arg_info_load_type(arg_info, &type_info);
+        interface_info = g_type_info_get_interface(&type_info);
+        rb_type_name = CSTR2RVAL(g_base_info_get_name(interface_info));
+        g_base_info_unref(interface_info);
         rb_raise(rb_eNotImpError,
-                 "TODO: GSourceFunc callback is only supported.");
+                 "TODO: <%s>(%s) callback is not supported yet.",
+                 RVAL2CSTR(rb_type_name),
+                 g_base_info_get_name(arg_info));
     }
 
     callback_argument = &(g_array_index(in_args,
                                         GIArgument,
                                         metadata->in_arg_index));
-    callback_argument->v_pointer = source_callback;
+    callback_argument->v_pointer = callback;
 
     if (metadata->closure_in_arg_index != -1) {
-        CallbackData *callback_data;
+        RBGICallbackData *callback_data;
         GIArgument *closure_argument;
 
-        callback_data = ALLOC(CallbackData);
+        callback_data = ALLOC(RBGICallbackData);
         callback_data->metadata = metadata;
         callback_data->rb_callback = rb_block_proc();
         callback_data_guard_from_gc(callback_data);
@@ -350,7 +374,7 @@ in_callback_argument_from_ruby(ArgMetadata *metadata, VALUE *argv,
 }
 
 static void
-in_argument_from_ruby(ArgMetadata *metadata, VALUE *argv, GArray *in_args)
+in_argument_from_ruby(RBGIArgMetadata *metadata, VALUE *argv, GArray *in_args)
 {
     if (metadata->rb_arg_index == -1) {
         return;
@@ -369,7 +393,7 @@ in_argument_from_ruby(ArgMetadata *metadata, VALUE *argv, GArray *in_args)
 }
 
 static void
-out_argument_from_ruby(ArgMetadata *metadata, GArray *out_args)
+out_argument_from_ruby(RBGIArgMetadata *metadata, GArray *out_args)
 {
     GIArgument *argument;
 
@@ -380,7 +404,7 @@ out_argument_from_ruby(ArgMetadata *metadata, GArray *out_args)
 static void
 arg_metadata_free(gpointer data)
 {
-    ArgMetadata *metadata = data;
+    RBGIArgMetadata *metadata = data;
     if (metadata->scope_type == GI_SCOPE_TYPE_ASYNC ||
         metadata->scope_type == GI_SCOPE_TYPE_NOTIFIED) {
         return;
@@ -403,7 +427,7 @@ arguments_from_ruby(GICallableInfo *info,
 
     n_args = g_callable_info_get_n_args(info);
     for (i = 0; i < n_args; i++) {
-        ArgMetadata *metadata;
+        RBGIArgMetadata *metadata;
 
         metadata = g_ptr_array_index(args_metadata, i);
         if (metadata->in_arg_index != -1) {
@@ -415,7 +439,7 @@ arguments_from_ruby(GICallableInfo *info,
 }
 
 static VALUE
-inout_argv_argument_to_ruby(GArray *in_args, ArgMetadata *metadata)
+inout_argv_argument_to_ruby(GArray *in_args, RBGIArgMetadata *metadata)
 {
     GIArgument *inout_argc_argument;
     GIArgument *inout_argv_argument;
@@ -447,7 +471,7 @@ out_arguments_to_ruby(GICallableInfo *callable_info,
     rb_out_args = rb_ary_new();
     n_args = g_callable_info_get_n_args(callable_info);
     for (i = 0; i < n_args; i++) {
-        ArgMetadata *metadata;
+        RBGIArgMetadata *metadata;
         GIArgument *argument = NULL;
         VALUE rb_argument;
 
@@ -501,7 +525,7 @@ arguments_free(GArray *in_args, GArray *out_args, GPtrArray *args_metadata)
     guint i;
 
     for (i = 0; i < args_metadata->len; i++) {
-        ArgMetadata *metadata;
+        RBGIArgMetadata *metadata;
         gint in_arg_index;
 
         metadata = g_ptr_array_index(args_metadata, i);
@@ -563,6 +587,14 @@ rb_gi_function_info_invoke_raw(GIFunctionInfo *info, GIArgument *receiver,
         RG_RAISE_ERROR(error);
     }
 
+    if (!NIL_P(rb_out_args) && RARRAY_LEN(rb_out_args) == 1) {
+        VALUE rb_out_arg;
+        rb_out_arg = RARRAY_PTR(rb_out_args)[0];
+        if (rb_obj_is_kind_of(rb_out_arg, rb_cGLibError)) {
+            rb_exc_raise(rb_out_arg);
+        }
+    }
+
     return rb_out_args;
 }
 
@@ -591,19 +623,28 @@ 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;
+        }
     }
 }
 
 void
 rb_gi_function_info_init(VALUE rb_mGI, VALUE rb_cGICallableInfo)
 {
+    rb_cGLibError = rb_const_get(mGLib, rb_intern("Error"));
+
     RG_TARGET_NAMESPACE =
 	G_DEF_CLASS_WITH_PARENT(GI_TYPE_FUNCTION_INFO, "FunctionInfo", rb_mGI,
 				rb_cGICallableInfo);
 
     rb_iv_set(RG_TARGET_NAMESPACE, callbacks_key, rb_hash_new());
 
+    callback_finders = g_ptr_array_new();
+    rb_gi_callback_register_finder(source_func_callback_finder);
+
     RG_DEF_METHOD(symbol, 0);
     RG_DEF_METHOD(flags, 0);
     RG_DEF_METHOD(property, 0);