gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkcolorbutton.c

@@ -1,20 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcolorbutton.c -
-
-  $Author: mutoh $
-  $Date: 2004/05/30 16:41:13 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 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 "global.h"
-                                                                                
+
 #if GTK_CHECK_VERSION(2,4,0)
 
+#define RG_TARGET_NAMESPACE cColorButton
+
 static VALUE
-colorbutton_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE color;
     GtkWidget* widget;
@@ -31,30 +43,13 @@ colorbutton_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/* Defined as property.
-void        gtk_color_button_set_color      (GtkColorButton *color_button,
-                                             const GdkColor *color);
-void        gtk_color_button_get_color      (GtkColorButton *color_button,
-                                             GdkColor *color);
-void        gtk_color_button_set_alpha      (GtkColorButton *color_button,
-                                             guint16 alpha);
-guint16     gtk_color_button_get_alpha      (GtkColorButton *color_button);
-void        gtk_color_button_set_use_alpha  (GtkColorButton *color_button,
-                                             gboolean use_alpha);
-gboolean    gtk_color_button_get_use_alpha  (GtkColorButton *color_button);
-void        gtk_color_button_set_title      (GtkColorButton *color_button,
-                                             const gchar *title);
-G_CONST_RETURN gchar* gtk_color_button_get_title
-                                            (GtkColorButton *color_button);
-*/
-
 #endif
 
 void 
-Init_gtk_colorbutton()
+Init_gtk_colorbutton(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gColorbutton = G_DEF_CLASS(GTK_TYPE_COLOR_BUTTON, "ColorButton", mGtk);
-    rb_define_method(gColorbutton, "initialize", colorbutton_initialize, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COLOR_BUTTON, "ColorButton", mGtk);
+    RG_DEF_METHOD(initialize, -1);
 #endif
 }

data/ext/gtk2/rbgtkcolorsel.c

@@ -1,52 +1,63 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcolorsel.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:09 $
-
-  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 cColorSelection
 #define _SELF(s) (GTK_COLOR_SELECTION(RVAL2GOBJ(self)))
 
-static VALUE gColorSel;
+static VALUE RG_TARGET_NAMESPACE;
 
 static VALUE
-colorsel_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_color_selection_new());
     return Qnil;
 }
 
 static VALUE
-colorsel_get_previous_alpha(VALUE self)
+rg_previous_alpha(VALUE self)
 {
     return INT2NUM(gtk_color_selection_get_previous_alpha(_SELF(self)));
 }
 
 static VALUE
-colorsel_set_previous_alpha(VALUE self, VALUE alpha)
+rg_set_previous_alpha(VALUE self, VALUE alpha)
 {
     gtk_color_selection_set_previous_alpha(_SELF(self), NUM2INT(alpha));
     return self;
 }
 
 static VALUE
-colorsel_set_previous_color(VALUE self, VALUE color)
+rg_set_previous_color(VALUE self, VALUE color)
 {
     gtk_color_selection_set_previous_color(_SELF(self), RVAL2GDKCOLOR(color));
     return self;
 }
 
 static VALUE
-colorsel_get_previous_color(VALUE self)
+rg_previous_color(VALUE self)
 {
     GdkColor color;
     gtk_color_selection_get_previous_color(_SELF(self), &color);
@@ -54,53 +65,96 @@ colorsel_get_previous_color(VALUE self)
 }
 
 static VALUE
-colorsel_is_adjusting(VALUE self)
+rg_adjusting_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_color_selection_is_adjusting(_SELF(self)));
 }
 
 static VALUE
-colorsel_s_palette_from_string(VALUE self, VALUE str)
+rg_s_palette_from_string(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     GdkColor* gcolors;
     gint i, n_colors;
     VALUE ary = Qnil;
     gboolean ret = gtk_color_selection_palette_from_string(RVAL2CSTR(str), 
                                                            &gcolors, &n_colors);
-    
+
     if (ret) {
         ary = rb_ary_new();
         for (i = 0; i < n_colors; i++) {
             rb_ary_push(ary, GDKCOLOR2RVAL(&gcolors[i]));
         }
     }
-                                                                                
+
     return ary;
 }
 
+struct rbgdk_rval2gdkcolors_args {
+    VALUE ary;
+    long n;
+    GdkColor *result;
+};
+
 static VALUE
