gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkradiomenuitem.c

@@ -1,76 +1,117 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi,
+ *                          dellin 
+ *
+ *  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
+ */
 
-  rbgtkradiomenuitem.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
+#include "global.h"
 
-  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi,
-                          dellin 
-************************************************/
+#define RG_TARGET_NAMESPACE cRadioMenuItem
 
-#include "global.h"
+struct rbgtk_rval2gtkradiomenuitemgslist_args {
+    VALUE ary;
+    long n;
+    GSList *result;
+};
 
-static GSList*
-ary2gslist(VALUE ary)
+static VALUE
+rbgtk_rval2gtkradiomenuitemgslist_body(VALUE value)
 {
     long i;
-    GSList *glist = NULL;
+    struct rbgtk_rval2gtkradiomenuitemgslist_args *args = (struct rbgtk_rval2gtkradiomenuitemgslist_args *)value;
 
-    if (NIL_P(ary)) return NULL;
-    Check_Type(ary, T_ARRAY);
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-        glist = g_slist_append(glist,RVAL2GOBJ(RARRAY_PTR(ary)[i]));
-    }
+    for (i = 0; i < args->n; i++)
+        args->result = g_slist_append(args->result, GTK_RADIO_MENU_ITEM(RVAL2GOBJ(RARRAY_PTR(args->ary)[i])));
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgtk_rval2gtkradiomenuitemgslist_rescue(VALUE value)
+{
+    g_slist_free(((struct rbgtk_rval2gtkradiomenuitemgslist_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GSList *
+rbgtk_rval2gtkradiomenuitemgslist(VALUE value)
+{
+    struct rbgtk_rval2gtkradiomenuitemgslist_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
 
-    return glist;
+    rb_rescue(rbgtk_rval2gtkradiomenuitemgslist_body, (VALUE)&args,
+              rbgtk_rval2gtkradiomenuitemgslist_rescue, (VALUE)&args);
+
+    return args.result;
 }
 
+#define RVAL2GTKRADIOMENUITEMGSLIST(value) rbgtk_rval2gtkradiomenuitemgslist(value)
+
 static VALUE
-rmitem_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3;
     GtkWidget *widget;
     GSList *list = NULL;
     const gchar *label = NULL;
     const gchar *mnemonic = NULL;
-    
+
     if (rb_scan_args(argc, argv, "03", &arg1, &arg2, &arg3) > 0 &&
         TYPE(arg1) == T_STRING) {
-        if (NIL_P(arg2) || RVAL2CBOOL(arg2)){
+        if (NIL_P(arg2) || RVAL2CBOOL(arg2))
             mnemonic = RVAL2CSTR(arg1);
-        } else {
+        else
             label = RVAL2CSTR(arg1);
-        }
     } else {
         if (!NIL_P(arg2)) {
-            if (NIL_P(arg3) || RVAL2CBOOL(arg3)){
+            if (NIL_P(arg3) || RVAL2CBOOL(arg3))
                 mnemonic = RVAL2CSTR(arg2);
-            } else {
+            else
                 label = RVAL2CSTR(arg2);
-            }
         }
-        if (rb_obj_is_kind_of(arg1, GTYPE2CLASS(GTK_TYPE_RADIO_MENU_ITEM))){
-            list = GTK_RADIO_MENU_ITEM(RVAL2GOBJ(arg1))->group;
-        } else if (TYPE(arg1) == T_ARRAY){
-            list = ary2gslist(arg1);
-        } else if (! NIL_P(arg1)){
+
+        if (rb_obj_is_kind_of(arg1, GTYPE2CLASS(GTK_TYPE_RADIO_MENU_ITEM)))
+            list = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(RVAL2GOBJ(arg1)));
+        else if (TYPE(arg1) == T_ARRAY)
+            /* TODO: This might leak. */
+            list = RVAL2GTKRADIOMENUITEMGSLIST(arg1);
+        else if (!NIL_P(arg1))
             rb_raise(rb_eArgError, "invalid argument %s (expect Array or Gtk::RadioMenuItem)", 
-                     rb_class2name(CLASS_OF(label)));
-        }
+                     rb_class2name(CLASS_OF(arg1)));
     }
-    if (label) {
+
+    if (label != NULL)
         widget = gtk_radio_menu_item_new_with_label(list, label);
-    } else if (mnemonic){
+    else if (mnemonic != NULL)
         widget = gtk_radio_menu_item_new_with_mnemonic(list, mnemonic);
-    } else {
+    else
         widget = gtk_radio_menu_item_new(list);
-    }
+
     RBGTK_INITIALIZE(self, widget);
+
     return Qnil;
 }
 
@@ -97,11 +138,11 @@ rmitem_set_group(VALUE self, VALUE grp_ary)
 }
 
 void 
