glib2 1.0.3 → 1.1.0

data/ext/glib2/rbgutil.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgutil.c -
-
-  $Author: sakai $
-  $Date: 2007/07/07 08:15:26 $
-
-  Copyright (C) 2002-2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2004 Masao Mutoh
+ *
+ *  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
+ */
 
 #include "rbgprivate.h"
 
@@ -18,6 +28,32 @@ static ID id_set_property;
 static ID id_to_a;
 static ID id_allocate;
 
+void
+rbg_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+{
+    rb_define_method(klass, name, func, argc);
+    if ((argc != 1) || strncmp(name, "set_", 4))
+        return;
+
+    name += 4;
+    rb_funcall(klass, rbgutil_id_module_eval, 1,
+               CSTR2RVAL_FREE(g_strdup_printf("def %s=(val); set_%s(val); val; end\n",
+                                              name, name)));
+}
+
+void
+rbg_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc)
+{
+    rb_define_singleton_method(obj, name, func, argc);
+    if ((argc != 1) || strncmp(name, "set_", 4))
+        return;
+
+    name += 4;
+    rb_funcall(obj, rbgutil_id_module_eval, 1,
+               CSTR2RVAL_FREE(g_strdup_printf("def self.%s=(val); set_%s(val); val; end\n",
+                                              name, name)));
+}
+
 void
 rbgutil_set_properties(VALUE self, VALUE hash)
 {
@@ -39,238 +75,16 @@ rbgutil_set_properties(VALUE self, VALUE hash)
 }
 
 VALUE