-colorsel_s_palette_to_string(int argc, VALUE *argv, VALUE self)
+rbgdk_rval2gdkcolors_body(VALUE value)
 {
-    GdkColor* gcolors;
-    GdkColor* gcolor;
-    VALUE colors;
-    gint i, len;
-
-    if (argc > 1) {
-        rb_scan_args(argc, argv, "*", &colors);
-    } else {
-        rb_scan_args(argc, argv, "10", &colors);
-    }
+    long i;
+    struct rbgdk_rval2gdkcolors_args *args = (struct rbgdk_rval2gdkcolors_args *)value;
 
-    len = RARRAY_LEN(colors);
-    gcolors = ALLOCA_N(GdkColor, len);
+    for (i = 0; i < args->n; i++)
+        args->result[i] = *RVAL2GDKCOLOR(RARRAY_PTR(args->ary)[i]);
 
-    for (i = 0; i < len; i++) {
-        gcolor = RVAL2GDKCOLOR(RARRAY_PTR(colors)[i]);
-        gcolors[i] = *gcolor;
-    }
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgdk_rval2gdkcolors_rescue(VALUE value)
+{
+    g_free(((struct rbgdk_rval2gdkcolors_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GdkColor *
+rbgdk_rval2gdkcolors(VALUE value, long *n)
+{
+    struct rbgdk_rval2gdkcolors_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new(GdkColor, args.n + 1);
+
+    rb_rescue(rbgdk_rval2gdkcolors_body, (VALUE)&args,
+              rbgdk_rval2gdkcolors_rescue, (VALUE)&args);
+
+    if (n != NULL)
+        *n = args.n;
+
+    return args.result;
+}
+
+#define RVAL2GDKCOLORS(value, n) rbgdk_rval2gdkcolors(value, n)
+
+static VALUE
+rg_s_palette_to_string(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+{
+    VALUE rbcolors;
+    long n;
+    GdkColor *colors;
+    gchar *palette;
+
+    if (argc > 1)
+        rb_scan_args(argc, argv, "*", &rbcolors);
+    else
+        rb_scan_args(argc, argv, "10", &rbcolors);
+
+    colors = RVAL2GDKCOLORS(rbcolors, &n);
+
+    palette = gtk_color_selection_palette_to_string(colors, n);
+
+    g_free(colors);
 
-    return CSTR2RVAL(gtk_color_selection_palette_to_string((const GdkColor*)gcolors, len));
+    return CSTR2RVAL_FREE(palette);
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
@@ -108,7 +162,7 @@ static void
 screen_func(GdkScreen *screen, const GdkColor *colors, gint n_colors)
 {
     int i;
-    VALUE func = rb_cvar_get(gColorSel, rb_intern("__palette_proc__"));
+    VALUE func = rb_cvar_get(RG_TARGET_NAMESPACE, rb_intern("__palette_proc__"));
     VALUE ary = rb_ary_new();
     for (i = 0; i < n_colors; i++){
         ary = rb_ary_push(ary, GDKCOLOR2RVAL((GdkColor *)&colors[i]));
@@ -118,11 +172,11 @@ screen_func(GdkScreen *screen, const GdkColor *colors, gint n_colors)
 }
 
 static VALUE
-colorsel_s_set_change_palette_hook(VALUE self)
+rg_s_set_change_palette_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
 
-    rb_cv_set(gColorSel, "__palette_proc__", func);
+    rb_cv_set(RG_TARGET_NAMESPACE, "__palette_proc__", func);
     gtk_color_selection_set_change_palette_with_screen_hook(
         (GtkColorSelectionChangePaletteWithScreenFunc)screen_func);
     return self;
@@ -139,23 +193,23 @@ void        (*GtkColorSelectionChangePaletteWithScreenFunc)
 */
 
 void 
-Init_gtk_color_selection()
+Init_gtk_color_selection(VALUE mGtk)
 {
-    gColorSel = G_DEF_CLASS(GTK_TYPE_COLOR_SELECTION, "ColorSelection", mGtk);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COLOR_SELECTION, "ColorSelection", mGtk);
 
-    rb_define_method(gColorSel, "initialize", colorsel_initialize, 0);
-    rb_define_method(gColorSel, "previous_alpha", colorsel_get_previous_alpha, 0);
-    rb_define_method(gColorSel, "set_previous_alpha", colorsel_set_previous_alpha, 1);
-    rb_define_method(gColorSel, "set_previous_color", colorsel_set_previous_color, 1);
-    rb_define_method(gColorSel, "previous_color", colorsel_get_previous_color, 0);
-    rb_define_method(gColorSel, "adjusting?", colorsel_is_adjusting, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(previous_alpha, 0);
+    RG_DEF_METHOD(set_previous_alpha, 1);
+    RG_DEF_METHOD(set_previous_color, 1);
+    RG_DEF_METHOD(previous_color, 0);
+    RG_DEF_METHOD_P(adjusting, 0);
 
-    rb_define_singleton_method(gColorSel, "palette_to_string", colorsel_s_palette_to_string, -1);
-    rb_define_singleton_method(gColorSel, "palette_from_string", colorsel_s_palette_from_string, 1);
+    RG_DEF_SMETHOD(palette_to_string, -1);
+    RG_DEF_SMETHOD(palette_from_string, 1);
 
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_singleton_method(gColorSel, "set_change_palette_hook", colorsel_s_set_change_palette_hook, 0);
+    RG_DEF_SMETHOD(set_change_palette_hook, 0);
 #endif
 
-    G_DEF_SETTERS(gColorSel);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkcolorselectiondialog.c

@@ -1,25 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *  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
+ */
 
-  rbgtkcolorselectiondialog.c -
-
-  $Author: mutoh $
-  $Date: 2003/01/19 14:28:24 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  This file is devided from rbgtkcolorsel.c.
-  rbgtkcolorsel.c:
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cColorSelectionDialog
 #define _SELF(s) (GTK_COLOR_SELECTION_DIALOG(RVAL2GOBJ(s)))
 
 static VALUE
-cdialog_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE title;
     rb_scan_args(argc, argv, "01", &title);
@@ -28,12 +37,12 @@ cdialog_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 void 
-Init_gtk_color_selection_dialog()
+Init_gtk_color_selection_dialog(VALUE mGtk)
 {
-    VALUE gColorSelDialog = G_DEF_CLASS(GTK_TYPE_COLOR_SELECTION_DIALOG, 
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COLOR_SELECTION_DIALOG, 
                                         "ColorSelectionDialog", mGtk);
 
-    rb_define_method(gColorSelDialog, "initialize", cdialog_initialize, -1);
+    RG_DEF_METHOD(initialize, -1);
     /* NOTE: Backward compatibility */
-    rb_define_alias(gColorSelDialog, "colorsel", "color_selection");
+    RG_DEF_ALIAS("colorsel", "color_selection");
 }

data/ext/gtk2/rbgtkcombo.c

@@ -1,23 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcombo.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  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"
 
 #ifndef GTK_DISABLE_DEPRECATED /* Since 2.4 */
 
+#define RG_TARGET_NAMESPACE cCombo
+
 static VALUE
-combo_set_popdown_strings(VALUE self, VALUE ary)
+rg_set_popdown_strings(VALUE self, VALUE ary)
 {
     int i;
     GList *glist = NULL;
@@ -32,7 +44,7 @@ combo_set_popdown_strings(VALUE self, VALUE ary)
 }
 
 static VALUE
-combo_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE ary;
     GtkWidget* widget = NULL; 
@@ -43,7 +55,7 @@ combo_initialize(int argc, VALUE *argv, VALUE self)
     RBGTK_INITIALIZE(self, widget);
 
     if (! NIL_P(ary)){
-        combo_set_popdown_strings(self, ary);
+        rg_set_popdown_strings(self, ary);
     }
 
     return Qnil;
@@ -53,20 +65,20 @@ static VALUE
 combo_set_val_in_list(VALUE self, VALUE val, VALUE ok)
 {
     gtk_combo_set_value_in_list(GTK_COMBO(RVAL2GOBJ(self)),
-				RVAL2CBOOL(val), RVAL2CBOOL(ok));
+                                RVAL2CBOOL(val), RVAL2CBOOL(ok));
     return self;
 }
 
 static VALUE
-combo_set_use_arrows(VALUE self, VALUE val)
+rg_set_use_arrows(VALUE self, VALUE val)
 {
     gtk_combo_set_use_arrows(GTK_COMBO(RVAL2GOBJ(self)),
-			     RVAL2CBOOL(val));
+                             RVAL2CBOOL(val));
     return self;
 }
 
 static VALUE
-combo_set_use_arrows_always(VALUE self, VALUE val)
+rg_set_use_arrows_always(VALUE self, VALUE val)
 {
     gtk_combo_set_use_arrows_always(GTK_COMBO(RVAL2GOBJ(self)),
                                     RVAL2CBOOL(val));
@@ -74,35 +86,34 @@ combo_set_use_arrows_always(VALUE self, VALUE val)
 }
 
 static VALUE
-combo_disable_activate(VALUE self)
+rg_disable_activate(VALUE self)
 {
     gtk_combo_disable_activate(GTK_COMBO(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-combo_entry(VALUE self)
+rg_entry(VALUE self)
 {
     return GOBJ2RVAL(GTK_COMBO(RVAL2GOBJ(self))->entry);
 }
 #endif
 
 void 
-Init_gtk_combo()
+Init_gtk_combo(VALUE mGtk)
 {
 #ifndef GTK_DISABLE_DEPRECATED  /* Since 2.4 */
-    VALUE gCombo = G_DEF_CLASS(GTK_TYPE_COMBO, "Combo", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COMBO, "Combo", mGtk);
 
-    rb_define_method(gCombo, "initialize", combo_initialize, -1);
-    G_REPLACE_SET_PROPERTY(gCombo, "value_in_list", combo_set_val_in_list, 2);
-    rb_define_method(gCombo, "set_use_arrows", combo_set_use_arrows, 1);
-    rb_define_method(gCombo, "set_use_arrows_always", combo_set_use_arrows_always, 1);
-    rb_define_method(gCombo, "set_popdown_strings", combo_set_popdown_strings, 1);
-    rb_define_method(gCombo, "disable_activate", combo_disable_activate, 0);
+    RG_DEF_METHOD(initialize, -1);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "value_in_list", combo_set_val_in_list, 2);
+    RG_DEF_METHOD(set_use_arrows, 1);
+    RG_DEF_METHOD(set_use_arrows_always, 1);
+    RG_DEF_METHOD(set_popdown_strings, 1);
+    RG_DEF_METHOD(disable_activate, 0);
 
-    rb_define_method(gCombo, "entry", combo_entry, 0);
+    RG_DEF_METHOD(entry, 0);
 
-    G_DEF_SETTERS(gCombo);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }
-