gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkimagemenuitem.c

@@ -1,18 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkimagemenuitem.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  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
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cImageMenuItem
+
 static VALUE
-imitem_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline_or_accel_group;
     GtkWidget *widget = NULL;
@@ -33,7 +45,7 @@ imitem_initialize(int argc, VALUE *argv, VALUE self)
                      rb_class2name(CLASS_OF(label)));
         }
     } else {
-	widget = gtk_image_menu_item_new();
+        widget = gtk_image_menu_item_new();
     }
 
     RBGTK_INITIALIZE(self, widget);
@@ -41,9 +53,9 @@ imitem_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 void 
-Init_gtk_image_menu_item()
+Init_gtk_image_menu_item(VALUE mGtk)
 {
-    VALUE gIMenuItem = G_DEF_CLASS(GTK_TYPE_IMAGE_MENU_ITEM, "ImageMenuItem", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_IMAGE_MENU_ITEM, "ImageMenuItem", mGtk);
 
-    rb_define_method(gIMenuItem, "initialize", imitem_initialize, -1);
+    RG_DEF_METHOD(initialize, -1);
 }

data/ext/gtk2/rbgtkimcontext.c

@@ -1,26 +1,38 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 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
+ */
 
-  rbgtkimcontext.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cIMContext
 #define _SELF(self) (GTK_IM_CONTEXT(RVAL2GOBJ(self)))
 
 static VALUE 
-imcontext_set_client_window(VALUE self, VALUE gdkwindow)
+rg_set_client_window(VALUE self, VALUE gdkwindow)
 {
     gtk_im_context_set_client_window(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)));
     return self;
 }
 
 static VALUE
-imcontext_get_preedit_string(VALUE self)
+rg_preedit_string(VALUE self)
 {
     gchar* str;
     PangoAttrList* attrs;
@@ -32,34 +44,34 @@ imcontext_get_preedit_string(VALUE self)
 }
 
 static VALUE
-imcontext_filter_keypress(VALUE self, VALUE event)
+rg_filter_keypress(VALUE self, VALUE event)
 {
     return CBOOL2RVAL(gtk_im_context_filter_keypress(_SELF(self), (GdkEventKey*)RVAL2GEV(event)));
 }
 
 static VALUE
-imcontext_focus_in(VALUE self)
+rg_focus_in(VALUE self)
 {
     gtk_im_context_focus_in(_SELF(self));
     return self;
 }
 
 static VALUE
-imcontext_focus_out(VALUE self)
+rg_focus_out(VALUE self)
 {
     gtk_im_context_focus_out(_SELF(self));
     return self;
 }
 
 static VALUE
-imcontext_reset(VALUE self)
+rg_reset(VALUE self)
 {
     gtk_im_context_reset(_SELF(self));
     return self;
 }
 
 static VALUE
