gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgdkinput.c

@@ -1,31 +1,40 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkinput.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:50 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  This file is devided from rbgtkmain.c.
-  rbgtkmain.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  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
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE mInput
+
 static void
-exec_input(gpointer data, gint source, GdkInputCondition condition)
+exec_input(gpointer data, G_GNUC_UNUSED gint source, GdkInputCondition condition)
 {
     rb_funcall((VALUE)data, id_call, 1, 
                GFLAGS2RVAL(condition, GDK_TYPE_INPUT_CONDITION));
 }
 
 static VALUE
-input_add(VALUE self, VALUE filedescriptor, VALUE gdk_input_condition)
+rg_m_add(VALUE self, VALUE filedescriptor, VALUE gdk_input_condition)
 {
     VALUE id;
     VALUE func;
@@ -41,25 +50,23 @@ input_add(VALUE self, VALUE filedescriptor, VALUE gdk_input_condition)
 }
 
 static VALUE
-input_remove(VALUE self, VALUE id)
+rg_m_remove(VALUE self, VALUE id)
 {
     gdk_input_remove(NUM2INT(id));
     G_REMOVE_RELATIVE(self, id_relative_callbacks, id);
     return id;
 }
 
-
 void
-Init_gtk_gdk_input()
+Init_gtk_gdk_input(VALUE mGdk)
 {
-    VALUE mGdkInput = rb_define_module_under(mGdk, "Input");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGdk, "Input");
 
-    rb_define_module_function(mGdkInput, "add", input_add, 2);
-    rb_define_module_function(mGdkInput, "remove", input_remove, 1);
+    RG_DEF_MODFUNC(add, 2);
+    RG_DEF_MODFUNC(remove, 1);
 
     /* GdkInputCondition */
-    G_DEF_CLASS(GDK_TYPE_INPUT_CONDITION, "Condition", mGdkInput);
-    G_DEF_CONSTANTS(mGdkInput, GDK_TYPE_INPUT_CONDITION, "GDK_INPUT_");
+    G_DEF_CLASS(GDK_TYPE_INPUT_CONDITION, "Condition", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_INPUT_CONDITION, "GDK_INPUT_");
 
 }
-

data/ext/gtk2/rbgdkkeymap.c

@@ -1,31 +1,43 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003,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
+ */
 
-  rbgdkkeymap.c -
-
-  $Author: mutoh $
-  $Date: 2004/05/13 17:00:36 $
-
-  Copyright (C) 2003,2004 Masao Mutoh
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cKeymap
 #define _SELF(s) GDK_KEYMAP(RVAL2GOBJ(s))
 
 static VALUE
-gdkkeymap_s_get_default(VALUE self)
+rg_s_default(G_GNUC_UNUSED VALUE self)
 {
   return GOBJ2RVAL(gdk_keymap_get_default());
 }
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdkkeymap_s_get_for_display(VALUE self, VALUE display)
+rg_s_for_display(G_GNUC_UNUSED VALUE self, VALUE display)
 {
   return GOBJ2RVAL(gdk_keymap_get_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display))));
 }
 #endif
 static VALUE
-gdkkeymap_lookup_key(VALUE self, VALUE keycode, VALUE group, VALUE level)
+rg_lookup_key(VALUE self, VALUE keycode, VALUE group, VALUE level)
 {
   GdkKeymapKey key;
 
@@ -37,7 +49,7 @@ gdkkeymap_lookup_key(VALUE self, VALUE keycode, VALUE group, VALUE level)
 }
 
 static VALUE
