gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkconversions.h

@@ -1,10 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkconversions.h -
-
-  Copyright (C) 2008 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  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 _RBGTKCONVERSIONS_H
 #define _RBGTKCONVERSIONS_H

data/ext/gtk2/rbgtkcurve.c

@@ -1,51 +1,63 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcurve.c -
-
-  $Author: mutoh $
-  $Date: 2006/05/07 23:51:20 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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 "global.h"
 
+#define RG_TARGET_NAMESPACE cCurve
+
 static VALUE
-curve_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_curve_new());
     return Qnil;
 }
 
 static VALUE
-curve_reset(VALUE self)
+rg_reset(VALUE self)
 {
     gtk_curve_reset(GTK_CURVE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-curve_set_gamma(VALUE self, VALUE gamma)
+rg_set_gamma(VALUE self, VALUE gamma)
 {
     gtk_curve_set_gamma(GTK_CURVE(RVAL2GOBJ(self)), NUM2DBL(gamma));
     return self;
 }
 
 static VALUE
-curve_set_range(VALUE self, VALUE min_x, VALUE max_x, VALUE min_y, VALUE max_y)
+rg_set_range(VALUE self, VALUE min_x, VALUE max_x, VALUE min_y, VALUE max_y)
 {
     gtk_curve_set_range(GTK_CURVE(RVAL2GOBJ(self)),
-			NUM2DBL(min_x), NUM2DBL(max_x),
-			NUM2DBL(min_y), NUM2DBL(max_y));
+                        NUM2DBL(min_x), NUM2DBL(max_x),
+                        NUM2DBL(min_y), NUM2DBL(max_y));
     return self;
 }
 
 static VALUE
-curve_set_vector(VALUE self, VALUE length, VALUE vector)
+rg_set_vector(VALUE self, VALUE length, VALUE vector)
 {
     gint len = NUM2INT(length);
     gfloat *c_vec;
@@ -61,7 +73,7 @@ curve_set_vector(VALUE self, VALUE length, VALUE vector)
 }
 
 static VALUE
-curve_get_vector(VALUE self, VALUE length)
+rg_get_vector(VALUE self, VALUE length)
 {
     gint len = NUM2INT(length);
     gfloat *c_vec;
@@ -77,25 +89,23 @@ curve_get_vector(VALUE self, VALUE length)
 }
 
 void 
-Init_gtk_curve()
+Init_gtk_curve(VALUE mGtk)
 {
-    VALUE gCurve = G_DEF_CLASS(GTK_TYPE_CURVE, "Curve", mGtk);
-
-    rb_define_method(gCurve, "initialize", curve_initialize, 0);
-    rb_define_method(gCurve, "reset", curve_reset, 0);
-    rb_define_method(gCurve, "set_gamma", curve_set_gamma, 1);
-    G_DEF_SETTER(gCurve, "gamma");
-    rb_define_method(gCurve, "set_range", curve_set_range, 4);
-    rb_define_method(gCurve, "set_vector", curve_set_vector, 2);
-    G_DEF_SETTER(gCurve, "vector");
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CURVE, "Curve", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(reset, 0);
+    RG_DEF_METHOD(set_gamma, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "gamma");
+    RG_DEF_METHOD(set_range, 4);
+    RG_DEF_METHOD(set_vector, 2);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "vector");
     /* NOTE: For backwards compatability. */
-    rb_define_method(gCurve, "get_vector", curve_get_vector, 1);
-    rb_define_method(gCurve, "vector", curve_get_vector, 1);
+    RG_DEF_METHOD(get_vector, 1);
+    RG_DEF_ALIAS("vector", "get_vector");
 
     /* GtkCurveType(from standard constants) */
 
-    G_DEF_CLASS(GTK_TYPE_CURVE_TYPE, "Type", gCurve);
-    G_DEF_CONSTANTS(gCurve, GTK_TYPE_CURVE_TYPE, "GTK_CURVE_");
+    G_DEF_CLASS(GTK_TYPE_CURVE_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_CURVE_TYPE, "GTK_CURVE_");
 }
-
-

data/ext/gtk2/rbgtkdialog.c

@@ -1,25 +1,36 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkdialog.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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 "global.h"
 
+#define RG_TARGET_NAMESPACE cDialog
 #define _SELF(self) (GTK_DIALOG(RVAL2GOBJ(self)))
 
 static ID id_to_a;
 
 static VALUE
-dialog_add_button(VALUE self, VALUE button_text, VALUE response_id)
+rg_add_button(VALUE self, VALUE button_text, VALUE response_id)
 {
     const gchar *name;
     if (SYMBOL_P(button_text)) {
@@ -31,25 +42,51 @@ dialog_add_button(VALUE self, VALUE button_text, VALUE response_id)
                                            RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE)));
 }
 