-Init_gtk_radio_menu_item()
+Init_gtk_radio_menu_item(VALUE mGtk)
 {
-    VALUE gRMenuItem = G_DEF_CLASS(GTK_TYPE_RADIO_MENU_ITEM, "RadioMenuItem", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RADIO_MENU_ITEM, "RadioMenuItem", mGtk);
 
-    rb_define_method(gRMenuItem, "initialize", rmitem_initialize, -1);
-    G_REPLACE_GET_PROPERTY(gRMenuItem, "group", rmitem_get_group, 0);
-    G_REPLACE_SET_PROPERTY(gRMenuItem, "group", rmitem_set_group, 1);
+    RG_DEF_METHOD(initialize, -1);
+    G_REPLACE_GET_PROPERTY(RG_TARGET_NAMESPACE, "group", rmitem_get_group, 0);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "group", rmitem_set_group, 1);
 }

data/ext/gtk2/rbgtkradiotoolbutton.c

@@ -1,55 +1,104 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkradiotoolbutton.c -
-
-  $Author: mutoh $
-  $Date: 2006/06/17 06:59:32 $
-
-  Copyright (C) 2004-2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-2006 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 "global.h"
-                                                                                
+
 #if GTK_CHECK_VERSION(2,4,0)
 
+#define RG_TARGET_NAMESPACE cRadioToolButton
 #define _SELF(self) (GTK_RADIO_TOOL_BUTTON(RVAL2GOBJ(self)))
 
-static VALUE gRToolButton;
+static VALUE RG_TARGET_NAMESPACE;
+
+struct rbgtk_rval2gtkradiotoolbuttongslist_args {
+    VALUE ary;
+    long n;
+    GSList *result;
+};
 
 static VALUE