-rbgutil_glist2ary(const GList *const list)
-{
-    VALUE ary;
-    const GList *i;
-
-    ary = rb_ary_new();
-    for (i = list; i != NULL; i = i->next)
-        rb_ary_push(ary, GOBJ2RVAL(i->data));
-
-    return ary;
-}
-
-VALUE
-rbgutil_glist2ary_and_free_body(VALUE data)
-{
-    VALUE ary;
-    GList *i;
-
-    ary = rb_ary_new();
-    for (i = (GList *)data; i != NULL; i = i->next)
-        rb_ary_push(ary, GOBJ2RVAL(i->data));
-
-    return ary;
-}
-
-VALUE
-rbgutil_glist2ary_and_free_ensure(VALUE data)
-{
-    g_list_free((GList *)data);
-
-    return Qnil;
-}
-
-VALUE
-rbgutil_glist2ary_and_free(GList *const list)
-{
-    return rb_ensure(rbgutil_glist2ary_and_free_body, (VALUE)list,
-                     rbgutil_glist2ary_and_free_ensure, (VALUE)list);
-}
-
-VALUE
-rbgutil_glist2ary_boxed(const GList *const list, GType gtype)
-{
-    VALUE ary;
-    const GList *i;
-
-    ary = rb_ary_new();
-    for (i = list; i != NULL; i = i->next)
-        rb_ary_push(ary, BOXED2RVAL(i->data, gtype));
-
-    return ary;
-}
-
-struct rbgutil_glist2ary_boxed_and_free_data
-{
-    GList *const list;
-    GType gtype;
-};
-
-VALUE
-rbgutil_glist2ary_boxed_and_free_body(VALUE data)
-{
-    struct rbgutil_glist2ary_boxed_and_free_data *real;
-    VALUE ary;
-    GList *i;
-
-    real = (struct rbgutil_glist2ary_boxed_and_free_data *)data;
-    ary = rb_ary_new();
-    for (i = real->list; i != NULL; i = i->next)
-        rb_ary_push(ary, BOXED2RVAL(i->data, real->gtype));
-
-    return ary;
-}
-
-VALUE
-rbgutil_glist2ary_boxed_and_free_ensure(VALUE data)
-{
-    g_list_free(((struct rbgutil_glist2ary_boxed_and_free_data *)data)->list);
-
-    return Qnil;
-}
-
-VALUE
-rbgutil_glist2ary_boxed_and_free(GList *const list, GType gtype)
-{
-    struct rbgutil_glist2ary_boxed_and_free_data data = { list, gtype };
-
-    return rb_ensure(rbgutil_glist2ary_boxed_and_free_body, (VALUE)&data,
-                     rbgutil_glist2ary_boxed_and_free_ensure, (VALUE)&data);
-}
-
-VALUE
-rbgutil_glist2ary_string(const GList *const list)
-{
-    VALUE ary;
-    const GList *i;
-
-    ary = rb_ary_new();
-    for (i = list; i != NULL; i = i->next)
-        rb_ary_push(ary, CSTR2RVAL(i->data));
-
-    return ary;
-}
-
-static VALUE
-rbgutil_glist2ary_string_and_free_body(VALUE data)
-{
-    VALUE ary;
-    GList *i;
-
-    ary = rb_ary_new();
-    for (i = (GList *)data; i != NULL; i = i->next)
-        rb_ary_push(ary, CSTR2RVAL(i->data));
-
-    return ary;
-}
-
-static VALUE
-rbgutil_glist2ary_string_and_free_ensure(VALUE data)
-{
-    GList *i;
-
-    for (i = (GList *)data; i != NULL; i = i->next)
-        g_free(i->data);
-    g_list_free((GList *)data);
-
-    return Qnil;
-}
-
-VALUE
-rbgutil_glist2ary_string_and_free(GList *const list)
-{
-    return rb_ensure(rbgutil_glist2ary_string_and_free_body, (VALUE)list,
-                     rbgutil_glist2ary_string_and_free_ensure, (VALUE)list);
-}
-
-VALUE
-rbgutil_gslist2ary(const GSList *const list)
-{
-    VALUE ary;
-    const GSList *i;
-    
-    ary = rb_ary_new();
-    for (i = list; i != NULL; i = i->next)
-        rb_ary_push(ary, GOBJ2RVAL(i->data));
-
-    return ary;
-}
-
-static VALUE
-rbgutil_gslist2ary_and_free_body(VALUE data)
-{
-    VALUE ary;
-    GSList *i;
-
-    ary = rb_ary_new();
-    for (i = (GSList *)data; i != NULL; i = i->next)
-        rb_ary_push(ary, GOBJ2RVAL(i->data));
-
-    return ary;
-}
-
-static VALUE
-rbgutil_gslist2ary_and_free_ensure(VALUE data)
-{
-    g_slist_free((GSList *)data);
-
-    return Qnil;
-}
-
-VALUE
-rbgutil_gslist2ary_and_free(GSList *const list)
-{
-    return rb_ensure(rbgutil_gslist2ary_and_free_body, (VALUE)list,
-                     rbgutil_gslist2ary_and_free_ensure, (VALUE)list);
-}
-
-VALUE
-rbgutil_gslist2ary_boxed(const GSList *const list, GType gtype)
-{
-    VALUE ary;
-    const GSList *i;
-    
-    ary = rb_ary_new();
-    for (i = list; i != NULL; i = i->next)
-        rb_ary_push(ary, BOXED2RVAL(i->data, gtype));
-
-    return ary;
-}
-
-struct rbgutil_gslist2ary_boxed_and_free_data
-{
-    GSList *const list;
-    GType gtype;
-};
-
-static VALUE
-rbgutil_gslist2ary_boxed_and_free_body(VALUE data)
-{
-    struct rbgutil_gslist2ary_boxed_and_free_data *real;
-    VALUE ary;
-    GSList *i;
-
-    real = (struct rbgutil_gslist2ary_boxed_and_free_data *)data;
-    ary = rb_ary_new();
-    for (i = real->list; i != NULL; i = i->next)
-        rb_ary_push(ary, BOXED2RVAL(i->data, real->gtype));
-
-    return ary;
-}
-
-static VALUE
-rbgutil_gslist2ary_boxed_and_free_ensure(VALUE data)
-{
-    g_slist_free(((struct rbgutil_gslist2ary_boxed_and_free_data *)data)->list);
-
-    return Qnil;
-}
-
-VALUE
-rbgutil_gslist2ary_boxed_and_free(GSList *const list, GType gtype)
+rbgutil_def_setters(VALUE klass)
 {
-    struct rbgutil_gslist2ary_boxed_and_free_data data = { list, gtype };
-
-    return rb_ensure(rbgutil_gslist2ary_boxed_and_free_body, (VALUE)&data,
-                     rbgutil_gslist2ary_boxed_and_free_ensure, (VALUE)&data);
+    return rb_funcall(mGLib, id_add_one_arg_setter, 1, klass);
 }
 