-VALUE
-rbgtk_dialog_add_buttons_internal(VALUE self, VALUE button_ary)
-{
-    int i;
-    GObject* obj = RVAL2GOBJ(self);
-    if (RARRAY_PTR(button_ary)[0] != Qnil){
-        g_object_freeze_notify(obj);
-        for (i = 0; i < RARRAY_LEN(button_ary); i++) {
-            Check_Type(RARRAY_PTR(button_ary)[i], T_ARRAY);
-            dialog_add_button(self, RARRAY_PTR(RARRAY_PTR(button_ary)[i])[0],
-                              RARRAY_PTR(RARRAY_PTR(button_ary)[i])[1]);
-        }
-        g_object_thaw_notify(obj);
+struct rbgtk_dialog_add_buttons_internal_args {
+    VALUE self;
+    VALUE buttons;
+};
+
+static VALUE
+rbgtk_dialog_add_buttons_internal_body(VALUE value)
+{
+    struct rbgtk_dialog_add_buttons_internal_args *args = (struct rbgtk_dialog_add_buttons_internal_args *)value;
+    long i;
+    long n = RARRAY_LEN(args->buttons);
+
+    for (i = 0; i < n; i++) {
+        VALUE button = rb_ary_to_ary(RARRAY_PTR(args->buttons)[i]);
+
+        rg_add_button(args->self, RARRAY_PTR(button)[0], RARRAY_PTR(button)[1]);
     }
-    return self;
+
+    return args->self;
+}
+
+static VALUE
+rbgtk_dialog_add_buttons_internal_ensure(VALUE value)
+{
+    g_object_thaw_notify(RVAL2GOBJ(((struct rbgtk_dialog_add_buttons_internal_args *)value)->self));
+
+    return Qnil;
+}
+
+VALUE
+rbgtk_dialog_add_buttons_internal(VALUE self, VALUE buttons)
+{
+    struct rbgtk_dialog_add_buttons_internal_args args = { self, buttons };
+
+    if (NIL_P(RARRAY_PTR(buttons)[0]))
+        return self;
+
+    g_object_freeze_notify(RVAL2GOBJ(self));
+
+    return rb_ensure(rbgtk_dialog_add_buttons_internal_body, (VALUE)&args,
+                     rbgtk_dialog_add_buttons_internal_ensure, (VALUE)&args);
 }    
 
 static VALUE
-dialog_add_buttons(int argc, VALUE *argv, VALUE self)
+rg_add_buttons(int argc, VALUE *argv, VALUE self)
 {
     VALUE button_ary;
     rb_scan_args(argc, argv, "*", &button_ary);
@@ -58,7 +95,7 @@ dialog_add_buttons(int argc, VALUE *argv, VALUE self)
 }    
 
 static VALUE
-dialog_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE title, parent, flags, button_ary;
     rb_scan_args(argc, argv, "03*", &title, &parent, &flags, &button_ary);
@@ -72,7 +109,7 @@ dialog_initialize(int argc, VALUE *argv, VALUE self)
             gtk_window_set_title(GTK_WINDOW(dialog), RVAL2CSTR(title));
         if (! NIL_P(parent))
             gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(RVAL2GOBJ(parent)));
-        
+
         if (gflags & GTK_DIALOG_MODAL)
             gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
         if (gflags & GTK_DIALOG_DESTROY_WITH_PARENT)
@@ -90,7 +127,7 @@ dialog_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-dialog_run(VALUE self)
+rg_run(VALUE self)
 {
     if (rb_block_given_p()){
         VALUE ret = INT2NUM(gtk_dialog_run(_SELF(self)));
@@ -102,14 +139,14 @@ dialog_run(VALUE self)
 }
 
 static VALUE
-dialog_response(VALUE self, VALUE response_id)
+rg_response(VALUE self, VALUE response_id)
 {
     gtk_dialog_response(_SELF(self), NUM2INT(response_id));
     return self;
 }
 
 static VALUE
-dialog_add_action_widget(VALUE self, VALUE child, VALUE response_id)
+rg_add_action_widget(VALUE self, VALUE child, VALUE response_id)
 {
     gtk_dialog_add_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)), 
                                  NUM2INT(response_id));
@@ -117,14 +154,14 @@ dialog_add_action_widget(VALUE self, VALUE child, VALUE response_id)
 }
 
 static VALUE
-dialog_set_default_response(VALUE self, VALUE response_id)
+rg_set_default_response(VALUE self, VALUE response_id)
 {
     gtk_dialog_set_default_response(_SELF(self), NUM2INT(response_id));
     return self;
 }
 
 static VALUE