-gdkkeymap_translate_keyboard_state(VALUE self, VALUE hardware_keycode, VALUE state, VALUE group)
+rg_translate_keyboard_state(VALUE self, VALUE hardware_keycode, VALUE state, VALUE group)
 {
   guint keyval;
   gint effective_group, level;
@@ -56,7 +68,7 @@ gdkkeymap_translate_keyboard_state(VALUE self, VALUE hardware_keycode, VALUE sta
 }
 
 static VALUE
-gdkkeymap_get_entries_for_keyval(VALUE self, VALUE keyval)
+rg_get_entries_for_keyval(VALUE self, VALUE keyval)
 {
   GdkKeymapKey* keys;
   gint n_keys;
@@ -81,7 +93,7 @@ gdkkeymap_get_entries_for_keyval(VALUE self, VALUE keyval)
 }
 
 static VALUE
-gdkkeymap_get_entries_for_keycode(VALUE self, VALUE hardware_keycode)
+rg_get_entries_for_keycode(VALUE self, VALUE hardware_keycode)
 {
   GdkKeymapKey* keys;
   guint* keyvals;
@@ -107,36 +119,35 @@ gdkkeymap_get_entries_for_keycode(VALUE self, VALUE hardware_keycode)
 }
 
 static VALUE
-gdkkeymap_get_direction(VALUE self)
+rg_direction(VALUE self)
 {
   return GENUM2RVAL(gdk_keymap_get_direction(_SELF(self)), PANGO_TYPE_DIRECTION);
 }
 
 #if GTK_CHECK_VERSION(2, 12, 0)
 static VALUE
-gdkkeymap_have_bidi_layouts(VALUE self)
+rg_have_bidi_layouts_p(VALUE self)
 {
     return CBOOL2RVAL(gdk_keymap_have_bidi_layouts(_SELF(self)));
 }
 #endif
 
 void 
-Init_gtk_gdk_keymap()
+Init_gtk_gdk_keymap(VALUE mGdk)
 {
-    VALUE gdkKeymap = G_DEF_CLASS(GDK_TYPE_KEYMAP, "Keymap", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_KEYMAP, "Keymap", mGdk);
 
-    rb_define_singleton_method(gdkKeymap, "default", gdkkeymap_s_get_default, 0);
+    RG_DEF_SMETHOD(default, 0);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_singleton_method(gdkKeymap, "for_display", gdkkeymap_s_get_for_display, 0);
+    RG_DEF_SMETHOD(for_display, 0);
 #endif
-    rb_define_method(gdkKeymap, "lookup_key", gdkkeymap_lookup_key, 3);
-    rb_define_method(gdkKeymap, "translate_keyboard_state", gdkkeymap_translate_keyboard_state, 3);
-    rb_define_method(gdkKeymap, "get_entries_for_keyval", gdkkeymap_get_entries_for_keyval, 1);
-    rb_define_method(gdkKeymap, "get_entries_for_keycode", gdkkeymap_get_entries_for_keycode, 1);
-    rb_define_method(gdkKeymap, "direction", gdkkeymap_get_direction, 0);
+    RG_DEF_METHOD(lookup_key, 3);
+    RG_DEF_METHOD(translate_keyboard_state, 3);
+    RG_DEF_METHOD(get_entries_for_keyval, 1);
+    RG_DEF_METHOD(get_entries_for_keycode, 1);
+    RG_DEF_METHOD(direction, 0);
 #if GTK_CHECK_VERSION(2, 12, 0)
-    rb_define_method(gdkKeymap, "have_bidi_layouts?",
-		     gdkkeymap_have_bidi_layouts, 0);
+    RG_DEF_METHOD_P(have_bidi_layouts, 0);
 #endif
 
 #ifdef GDK_WINDOWING_X11

data/ext/gtk2/rbgdkkeyval.c

@@ -1,47 +1,59 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkkeyval.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:08 $
-
-  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"
 #include <gdk/gdkkeysyms.h>
 
+#define RG_TARGET_NAMESPACE mGdkKeyval
+
 static VALUE
-keyval_to_name(VALUE self, VALUE keyval)
+rg_m_to_name(G_GNUC_UNUSED VALUE self, VALUE keyval)
 {
     gchar* name = gdk_keyval_name(NUM2UINT(keyval));
     return name ? CSTR2RVAL(name) : Qnil;
 }
 
 static VALUE
-keyval_from_name(VALUE self, VALUE keyval_name)
+rg_m_from_name(G_GNUC_UNUSED VALUE self, VALUE keyval_name)
 {
     return UINT2NUM(gdk_keyval_from_name(RVAL2CSTR(keyval_name)));
 }
 
 static VALUE
-keyval_is_upper(VALUE self, VALUE keyval)
+rg_m_upper_p(G_GNUC_UNUSED VALUE self, VALUE keyval)
 {
     return CBOOL2RVAL(gdk_keyval_is_upper(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_is_lower(VALUE self, VALUE keyval)
+rg_m_lower_p(G_GNUC_UNUSED VALUE self, VALUE keyval)
 {
     return CBOOL2RVAL(gdk_keyval_is_lower(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_convert_case(VALUE self, VALUE symbol)
+rg_m_convert_case(G_GNUC_UNUSED VALUE self, VALUE symbol)
 {
     guint upper, lower;
     gdk_keyval_convert_case(NUM2UINT(symbol), &lower, &upper);
@@ -49,25 +61,25 @@ keyval_convert_case(VALUE self, VALUE symbol)
 }
 
 static VALUE
-keyval_to_upper(VALUE self, VALUE keyval)
+rg_m_to_upper(G_GNUC_UNUSED VALUE self, VALUE keyval)
 {
     return INT2NUM(gdk_keyval_to_upper(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_to_lower(VALUE self, VALUE keyval)
+rg_m_to_lower(G_GNUC_UNUSED VALUE self, VALUE keyval)
 {
     return INT2NUM(gdk_keyval_to_lower(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_to_unicode(VALUE self, VALUE keyval)
+rg_m_to_unicode(G_GNUC_UNUSED VALUE self, VALUE keyval)
 {
     return UINT2NUM(gdk_keyval_to_unicode(NUM2UINT(keyval)));
 }
 
 static VALUE
-unicode_to_keyval(VALUE self, VALUE wc)
+rg_m_from_unicode(G_GNUC_UNUSED VALUE self, VALUE wc)
 {
     VALUE unicode;
     if (TYPE(wc) == T_STRING) {
@@ -79,18 +91,18 @@ unicode_to_keyval(VALUE self, VALUE wc)
 }
 
 void
-Init_gtk_gdk_keyval()
+Init_gtk_gdk_keyval(VALUE mGdk)
 {
-    VALUE mGdkKeyval = rb_define_module_under(mGdk, "Keyval");
-    rb_define_module_function(mGdkKeyval, "to_name", keyval_to_name, 1);
-    rb_define_module_function(mGdkKeyval, "from_name", keyval_from_name, 1);
-    rb_define_module_function(mGdkKeyval, "upper?", keyval_is_upper, 1);
-    rb_define_module_function(mGdkKeyval, "lower?", keyval_is_lower, 1);
-    rb_define_module_function(mGdkKeyval, "convert_case", keyval_convert_case, 1);
-    rb_define_module_function(mGdkKeyval, "to_upper", keyval_to_upper, 1);
-    rb_define_module_function(mGdkKeyval, "to_lower", keyval_to_lower, 1);
-    rb_define_module_function(mGdkKeyval, "to_unicode", keyval_to_unicode, 1);
-    rb_define_module_function(mGdkKeyval, "from_unicode", unicode_to_keyval, 1);
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGdk, "Keyval");
+    RG_DEF_MODFUNC(to_name, 1);
+    RG_DEF_MODFUNC(from_name, 1);
+    RG_DEF_MODFUNC_P(upper, 1);
+    RG_DEF_MODFUNC_P(lower, 1);
+    RG_DEF_MODFUNC(convert_case, 1);
+    RG_DEF_MODFUNC(to_upper, 1);
+    RG_DEF_MODFUNC(to_lower, 1);
+    RG_DEF_MODFUNC(to_unicode, 1);
+    RG_DEF_MODFUNC(from_unicode, 1);
 
 #include "rbgdkkeysyms.h"
 }

data/ext/gtk2/rbgdkpango.c

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkpango.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2003,2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003,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"
 #include "rbpango.h"
 
+#define RG_TARGET_NAMESPACE mPango
+
 static VALUE
-gdkpango_s_context_get(int argc, VALUE *argv, VALUE self)
+rg_m_context(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE screen, ret;
     rb_scan_args(argc, argv, "01", &screen);
@@ -34,7 +46,7 @@ static VALUE
 gdkpango_context_set_colormap(VALUE self, VALUE colormap)
 {
     gdk_pango_context_set_colormap(PANGO_CONTEXT(RVAL2GOBJ(self)),
-                                   GDK_COLORMAP(RVAL2GOBJ(self)));
+                                   GDK_COLORMAP(RVAL2GOBJ(colormap)));
     return self;
 }
 
@@ -65,36 +77,51 @@ gdkpango_attr_stipple_value(VALUE self)
 }
 
 static VALUE
-gdkpango_layout_get_clip_region(VALUE self, VALUE x_origin, VALUE y_origin, VALUE index_ranges)
+gdkpango_layout_get_clip_region(VALUE self, VALUE rbx_origin, VALUE rby_origin, VALUE rbindex_ranges)
 {
-    int i;
-    gint len = RARRAY_LEN(index_ranges);
-    gint* ranges = g_new(gint, len);
-
-    for (i = 0; i < len; i++) {
-        ranges[i] = RARRAY_PTR(index_ranges)[i];
+    PangoLayout *layout = PANGO_LAYOUT(RVAL2GOBJ(self));
+    gint x_origin = NUM2INT(rbx_origin);
+    gint y_origin = NUM2INT(rby_origin);
+    long n;
+    gint *index_ranges = RVAL2GINTS(rbindex_ranges, n);
+    GdkRegion *result;
+
+    if (n % 2 != 0) {
+        g_free(index_ranges);
+
+        rb_raise(rb_eArgError,
+                 "an even number of byte indexes must be given");
     }
-    return BOXED2RVAL(gdk_pango_layout_get_clip_region(PANGO_LAYOUT(RVAL2GOBJ(self)),
-                                                       NUM2INT(x_origin),
-                                                       NUM2INT(y_origin),
-                                                       ranges, len), GDK_TYPE_REGION);
+
+    result = gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n / 2);
+
+    g_free(index_ranges);
+
+    return BOXED2RVAL(result, GDK_TYPE_REGION);
 }
 
 static VALUE
-gdkpango_layout_line_get_clip_region(VALUE self, VALUE x_origin, VALUE y_origin, VALUE index_ranges)
+gdkpango_layout_line_get_clip_region(VALUE self, VALUE rbx_origin, VALUE rby_origin, VALUE rbindex_ranges)
 {
-    int i;
-    gint len = RARRAY_LEN(index_ranges);
-    gint* ranges = g_new(gint, len);
-
-    for (i = 0; i < len; i++) {
-        ranges[i] = RARRAY_PTR(index_ranges)[i];
+    PangoLayoutLine *line = (PangoLayoutLine *)RVAL2BOXED(self, PANGO_TYPE_LAYOUT_LINE);
+    gint x_origin = NUM2INT(rbx_origin);
+    gint y_origin = NUM2INT(rby_origin);
+    long n;
+    gint *index_ranges = RVAL2GINTS(rbindex_ranges, n);
+    GdkRegion *result;
+
+    if (n % 2 != 0) {
+        g_free(index_ranges);
+
+        rb_raise(rb_eArgError,
+                 "an even number of byte indexes must be given");
     }
-    return BOXED2RVAL(gdk_pango_layout_line_get_clip_region(
-                          (PangoLayoutLine*)RVAL2BOXED(self, PANGO_TYPE_LAYOUT_LINE),
-                          NUM2INT(x_origin),
-                          NUM2INT(y_origin),
-                          ranges, len), GDK_TYPE_REGION);
+
+    result = gdk_pango_layout_line_get_clip_region(line, x_origin, y_origin, index_ranges, n / 2);
+
+    g_free(index_ranges);
+
+    return BOXED2RVAL(result, GDK_TYPE_REGION);
 }
 
 #if GTK_CHECK_VERSION(2, 12, 0)
@@ -109,18 +136,18 @@ static VALUE
 gdkpango_attr_emboss_color_value(VALUE self)
 {
     return BOXED2RVAL(&(((GdkPangoAttrEmbossColor *)RVAL2ATTR(self))->color),
-		      PANGO_TYPE_COLOR);
+                      PANGO_TYPE_COLOR);
 }
 #endif
 
 void
-Init_gtk_gdk_pango()
+Init_gtk_gdk_pango(VALUE mGdk)
 {
     VALUE klass;
     PangoAttribute* tmpattr;
     GdkColor color;
 
-    VALUE mGdkPango = rb_define_module_under(mGdk, "Pango");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGdk, "Pango");
     VALUE context = GTYPE2CLASS(PANGO_TYPE_CONTEXT);
     VALUE layout = GTYPE2CLASS(PANGO_TYPE_LAYOUT);
     VALUE layoutline = GTYPE2CLASS(PANGO_TYPE_LAYOUT_LINE);
@@ -128,7 +155,7 @@ Init_gtk_gdk_pango()
     VALUE pattrbool = ATTRTYPE2CLASS(CSTR2RVAL("AttrBool"));
     VALUE pattr_color = ATTRTYPE2CLASS(CSTR2RVAL("AttrColor"));
 
-    rb_define_module_function(mGdkPango, "context", gdkpango_s_context_get, -1);
+    RG_DEF_MODFUNC(context, -1);
 
     rb_define_method(context, "set_colormap", gdkpango_context_set_colormap, 1);
     G_DEF_SETTER(context, "colormap");
@@ -152,7 +179,7 @@ Init_gtk_gdk_pango()
 #if GTK_CHECK_VERSION(2, 12, 0)
     klass = rb_define_class_under(mGdk, "PangoAttrEmbossColor", pattr_color);
     rb_define_method(klass, "initialize",
-		     gdkpango_attr_emboss_color_initialize, 1);
+                     gdkpango_attr_emboss_color_initialize, 1);
     rb_define_method(klass, "value", gdkpango_attr_emboss_color_value, 0);
     tmpattr = gdk_pango_attr_emboss_color_new(&color);
     RBPANGO_ADD_ATTRIBUTE(tmpattr->klass->type, klass);