-imcontext_set_cursor_location(VALUE self, VALUE area)
+rg_set_cursor_location(VALUE self, VALUE area)
 {
     gtk_im_context_set_cursor_location(
         _SELF(self), 
@@ -68,14 +80,14 @@ imcontext_set_cursor_location(VALUE self, VALUE area)
 }
 
 static VALUE
-imcontext_set_use_preedit(VALUE self, VALUE use_preedit)
+rg_set_use_preedit(VALUE self, VALUE use_preedit)
 {
     gtk_im_context_set_use_preedit(_SELF(self), RVAL2CBOOL(use_preedit));
     return self;
 }
 
 static VALUE
-imcontext_set_surrounding(VALUE self, VALUE text, VALUE cursor_index)
+rg_set_surrounding(VALUE self, VALUE text, VALUE cursor_index)
 {
     StringValue(text);
     gtk_im_context_set_surrounding(_SELF(self),
@@ -85,7 +97,7 @@ imcontext_set_surrounding(VALUE self, VALUE text, VALUE cursor_index)
 }
 
 static VALUE
-imcontext_get_surrounding(VALUE self)
+rg_surrounding(VALUE self)
 {
     gchar* text;
     gint cursor_index;
@@ -95,29 +107,29 @@ imcontext_get_surrounding(VALUE self)
 }
 
 static VALUE
-imcontext_delete_surrounding(VALUE self, VALUE offset, VALUE n_chars)
+rg_delete_surrounding(VALUE self, VALUE offset, VALUE n_chars)
 {
     return CBOOL2RVAL(gtk_im_context_delete_surrounding(_SELF(self), NUM2INT(offset),
                                                         NUM2INT(n_chars)));
 }
 
 void 
-Init_gtk_imcontext()
+Init_gtk_imcontext(VALUE mGtk)
 {
-    VALUE gIMContext = G_DEF_CLASS(GTK_TYPE_IM_CONTEXT, "IMContext", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_IM_CONTEXT, "IMContext", mGtk);
 
-    rb_define_method(gIMContext, "set_client_window", imcontext_set_client_window, 1);
-    rb_define_method(gIMContext, "preedit_string", imcontext_get_preedit_string, 0);
+    RG_DEF_METHOD(set_client_window, 1);
+    RG_DEF_METHOD(preedit_string, 0);
     /* Is it better to name as "filter_keypress?" ?*/
-    rb_define_method(gIMContext, "filter_keypress", imcontext_filter_keypress, 1);
-    rb_define_method(gIMContext, "focus_in", imcontext_focus_in, 0);
-    rb_define_method(gIMContext, "focus_out", imcontext_focus_out, 0);
-    rb_define_method(gIMContext, "reset", imcontext_reset, 0);
-    rb_define_method(gIMContext, "set_cursor_location", imcontext_set_cursor_location, 1);
-    rb_define_method(gIMContext, "set_use_preedit", imcontext_set_use_preedit, 1);
-    rb_define_method(gIMContext, "set_surrounding", imcontext_set_surrounding, 2);
-    rb_define_method(gIMContext, "surrounding", imcontext_get_surrounding, 0);
-    rb_define_method(gIMContext, "delete_surrounding", imcontext_delete_surrounding, 2);
-
-    G_DEF_SETTERS(gIMContext);
+    RG_DEF_METHOD(filter_keypress, 1);
+    RG_DEF_METHOD(focus_in, 0);
+    RG_DEF_METHOD(focus_out, 0);
+    RG_DEF_METHOD(reset, 0);
+    RG_DEF_METHOD(set_cursor_location, 1);
+    RG_DEF_METHOD(set_use_preedit, 1);
+    RG_DEF_METHOD(set_surrounding, 2);
+    RG_DEF_METHOD(surrounding, 0);
+    RG_DEF_METHOD(delete_surrounding, 2);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkimcontextsimple.c

@@ -1,46 +1,69 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 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
+ */
 
-  rbgtkimcontextsimple.c -
-
-  $Author: mutoh $
-  $Date: 2003/05/05 16:58:55 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cIMContextSimple
 #define _SELF(self) (GTK_IM_CONTEXT_SIMPLE(RVAL2GOBJ(self)))
 
 static VALUE 
-imcsimple_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_im_context_simple_new());
+
     return Qnil;
 }
 
+/* TODO: Why are we taking a third argument?  Shouldn't it be determined by the
+ * length of rbdata? */
 static VALUE
-imcsimple_add_table(VALUE self, VALUE data, VALUE max_seq_len, VALUE n_seqs)
+rg_add_table(VALUE self, VALUE rbdata, VALUE rbmax_seq_len, VALUE rbn_seqs)
 {
-    int i;
-    guint16* gdata = ALLOCA_N(guint16, RARRAY_LEN(data));
-    
-    for (i = 0; i < RARRAY_LEN(data); i++) {
-        gdata[i] = NUM2INT(RARRAY_PTR(data)[i]);
-    }
-    
-    gtk_im_context_simple_add_table(_SELF(self), gdata,
-                                    NUM2INT(max_seq_len), NUM2INT(n_seqs));
+    GtkIMContextSimple *context_simple = _SELF(self);
+    gint max_seq_len = NUM2INT(rbmax_seq_len);
+    gint n_seqs = NUM2INT(rbn_seqs);
+    long n;
+    guint16 *data;
+
+    if (max_seq_len > GTK_MAX_COMPOSE_LEN)
+        rb_raise(rb_eArgError,
+                 "max_seq_len cannot be greater than GTK_MAX_COMPOSE_LEN: %d > %d",
+                 max_seq_len, GTK_MAX_COMPOSE_LEN);
+
+    data = RVAL2GUINT16S(rbdata, n);
+
+    gtk_im_context_simple_add_table(context_simple, data, max_seq_len, n_seqs);
+
+    g_free(data);
+
     return self;
 }
 
 void 
-Init_gtk_imcontext_simple()
+Init_gtk_imcontext_simple(VALUE mGtk)
 {
-    VALUE gIMContextS = G_DEF_CLASS(GTK_TYPE_IM_CONTEXT_SIMPLE, "IMContextSimple", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_IM_CONTEXT_SIMPLE, "IMContextSimple", mGtk);
 
-    rb_define_method(gIMContextS, "initialize", imcsimple_initialize, 0);
-    rb_define_method(gIMContextS, "add_table", imcsimple_add_table, 3);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(add_table, 3);
 
-    rb_define_const(gIMContextS, "MAX_COMPOSE_LEN", GTK_MAX_COMPOSE_LEN);
+    rb_define_const(RG_TARGET_NAMESPACE, "MAX_COMPOSE_LEN", GTK_MAX_COMPOSE_LEN);
 }

data/ext/gtk2/rbgtkimmulticontext.c

@@ -1,36 +1,48 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 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
+ */
 
-  rbgtkimmulticontext.c -
-
-  $Author: mutoh $
-  $Date: 2003/05/05 16:58:55 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cIMMulticontext
 #define _SELF(self) (GTK_IM_MULTICONTEXT(RVAL2GOBJ(self)))
 
 static VALUE 
-immulti_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_im_multicontext_new());
     return Qnil;
 }
 
 static VALUE