-rbtn_initialize(int argc, VALUE *argv, VALUE self)
+rbgtk_rval2gtkradiotoolbuttongslist_body(VALUE value)
+{
+    long i;
+    struct rbgtk_rval2gtkradiotoolbuttongslist_args *args = (struct rbgtk_rval2gtkradiotoolbuttongslist_args *)value;
+
+    for (i = 0; i < args->n; i++)
+        args->result = g_slist_append(args->result, GTK_RADIO_MENU_ITEM(RVAL2GOBJ(RARRAY_PTR(args->ary)[i])));
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgtk_rval2gtkradiotoolbuttongslist_rescue(VALUE value)
+{
+    g_slist_free(((struct rbgtk_rval2gtkradiotoolbuttongslist_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GSList *
+rbgtk_rval2gtkradiotoolbuttongslist(VALUE value)
 {
-    VALUE group_or_stock_id, stock_id;
+    struct rbgtk_rval2gtkradiotoolbuttongslist_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
+
+    rb_rescue(rbgtk_rval2gtkradiotoolbuttongslist_body, (VALUE)&args,
+              rbgtk_rval2gtkradiotoolbuttongslist_rescue, (VALUE)&args);
+
+    return args.result;
+}
+
+#define RVAL2GTKRADIOTOOLBUTTONGSLIST(value) rbgtk_rval2gtkradiotoolbuttongslist(value)
+
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE group_or_stock_id, rbstock_id;
     GtkToolItem *widget;
 
-    if (rb_scan_args(argc, argv, "02", &group_or_stock_id, &stock_id) > 0) {
-        GSList* list = NULL;
-        if (TYPE(group_or_stock_id) == T_ARRAY){
-            int i;
-            Check_Type(group_or_stock_id, T_ARRAY);
-            for (i = 0; i < RARRAY_LEN(group_or_stock_id); i++) {
-                list = g_slist_append(list, RVAL2GOBJ(RARRAY_PTR(group_or_stock_id)[i]));
-            }
-        } else if (rb_obj_is_kind_of(group_or_stock_id, gRToolButton)){
-            list = gtk_radio_tool_button_get_group(_SELF(group_or_stock_id));
-        } else {
-            list = NULL;
-        }
-        if (NIL_P(stock_id)){
-            widget = gtk_radio_tool_button_new(list);
-        } else {
-            if (TYPE(stock_id) == T_SYMBOL){
-                widget = gtk_radio_tool_button_new_from_stock(list, rb_id2name(SYM2ID(stock_id)));
-            } else {
-                widget = gtk_radio_tool_button_new_from_stock(list, RVAL2CSTR(stock_id));
-            }
-        }
+    if (rb_scan_args(argc, argv, "02", &group_or_stock_id, &rbstock_id) > 0) {
+        GSList *group = NULL;
+        const gchar *stock_id = TYPE(rbstock_id) == T_SYMBOL ?
+            rb_id2name(SYM2ID(rbstock_id)) :
+            RVAL2CSTR_ACCEPT_NIL(rbstock_id);
+
+        if (TYPE(group_or_stock_id) == T_ARRAY)
+            /* TODO: This has a potential for leaking. */
+            group = RVAL2GTKRADIOTOOLBUTTONGSLIST(group_or_stock_id);
+        else if (rb_obj_is_kind_of(group_or_stock_id, RG_TARGET_NAMESPACE))
+            group = gtk_radio_tool_button_get_group(_SELF(group_or_stock_id));
+
+        if (stock_id == NULL)
+            widget = gtk_radio_tool_button_new(group);
+        else
+            widget = gtk_radio_tool_button_new_from_stock(group, stock_id);
     } else {
         widget = gtk_radio_tool_button_new(NULL);
     }
-    
+
     RBGTK_INITIALIZE(self, widget);
+
     return Qnil;
 }
 
@@ -61,32 +110,29 @@ rbtn_get_group(VALUE self)
 }
 
 static VALUE
-rbtn_set_group(VALUE self, VALUE group)
+rbtn_set_group(VALUE self, VALUE rbgroup)
 {
-    GSList* list = NULL;
-    if (TYPE(group) == T_ARRAY){
-        int i;
-        for (i = 0; i < RARRAY_LEN(group); i++){
-            list = g_slist_append(list, RVAL2GOBJ(RARRAY_PTR(group)[i]));
-        }
-    } else {
-        list = gtk_radio_tool_button_get_group(_SELF(group));
-    }
-    gtk_radio_tool_button_set_group(_SELF(self), list);
-        
+    GtkRadioToolButton *button = _SELF(self);
+    GSList *group = TYPE(rbgroup) == T_ARRAY ?
+        /* TODO: This might leak. */
+        RVAL2GTKRADIOTOOLBUTTONGSLIST(rbgroup) :
+        gtk_radio_tool_button_get_group(_SELF(rbgroup));
+
+    gtk_radio_tool_button_set_group(button, group);
+
     return self;
 }
 
 #endif
 
 void 
-Init_gtk_radiotoolbutton()
+Init_gtk_radiotoolbutton(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    gRToolButton = G_DEF_CLASS(GTK_TYPE_RADIO_TOOL_BUTTON, "RadioToolButton", mGtk);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RADIO_TOOL_BUTTON, "RadioToolButton", mGtk);
 
-    rb_define_method(gRToolButton, "initialize", rbtn_initialize, -1);
-    G_REPLACE_GET_PROPERTY(gRToolButton, "group", rbtn_get_group, 0);
-    G_REPLACE_SET_PROPERTY(gRToolButton, "group", rbtn_set_group, 1);
+    RG_DEF_METHOD(initialize, -1);
+    G_REPLACE_GET_PROPERTY(RG_TARGET_NAMESPACE, "group", rbtn_get_group, 0);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "group", rbtn_set_group, 1);
 #endif
 }

data/ext/gtk2/rbgtkrange.c

@@ -1,93 +1,73 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrange.c -
-
-  $Author: ktou $
-  $Date: 2006/11/13 12:53:21 $
-
-  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2006 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 cRange
 #define _SELF(self) (GTK_RANGE(RVAL2GOBJ(self)))
 
-/* Defined as Properties 
-GtkAdjustment* gtk_range_get_adjustment     (GtkRange *range);
-void        gtk_range_set_adjustment        (GtkRange *range,
-                                             GtkAdjustment *adjustment);
-void        gtk_range_set_update_policy     (GtkRange *range,
-                                             GtkUpdateType policy);
-GtkUpdateType gtk_range_get_update_policy   (GtkRange *range);
-gboolean    gtk_range_get_inverted          (GtkRange *range);
-void        gtk_range_set_inverted          (GtkRange *range,
-                                             gboolean setting);
-void        gtk_range_set_upper_stepper_sensitivity
-                                            (GtkRange *range,
-                                             GtkSensitivityType sensitivity);
-GtkSensitivityType gtk_range_get_upper_stepper_sensitivity
-                                            (GtkRange *range);
-void        gtk_range_set_lower_stepper_sensitivity
-                                            (GtkRange *range,
-                                             GtkSensitivityType sensitivity);
-GtkSensitivityType gtk_range_get_lower_stepper_sensitivity
-                                            (GtkRange *range);
-void               gtk_range_set_show_fill_level           (GtkRange      *range,
-                                                            gboolean       show_fill_level);
-gboolean           gtk_range_get_show_fill_level           (GtkRange      *range);
-void               gtk_range_set_restrict_to_fill_level    (GtkRange      *range,
-                                                            gboolean       restrict_to_fill_level);
-gboolean           gtk_range_get_restrict_to_fill_level    (GtkRange      *range);
-void               gtk_range_set_fill_level                (GtkRange      *range,
-                                                            gdouble        fill_level);
-gdouble            gtk_range_get_fill_level                (GtkRange      *range);
-*/
-
 static VALUE
-range_get_value(VALUE self)
+rg_value(VALUE self)
 {
     return rb_float_new(gtk_range_get_value(_SELF(self)));
 }
 
 static VALUE
-range_set_increments(VALUE self, VALUE step, VALUE page)
+rg_set_increments(VALUE self, VALUE step, VALUE page)
 {
     gtk_range_set_increments(_SELF(self), NUM2DBL(step), NUM2DBL(page));
     return self;
 }
 
 static VALUE
-range_set_range(VALUE self, VALUE min, VALUE max)
+rg_set_range(VALUE self, VALUE min, VALUE max)
 {
     gtk_range_set_range(_SELF(self), NUM2DBL(min), NUM2DBL(max));
     return self;
 }
 
 static VALUE
-range_set_value(VALUE self, VALUE value)
+rg_set_value(VALUE self, VALUE value)
 {
     gtk_range_set_value(_SELF(self), NUM2DBL(value));
     return self;
 }
 
 void 
-Init_gtk_range()
+Init_gtk_range(VALUE mGtk)
 {
-  VALUE gRange = G_DEF_CLASS(GTK_TYPE_RANGE, "Range", mGtk);
+  VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RANGE, "Range", mGtk);
 
-  rb_define_method(gRange, "value", range_get_value, 0);
-  rb_define_method(gRange, "set_increments", range_set_increments, 2);
-  rb_define_method(gRange, "set_range", range_set_range, 2);
-  rb_define_method(gRange, "set_value", range_set_value, 1);
-  G_DEF_SETTER(gRange, "value");
+  RG_DEF_METHOD(value, 0);
+  RG_DEF_METHOD(set_increments, 2);
+  RG_DEF_METHOD(set_range, 2);
+  RG_DEF_METHOD(set_value, 1);
+  G_DEF_SETTER(RG_TARGET_NAMESPACE, "value");
 
 #if GTK_CHECK_VERSION(2,10,0)
   /* GtkSensitivityType */
-  G_DEF_CLASS(GTK_TYPE_SENSITIVITY_TYPE, "SensitivityType", gRange);
-  G_DEF_CONSTANTS(gRange, GTK_TYPE_SENSITIVITY_TYPE, "GTK_");
+  G_DEF_CLASS(GTK_TYPE_SENSITIVITY_TYPE, "SensitivityType", RG_TARGET_NAMESPACE);
+  G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_SENSITIVITY_TYPE, "GTK_");
 #endif
 }