-VALUE
-rbgutil_def_setters(VALUE klass)
+void
+rbgutil_glibid_r2g_func(VALUE from, GValue* to)
 {
-    return rb_funcall(mGLib, id_add_one_arg_setter, 1, klass);
+    VALUE buffer;
+    g_value_set_string(to, RVAL2GLIBID(from, buffer));
 }
 
 VALUE
@@ -303,7 +117,7 @@ rbgutil_string_set_utf8_encoding(VALUE string)
 }
 
 void
-Init_gutil()
+Init_gutil(void)
 {
     rbgutil_id_module_eval = rb_intern("module_eval");
     id_set_property = rb_intern("set_property");

data/ext/glib2/rbgutil.h

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgutil.h -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:17:21 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  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 __RBGUTIL_H__
 #define __RBGUTIL_H__
@@ -18,15 +28,43 @@
 #  include <ruby/encoding.h>
 #endif
 #include "rbglib.h"
+#include "rbgutil_list.h"
+#include "rbgutildeprecated.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#define G_DEF_SETTER(klass, name) \
-    rb_funcall(klass, rbgutil_id_module_eval, 1, rb_str_new2( \
-    "def " name "=(val); set_" name "(val); val; end\n"))
-#define G_DEF_SETTERS(klass) rbgutil_def_setters(klass)
+#define RG_DEF_MODFUNC(method, argc) \
+        rb_define_module_function(RG_TARGET_NAMESPACE, #method, rg_m_ ## method, argc)
+#define RG_DEF_MODFUNC_P(method, argc) \
+        rb_define_module_function(RG_TARGET_NAMESPACE, #method"?", rg_m_ ## method ## _p, argc)
+#define RG_DEF_MODFUNC_OPERATOR(ope, func, argc) \
+        rb_define_module_function(RG_TARGET_NAMESPACE, ope, rg_m_operator_ ## func, argc)
+#define RG_DEF_SMETHOD(method, argc) \
+        rb_define_singleton_method(RG_TARGET_NAMESPACE, #method, rg_s_ ## method, argc)
+#define RG_DEF_SMETHOD_P(method, argc) \
+        rb_define_singleton_method(RG_TARGET_NAMESPACE, #method"?", rg_s_ ## method ## _p, argc)
+#define RG_DEF_SMETHOD_BANG(method, argc) \
+        rb_define_singleton_method(RG_TARGET_NAMESPACE, #method"!", rg_s_ ## method ## _bang, argc)
+#define RG_DEF_SMETHOD_OPERATOR(ope, func, argc) \
+        rb_define_singleton_method(RG_TARGET_NAMESPACE, ope, rg_s_operator_ ## func, argc)
+#define RG_DEF_METHOD(method, argc) \
+        rb_define_method(RG_TARGET_NAMESPACE, #method, rg_ ## method, argc)
+#define RG_DEF_METHOD_P(method, argc) \
+        rb_define_method(RG_TARGET_NAMESPACE, #method"?", rg_ ## method ## _p, argc)
+#define RG_DEF_METHOD_BANG(method, argc) \
+        rb_define_method(RG_TARGET_NAMESPACE, #method"!", rg_ ## method ## _bang, argc)
+#define RG_DEF_METHOD_OPERATOR(ope, func, argc) \
+        rb_define_method(RG_TARGET_NAMESPACE, ope, rg_operator_ ## func, argc)
+#define RG_DEF_ATTR(attr, read, write, ex) \
+        rb_attr(RG_TARGET_NAMESPACE, rb_intern(attr), read, write, ex)
+#define RG_DEF_ALIAS(new, old) rb_define_alias(RG_TARGET_NAMESPACE, new, old)
+
+#define RG_REG_GLIBID_SETTER(name) \
+        rbgobj_register_property_setter(CLASS2GTYPE(RG_TARGET_NAMESPACE), name, rbgutil_glibid_r2g_func)
+#define RG_REG_SYMBOL_GETTER(name) \
+        rbgobj_register_property_getter(CLASS2GTYPE(RG_TARGET_NAMESPACE), name, rbgutil_sym_g2r_func)
 
 #define G_REPLACE_SET_PROPERTY(klass, name, function, args) \
     rb_undef_method(klass, "set_" name); \
@@ -43,38 +81,15 @@ extern "C" {
     rb_define_method(klass, name, function, args)
 
 #define G_SET_PROPERTIES(self, hash) (rbgutil_set_properties(self, hash))
-#define G_SET_SYMBOL_PROPERTY(gtype, name) \
-     rbgobj_register_property_getter(gtype, name, rbgutil_sym_g2r_func)
 #define G_PROTECT_CALLBACK(func, data) (rbgutil_invoke_callback((VALUE(*)(VALUE))func, (VALUE)data))
 
-#define GLIST2ARY(list)           (rbgutil_glist2ary(list))
-#define GLIST2ARY_FREE(list)      (rbgutil_glist2ary_and_free(list))
-#define GLIST2ARYF(list)          (GLIST2ARY_FREE(list))
-#define GLIST2ARY2(list, gtype)   (rbgutil_glist2ary_boxed(list, gtype))
-#define GLIST2ARY2F(list, gtype)  (rbgutil_glist2ary_boxed_and_free(list, gtype))
-#define GLIST2ARY_STR(list)       (rbgutil_glist2ary_string(list))
-#define GLIST2ARY_STR_FREE(list)  (rbgutil_glist2ary_string_and_free(list))
-#define GSLIST2ARY(list)          (rbgutil_gslist2ary(list))
-#define GSLIST2ARY_FREE(list)     (rbgutil_gslist2ary_and_free(list))
-#define GSLIST2ARYF(list)         (GSLIST2ARY_FREE(list))
-#define GSLIST2ARY2(list, gtype)  (rbgutil_gslist2ary_boxed(list, gtype))
-#define GSLIST2ARY2F(list, gtype) (rbgutil_gslist2ary_boxed_and_free(list, gtype))
-
 #define RBG_STRING_SET_UTF8_ENCODING(string) \
     (rbgutil_string_set_utf8_encoding(string))
 
+extern void rbg_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc);
+extern void rbg_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc);
 extern VALUE rbgutil_def_setters(VALUE klass);
 extern void rbgutil_set_properties(VALUE self, VALUE hash);
-extern VALUE rbgutil_glist2ary(const GList *list);
-extern VALUE rbgutil_glist2ary_and_free(GList* list);
-extern VALUE rbgutil_glist2ary_boxed(const GList *list, GType gtype);
-extern VALUE rbgutil_glist2ary_boxed_and_free(GList *list, GType gtype);
-extern VALUE rbgutil_glist2ary_string(const GList *list);
-extern VALUE rbgutil_glist2ary_string_and_free(GList *list);
-extern VALUE rbgutil_gslist2ary(const GSList *list);
-extern VALUE rbgutil_gslist2ary_and_free(GSList *list);
-extern VALUE rbgutil_gslist2ary_boxed(const GSList *list, GType gtype);
-extern VALUE rbgutil_gslist2ary_boxed_and_free(GSList *list, GType gtype);
 extern VALUE rbgutil_protect(VALUE (*proc) (VALUE), VALUE data);
 extern VALUE rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg);
 extern void rbgutil_start_callback_dispatch_thread(void);
@@ -84,13 +99,11 @@ extern VALUE rbgutil_string_set_utf8_encoding(VALUE string);
 
 /*< protected >*/
 RUBY_GLIB2_VAR ID rbgutil_id_module_eval;
+extern void rbgutil_glibid_r2g_func(VALUE from, GValue* to);
 extern VALUE rbgutil_sym_g2r_func(const GValue *from);
 
-/* deprecated */
-#define G_BLOCK_PROC rb_block_proc
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __RBGLIB_H__ */
+#endif /* __RBGUTIL_H__ */