-dialog_set_response_sensitive(VALUE self, VALUE response_id, VALUE setting)
+rg_set_response_sensitive(VALUE self, VALUE response_id, VALUE setting)
 {
     gtk_dialog_set_response_sensitive(_SELF(self), NUM2INT(response_id), RVAL2CBOOL(setting));
     return self;
@@ -132,7 +169,7 @@ dialog_set_response_sensitive(VALUE self, VALUE response_id, VALUE setting)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-dialog_s_alternative_dialog_button_order(VALUE self, VALUE screen)
+rg_s_alternative_dialog_button_order_p(G_GNUC_UNUSED VALUE self, VALUE screen)
 {
     gboolean ret = gtk_alternative_dialog_button_order(NIL_P(screen) ? NULL : 
                                                        GDK_SCREEN(RVAL2GOBJ(screen)));
@@ -147,79 +184,76 @@ void        gtk_dialog_set_alternative_button_order
 */
 
 static VALUE
-dialog_set_alternative_button_order(VALUE self, VALUE new_order)
+rg_set_alternative_button_order(VALUE self, VALUE rbnew_order)
 {
-    gint i;
-    gint len = RARRAY_LEN(new_order);
-    gint* gnew_order = g_new(gint, len);
+    GtkDialog *dialog = _SELF(self);
+    long n;
+    gint *new_order = RVAL2GINTS(rbnew_order, n);
 
-    for (i = 0; i < len; i++){
-        gnew_order[i] = NUM2INT(RARRAY_PTR(new_order)[i]);
-    }
+    gtk_dialog_set_alternative_button_order_from_array(dialog, n, new_order);
+
+    g_free(new_order);
 
-    gtk_dialog_set_alternative_button_order_from_array(_SELF(self), len, gnew_order);
-    g_free(gnew_order);
     return self;
 }
 
 #endif
 
 static VALUE
-dialog_vbox(VALUE self)
+rg_vbox(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->vbox);
 }
 
 static VALUE
-dialog_action_area(VALUE self)
+rg_action_area(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->action_area);
 }
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-dialog_get_response_for_widget(VALUE self, VALUE widget)
+rg_get_response(VALUE self, VALUE widget)
 {
     return INT2NUM(gtk_dialog_get_response_for_widget(_SELF(self), RVAL2GOBJ(widget)));
 }
 #endif
 
 void 
-Init_gtk_dialog()
+Init_gtk_dialog(VALUE mGtk)
 {
-    VALUE gDialog = G_DEF_CLASS(GTK_TYPE_DIALOG, "Dialog", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_DIALOG, "Dialog", mGtk);
 
     id_to_a = rb_intern("to_a");
 
-    rb_define_method(gDialog, "initialize", dialog_initialize, -1);
-    rb_define_method(gDialog, "run", dialog_run, 0);
-    rb_define_method(gDialog, "response", dialog_response, 1);
-    rb_define_method(gDialog, "add_button", dialog_add_button, 2);
-    rb_define_method(gDialog, "add_buttons", dialog_add_buttons, -1);
-    rb_define_method(gDialog, "add_action_widget", dialog_add_action_widget, 2);
-    rb_define_method(gDialog, "set_default_response", dialog_set_default_response, 1);
-    G_DEF_SETTER(gDialog, "default_response");
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(run, 0);
+    RG_DEF_METHOD(response, 1);
+    RG_DEF_METHOD(add_button, 2);
+    RG_DEF_METHOD(add_buttons, -1);
+    RG_DEF_METHOD(add_action_widget, 2);
+    RG_DEF_METHOD(set_default_response, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "default_response");
 
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_singleton_method(gDialog, "alternative_dialog_button_order?", 
-                               dialog_s_alternative_dialog_button_order, 1);
-    rb_define_method(gDialog, "set_alternative_button_order", dialog_set_alternative_button_order, 1);
+    RG_DEF_SMETHOD_P(alternative_dialog_button_order, 1);
+    RG_DEF_METHOD(set_alternative_button_order, 1);
 #endif
 
-    rb_define_method(gDialog, "set_response_sensitive", dialog_set_response_sensitive, 2);
-    rb_define_method(gDialog, "vbox", dialog_vbox, 0);
-    rb_define_method(gDialog, "action_area", dialog_action_area, 0);
+    RG_DEF_METHOD(set_response_sensitive, 2);
+    RG_DEF_METHOD(vbox, 0);
+    RG_DEF_METHOD(action_area, 0);
 
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(gDialog, "get_response", dialog_get_response_for_widget, 1);
-    rb_define_method(gDialog, "get_response_for_widget", dialog_get_response_for_widget, 1);
+    RG_DEF_METHOD(get_response, 1);
+    RG_DEF_ALIAS("get_response_for_widget", "get_response");
 #endif
 
     /* GtkDialogFlags */
-    G_DEF_CLASS(GTK_TYPE_DIALOG_FLAGS, "Flags", gDialog);
-    G_DEF_CONSTANTS(gDialog, GTK_TYPE_DIALOG_FLAGS, "GTK_DIALOG_");
+    G_DEF_CLASS(GTK_TYPE_DIALOG_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_DIALOG_FLAGS, "GTK_DIALOG_");
 
     /* GtkResponseType */
-    G_DEF_CLASS(GTK_TYPE_RESPONSE_TYPE, "ResponseType", gDialog);
-    G_DEF_CONSTANTS(gDialog, GTK_TYPE_RESPONSE_TYPE, "GTK_");
+    G_DEF_CLASS(GTK_TYPE_RESPONSE_TYPE, "ResponseType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_RESPONSE_TYPE, "GTK_");
 }