-immulti_append_menuitems(VALUE self, VALUE menushell)
+rg_append_menuitems(VALUE self, VALUE menushell)
 {
     gtk_im_multicontext_append_menuitems(_SELF(self), RVAL2GOBJ(menushell));
     return self;
 }
 
 void 
-Init_gtk_im_multicontext()
+Init_gtk_im_multicontext(VALUE mGtk)
 {
-    VALUE gIMMContext = G_DEF_CLASS(GTK_TYPE_IM_MULTICONTEXT, "IMMulticontext", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_IM_MULTICONTEXT, "IMMulticontext", mGtk);
 
-    rb_define_method(gIMMContext, "initialize", immulti_initialize, 0);
-    rb_define_method(gIMMContext, "append_menuitems", immulti_append_menuitems, 1);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(append_menuitems, 1);
 }

data/ext/gtk2/rbgtkinputdialog.c

@@ -1,29 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkinputdialog.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:23 $
-
-  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 cInputDialog
+
 static VALUE
-idiag_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_input_dialog_new());
     return Qnil;
 }
 
 void 
-Init_gtk_input_dialog()
+Init_gtk_input_dialog(VALUE mGtk)
 {
-    VALUE gInputDialog = G_DEF_CLASS(GTK_TYPE_INPUT_DIALOG, "InputDialog", mGtk);
-    rb_define_method(gInputDialog, "initialize", idiag_initialize, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_INPUT_DIALOG, "InputDialog", mGtk);
+    RG_DEF_METHOD(initialize, 0);
 }

data/ext/gtk2/rbgtkinvisible.c

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 OGASAWARA, Takeshi
+ *
+ *  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
+ */
 
-  rbgtkinvisible.c -
-
-  $Author: sakai $
-  $Date: 2003/11/20 18:27:54 $
-
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cInvisible
 #define _SELF(s) GTK_INVISIBLE(RVAL2GOBJ(s))
 
 static VALUE
-invisible_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE screen;
 
@@ -32,16 +44,10 @@ invisible_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/* Defined as Properties
-void                gtk_invisible_set_screen            (GtkInvisible *invisible,
-                                                         GdkScreen *screen);
-GdkScreen *         gtk_invisible_get_screen            (GtkInvisible *invisible);
-*/
-
 void
-Init_invisible()
+Init_gtk_invisible(VALUE mGtk)
 {
-    VALUE gInvisible = G_DEF_CLASS(GTK_TYPE_INVISIBLE, "Invisible", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_INVISIBLE, "Invisible", mGtk);
 
-    rb_define_method(gInvisible, "initialize", invisible_initialize, -1);
+    RG_DEF_METHOD(initialize, -1);
 }