gtk2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/gtk2/gtk2.def

@@ -4,7 +4,9 @@ EXPORTS
     rb_cGdkColor DATA
     mGtk DATA
     exec_callback
-    gdk_atom_copy
+    rbgdk_rval2gdkpoints
+    rbgdk_rval2gdkatoms
+    rbgdk_rval2gdkpixbufglist
     gdk_atom_get_type
     gdk_geometry_get_type
     gdk_region_get_type
@@ -13,13 +15,13 @@ EXPORTS
     get_gdkevent
     gtk_accel_group_entry_get_type
     gtk_accel_key_get_type
-    gtk_notebookpage_get_type
     gtk_target_list_get_type
     gtk_bindingset_get_type
     make_gdkevent
-    notebookpage_copy
     rbgtk_atom2selectiondata
     rbgtk_atom2selectiondata_free
+    rbgtk_rval2gtktargetentries
+    rbgtk_rval2gtktargetentries_accept_nil
     rbgtk_get_target_entry
     rbgtk_initialize_gtkobject
     rbgtk_register_treeiter_set_value_func

data/ext/gtk2/init.c

@@ -1,28 +1,36 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  init.c -
-
-  $Author: mutoh $
-  $Date: 2006/10/21 16:58:00 $
-
-  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2001 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2001 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 "gmodule.h"
 
-extern void Init_gtk_gdk();
-extern void Init_gtk_gtk();
-extern void Init_gtk_inits();
-
 VALUE treeiter_set_value_table;
 
+extern void Init_gtk2(void);
+
 void
-Init_gtk2()
+Init_gtk2(void)
 {
     /*
      * For Gtk::TreeModel, Gtk::TreeIter. 
@@ -34,6 +42,242 @@ Init_gtk2()
     Init_gtk_gdk();
     Init_gtk_gtk();
 
-    Init_gtk_inits();
-
+    Init_gtk_gdk_atom(mGdk);
+    Init_gtk_gdk_cairo();
+    Init_gtk_gdk_color(mGdk);
+    Init_gtk_gdk_colormap(mGdk);
+    Init_gtk_gdk_const(mGdk);
+    Init_gtk_gdk_cursor(mGdk);
+    Init_gtk_gdk_device(mGdk);
+    Init_gtk_gdk_display(mGdk);
+    Init_gtk_gdk_display_manager(mGdk);
+    Init_gtk_gdk_dragcontext(mGdk);
+    Init_gtk_gdk_event(mGdk);
+    Init_gtk_gdk_geometry(mGdk);
+    Init_gtk_gdk_image(mGdk);
+    Init_gtk_gdk_input(mGdk);
+    Init_gtk_gdk_keymap(mGdk);
+    Init_gtk_gdk_keyval(mGdk);
+    Init_gtk_gdk_pango(mGdk);
+    Init_gtk_gdk_pangorenderer(mGdk);
+    Init_gtk_gdk_pixbuf(mGdk);
+    Init_gtk_gdk_pixmap(mGdk);
+    Init_gtk_gdk_property(mGdk);
+    Init_gtk_gdk_rectangle(mGdk);
+    Init_gtk_gdk_region(mGdk);
+    Init_gtk_gdk_rgb(mGdk);
+    Init_gtk_gdk_screen(mGdk);
+    Init_gtk_gdk_selection(mGdk);
+    Init_gtk_gdk_threads(mGdk);
+    Init_gtk_gdk_timecoord(mGdk);
+    Init_gtk_gdk_visual(mGdk);
+    Init_gtk_gdk_window(mGdk);
+    Init_gtk_gdk_windowattr(mGdk);
+    Init_gtk_gdk_x11(mGdk);
+    Init_gtk_aboutdialog(mGtk);
+    Init_gtk_accelerator(mGtk);
+    Init_gtk_accel_group(mGtk);
+    Init_gtk_accel_group_entry(mGtk);
+    Init_gtk_accel_key(mGtk);
+    Init_gtk_accel_label(mGtk);
+    Init_gtk_accel_map(mGtk);
+    Init_gtk_accessible(mGtk);
+    Init_gtk_action(mGtk);
+    Init_gtk_actiongroup(mGtk);
+    Init_gtk_adjustment(mGtk);
+    Init_gtk_alignment(mGtk);
+    Init_gtk_allocation(mGtk);
+    Init_gtk_arrow(mGtk);
+    Init_gtk_aspect_frame(mGtk);
+    Init_gtk_assistant(mGtk);
+    Init_gtk_button_box(mGtk);
+    Init_gtk_bin(mGtk);
+    Init_gtk_bindings(mGtk);
+    Init_gtk_border(mGtk);
+    Init_gtk_box(mGtk);
+    Init_gtk_buildable(mGtk);
+    Init_gtk_builder(mGtk);
+    Init_gtk_button(mGtk);
+    Init_gtk_calendar(mGtk);
+    Init_gtk_celleditable(mGtk);
+    Init_gtk_celllayout(mGtk);
+    Init_gtk_cellrenderer(mGtk);
+    Init_gtk_cellrendereraccel(mGtk);
+    Init_gtk_cellrenderercombo(mGtk);
+    Init_gtk_cellrendererpixbuf(mGtk);
+    Init_gtk_cellrendererprogress(mGtk);
+    Init_gtk_cellrendererspin(mGtk);
+    Init_gtk_cellrendererspinner(mGtk);
+    Init_gtk_cellrenderertext(mGtk);
+    Init_gtk_cellrenderertoggle(mGtk);
+    Init_gtk_cellview(mGtk);
+    Init_gtk_check_button(mGtk);
+    Init_gtk_check_menu_item(mGtk);
+    Init_gtk_clipboard(mGtk);
+    Init_gtk_colorbutton(mGtk);
+    Init_gtk_color_selection(mGtk);
+    Init_gtk_color_selection_dialog(mGtk);
+    Init_gtk_combo(mGtk);
+    Init_gtk_combobox(mGtk);
+    Init_gtk_comboboxentry(mGtk);
+    Init_gtk_const(mGtk);
+    Init_gtk_container(mGtk);
+    Init_gtk_curve(mGtk);
+    Init_gtk_dialog(mGtk);
+    Init_gtk_drag(mGtk);
+    Init_gtk_drawing_area(mGtk);
+    Init_gtk_editable(mGtk);
+    Init_gtk_entry(mGtk);
+    Init_gtk_entry_completion(mGtk);
+    Init_gtk_eventbox(mGtk);
+    Init_gtk_expander(mGtk);
+    Init_gtk_file_chooser(mGtk);
+    Init_gtk_filesystemerror(mGtk);
+    Init_gtk_filechooserbutton(mGtk);
+    Init_gtk_file_chooser_dialog(mGtk);
+    Init_gtk_file_chooser_widget(mGtk);
+    Init_gtk_file_filter(mGtk);
+    Init_gtk_file_selection(mGtk);
+    Init_gtk_fixed(mGtk);
+    Init_gtk_fontbutton(mGtk);
+    Init_gtk_font_selection(mGtk);
+    Init_gtk_font_selection_dialog(mGtk);
+    Init_gtk_frame(mGtk);
+    Init_gtk_gamma_curve(mGtk);
+    Init_gtk_gdk_draw(mGdk);
+    Init_gtk_gdk_gc(mGdk);
+    Init_gtk_handle_box(mGtk);
+    Init_gtk_hbutton_box(mGtk);
+    Init_gtk_hbox(mGtk);
+    Init_gtk_hpaned(mGtk);
+    Init_gtk_hruler(mGtk);
+    Init_gtk_hscale(mGtk);
+    Init_gtk_hscrollbar(mGtk);
+    Init_gtk_hseparator(mGtk);
+    Init_gtk_icon_factory(mGtk);
+    Init_gtk_iconinfo(mGtk);
+    Init_gtk_icon_set(mGtk);
+    Init_gtk_icon_size(mGtk);
+    Init_gtk_icon_source(mGtk);
+    Init_gtk_icon_theme(mGtk);
+    Init_gtk_iconview(mGtk);
+    Init_gtk_image(mGtk);
+    Init_gtk_image_menu_item(mGtk);
+    Init_gtk_imcontext(mGtk);
+    Init_gtk_imcontext_simple(mGtk);
+    Init_gtk_im_multicontext(mGtk);
+    Init_gtk_input_dialog(mGtk);
+    Init_gtk_invisible(mGtk);
+    Init_gtk_item(mGtk);
+    Init_gtk_itemfactory(mGtk);
+    Init_gtk_label(mGtk);
+    Init_gtk_layout(mGtk);
+    Init_gtk_link_button(mGtk);
+    Init_gtk_list_store(mGtk);
+    Init_gtk_menu(mGtk);
+    Init_gtk_menu_bar(mGtk);
+    Init_gtk_menu_item(mGtk);
+    Init_gtk_menu_shell(mGtk);
+    Init_gtk_menutoolbutton(mGtk);
+    Init_gtk_message_dialog(mGtk);
+    Init_gtk_misc(mGtk);
+    Init_gtk_notebook(mGtk);
+    Init_gtk_object(mGtk);
+    Init_gtk_option_menu(mGtk);
+    Init_gtk_page_setup(mGtk);
+    Init_gtk_page_setup_unix_dialog(mGtk);
+    Init_gtk_paned(mGtk);
+    Init_gtk_paper_size(mGtk);
+    Init_gtk_plug(mGtk);
+    Init_gtk_print_context(mGtk);
+    Init_gtk_printer(mGtk);
+    Init_gtk_print_job(mGtk);
+    Init_gtk_print_operation(mGtk);
+    Init_gtk_print_operation_preview(mGtk);
+    Init_gtk_print_settings(mGtk);
+    Init_gtk_print_unix_dialog(mGtk);
+    Init_gtk_progress(mGtk);
+    Init_gtk_progress_bar(mGtk);
+    Init_gtk_radio_action(mGtk);
+    Init_gtk_radio_button(mGtk);
+    Init_gtk_radio_menu_item(mGtk);
+    Init_gtk_radiotoolbutton(mGtk);
+    Init_gtk_range(mGtk);
+    Init_gtk_rc(mGtk);
+    Init_gtk_rcstyle(mGtk);
+    Init_gtk_recentaction(mGtk);
+    Init_gtk_recent_chooser(mGtk);
+    Init_gtk_recent_chooser_dialog(mGtk);
+    Init_gtk_recent_chooser_menu(mGtk);
+    Init_gtk_recent_chooser_widget(mGtk);
+    Init_gtk_recent_data(mGtk);
+    Init_gtk_recent_filter(mGtk);
+    Init_gtk_recent_filter_info(mGtk);
+    Init_gtk_recent_info(mGtk);
+    Init_gtk_recent_manager(mGtk);
+    Init_gtk_ruler(mGtk);
+    Init_gtk_scale(mGtk);
+    Init_gtk_scalebutton(mGtk);
+    Init_gtk_scrollbar(mGtk);
+    Init_gtk_scrolled_window(mGtk);
+    Init_gtk_selection(mGtk);
+    Init_gtk_selectiondata(mGtk);
+    Init_gtk_separator(mGtk);
+    Init_gtk_separator_menu_item(mGtk);
+    Init_gtk_separatortoolitem(mGtk);
+    Init_gtk_settings(mGtk);
+    Init_gtk_size_group(mGtk);
+    Init_gtk_socket(mGtk);
+    Init_gtk_spin_button(mGtk);
+    Init_gtk_spinner(mGtk);
+    Init_gtk_statusbar(mGtk);
+    Init_gtk_status_icon(mGtk);
+    Init_gtk_stock(mGtk);
+    Init_gtk_style(mGtk);
+    Init_gtk_table(mGtk);
+    Init_gtk_target_list(mGtk);
+    Init_gtk_tearoff_menu_item(mGtk);
+    Init_gtk_text_appearance(mGtk);
+    Init_gtk_text_attributes(mGtk);
+    Init_gtk_textbuffer(mGtk);
+    Init_gtk_textchild(mGtk);
+    Init_gtk_textiter(mGtk);
+    Init_gtk_textmark(mGtk);
+    Init_gtk_texttag(mGtk);
+    Init_gtk_text_tag_table(mGtk);
+    Init_gtk_textview(mGtk);
+    Init_gtk_toggle_action(mGtk);
+    Init_gtk_toggle_button(mGtk);
+    Init_gtk_toggletoolbutton(mGtk);
+    Init_gtk_toolbar(mGtk);
+    Init_gtk_toolbutton(mGtk);
+    Init_gtk_toolitem(mGtk);
+    Init_gtk_tooltip(mGtk);
+    Init_gtk_tooltips(mGtk);
+    Init_gtk_treedragdest(mGtk);
+    Init_gtk_treedragsource(mGtk);
+    Init_gtk_treeiter(mGtk);
+    Init_gtk_treemodel(mGtk);
+    Init_gtk_treemodelfilter(mGtk);
+    Init_gtk_tmodelsort(mGtk);
+    Init_gtk_treepath(mGtk);
+    Init_gtk_treerowreference(mGtk);
+    Init_gtk_treeselection(mGtk);
+    Init_gtk_treesortable(mGtk);
+    Init_gtk_tree_store(mGtk);
+    Init_gtk_treeview(mGtk);
+    Init_gtk_treeviewcolumn(mGtk);
+    Init_gtk_uimanager(mGtk);
+    Init_gtk_vbutton_box(mGtk);
+    Init_gtk_vbox(mGtk);
+    Init_gtk_viewport(mGtk);
+    Init_gtk_volumebutton(mGtk);
+    Init_gtk_vpaned(mGtk);
+    Init_gtk_vruler(mGtk);
+    Init_gtk_vscale(mGtk);
+    Init_gtk_vscrollbar(mGtk);
+    Init_gtk_vseparator(mGtk);
+    Init_gtk_widget(mGtk);
+    Init_gtk_window(mGtk);
+    Init_gtk_windowgroup(mGtk);
 }

data/ext/gtk2/rbgdk.c

@@ -1,20 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdk.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:30 $
-
-  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"
 
-VALUE mGdk;
+#define RG_TARGET_NAMESPACE mGdk
+
+VALUE RG_TARGET_NAMESPACE;
 
 /* We don't need them.
 void        gdk_init                        (gint *argc,
@@ -25,22 +37,156 @@ void        gdk_parse_args                  (gint *argc,
                                              gchar ***argv);
 */
 
+struct rbgdk_rval2gdkpoints_args {
+    VALUE ary;
+    long n;
+    GdkPoint *result;
+};
+
+static VALUE
+rbgdk_rval2gdkpoints_body(VALUE value)
+{
+    long i;
+    struct rbgdk_rval2gdkpoints_args *args = (struct rbgdk_rval2gdkpoints_args *)value;
+
+    for (i = 0; i < args->n; i++) {
+        VALUE points = rb_ary_to_ary(RARRAY_PTR(args->ary)[i]);
+
+        if (RARRAY_LEN(points) != 2)
+            rb_raise(rb_eArgError, "point %ld should be array of size 2", i);
+
+        args->result[i].x = NUM2INT(RARRAY_PTR(points)[0]);
+        args->result[i].y = NUM2INT(RARRAY_PTR(points)[1]);
+    }
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgdk_rval2gdkpoints_rescue(VALUE value)
+{
+    g_free(((struct rbgdk_rval2gdkpoints_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+GdkPoint *
+rbgdk_rval2gdkpoints(VALUE value, long *n)
+{
+    struct rbgdk_rval2gdkpoints_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new(GdkPoint, args.n + 1);
+
+    rb_rescue(rbgdk_rval2gdkpoints_body, (VALUE)&args,
+              rbgdk_rval2gdkpoints_rescue, (VALUE)&args);
+
+    *n = args.n;
+
+    return args.result;
+}
+
+struct rbgdk_rval2gdkatoms_args {
+    VALUE ary;
+    long n;
+    GdkAtom *result;
+};
+
+static VALUE
+rbgdk_rval2gdkatoms_body(VALUE value)
+{
+    long i;
+    struct rbgdk_rval2gdkatoms_args *args = (struct rbgdk_rval2gdkatoms_args *)value;
+
+    for (i = 0; i < args->n; i++)
+        args->result[i] = RVAL2ATOM(RARRAY_PTR(args->ary)[i]);
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgdk_rval2gdkatoms_rescue(VALUE value)
+{
+    g_free(((struct rbgdk_rval2gdkatoms_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+GdkAtom *
+rbgdk_rval2gdkatoms(VALUE value, long *n)
+{
+    struct rbgdk_rval2gdkatoms_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new(GdkAtom, args.n + 1);
+
+    rb_rescue(rbgdk_rval2gdkatoms_body, (VALUE)&args,
+              rbgdk_rval2gdkatoms_rescue, (VALUE)&args);
+
+    *n = args.n;
+
+    return args.result;
+}
+
+struct rval2gdkpixbufglist_args {
+    VALUE ary;
+    long n;
+    GList *result;
+};
+
+static VALUE
+rbgdk_rval2gdkpixbufglist_body(VALUE value)
+{
+    long i;
+    struct rval2gdkpixbufglist_args *args = (struct rval2gdkpixbufglist_args *)value;
+
+    for (i = 0; i < args->n; i++)
+        args->result = g_list_append(args->result, GDK_PIXBUF(RVAL2GOBJ(RARRAY_PTR(args->ary)[i])));
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgdk_rval2gdkpixbufglist_rescue(VALUE value)
+{
+    g_list_free(((struct rval2gdkpixbufglist_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+GList *
+rbgdk_rval2gdkpixbufglist(VALUE value)
+{
+    struct rval2gdkpixbufglist_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
+
+    rb_rescue(rbgdk_rval2gdkpixbufglist_body, (VALUE)&args,
+              rbgdk_rval2gdkpixbufglist_rescue, (VALUE)&args);
+
+    return args.result;
+}
+
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdk_s_get_display_arg_name(VALUE self)
+rg_m_display_arg_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gdk_get_display_arg_name());
 }
 #endif
 
 static VALUE
-gdk_s_set_locale(VALUE self)
+rg_m_set_locale(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gdk_set_locale());
 }
 
 static VALUE
-gdk_s_set_sm_client_id(VALUE self, VALUE id)
+rg_m_set_sm_client_id(VALUE self, VALUE id)
 {
     gdk_set_sm_client_id(NIL_P(id) ? NULL : RVAL2CSTR(id));
     return self;
@@ -48,21 +194,21 @@ gdk_s_set_sm_client_id(VALUE self, VALUE id)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdk_s_notify_startup_complete(int argc, VALUE *argv, VALUE self)
+rg_m_notify_startup_complete(int argc, VALUE *argv, VALUE self)
 {
     VALUE startup_id;
 
     rb_scan_args(argc, argv, "01", &startup_id);
 
     if (NIL_P(startup_id)) {
-	gdk_notify_startup_complete();
+        gdk_notify_startup_complete();
     } else {
 #if GTK_CHECK_VERSION(2, 12, 0)
-	gdk_notify_startup_complete_with_id(RVAL2CSTR(startup_id));
+        gdk_notify_startup_complete_with_id(RVAL2CSTR(startup_id));
 #else
-	rb_raise(rb_eNotImpError,
-		 "GTK+ >= 2.12 is required to use "
-		 "Gdk.notify_startup_complete with startup ID.");
+        rb_raise(rb_eNotImpError,
+                 "GTK+ >= 2.12 is required to use "
+                 "Gdk.notify_startup_complete with startup ID.");
 #endif
     }
     return self;
@@ -70,20 +216,20 @@ gdk_s_notify_startup_complete(int argc, VALUE *argv, VALUE self)
 #endif
 
 static VALUE
-gdk_s_get_program_class(VALUE self)
+rg_m_program_class(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gdk_get_program_class());
 }
 
 static VALUE
-gdk_s_set_program_class(VALUE self, VALUE program_class)
+rg_m_set_program_class(VALUE self, VALUE program_class)
 {
     gdk_set_program_class(RVAL2CSTR(program_class));
     return self;
 }
 
 static VALUE
-gdk_s_get_display(VALUE self)
+rg_m_display(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gdk_get_display());
 }
@@ -100,7 +246,7 @@ static int
 rbgdk_x_error(Display *display, XErrorEvent *error)
 {
      gchar buf[64];
-                                                                                
+
      XGetErrorText(display, error->error_code, buf, 63);
 
      rb_funcall((VALUE)rb_x_error, id_call, 4, INT2NUM(error->serial),
@@ -125,7 +271,7 @@ rbgdk_x_io_error(Display *display)
         disp = "(none)";
 
     error = g_strerror(errno_saved);
-    
+
     rb_funcall((VALUE)rb_x_io_error, id_call, 3, CSTR2RVAL(disp), 
                INT2NUM(errno), CSTR2RVAL(error));
     return 0;
@@ -134,7 +280,7 @@ rbgdk_x_io_error(Display *display)
 #endif 
 
 static VALUE
-gdk_s_set_x_error_handler(VALUE self)
+rg_m_set_x_error_handler(VALUE self)
 {
 #ifdef HAVE_XGETERRORTEXT
     rb_x_error = rb_block_proc();
@@ -147,7 +293,7 @@ gdk_s_set_x_error_handler(VALUE self)
 }
 
 static VALUE
-gdk_s_set_x_io_error_handler(VALUE self)
+rg_m_set_x_io_error_handler(VALUE self)
 {
 #ifdef HAVE_XGETERRORTEXT
     rb_x_io_error = rb_block_proc();
@@ -160,38 +306,38 @@ gdk_s_set_x_io_error_handler(VALUE self)
 }
 
 static VALUE
-gdk_s_flush(VALUE self)
+rg_m_flush(VALUE self)
 {
     gdk_flush();
     return self;
 }
 
 static VALUE
-gdk_s_screen_width(VALUE self)
+rg_m_screen_width(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(gdk_screen_width());
 }
 
 static VALUE
-gdk_s_screen_width_mm(VALUE self)
+rg_m_screen_width_mm(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(gdk_screen_width_mm());
 }
 
 static VALUE
-gdk_s_screen_height(VALUE self)
+rg_m_screen_height(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(gdk_screen_height());
 }
 
 static VALUE
-gdk_s_screen_height_mm(VALUE self)
+rg_m_screen_height_mm(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(gdk_screen_height_mm());
 }
 
 static VALUE
-gdk_s_pointer_grab(VALUE self, VALUE win, VALUE owner_events, VALUE event_mask, VALUE confine_to, VALUE cursor, VALUE time)
+rg_m_pointer_grab(G_GNUC_UNUSED VALUE self, VALUE win, VALUE owner_events, VALUE event_mask, VALUE confine_to, VALUE cursor, VALUE time)
 {
     return GENUM2RVAL(gdk_pointer_grab(GDK_WINDOW(RVAL2GOBJ(win)),
                      RVAL2CBOOL(owner_events),
@@ -202,14 +348,14 @@ gdk_s_pointer_grab(VALUE self, VALUE win, VALUE owner_events, VALUE event_mask,
 }
 
 static VALUE
-gdk_s_pointer_ungrab(VALUE self, VALUE time)
+rg_m_pointer_ungrab(VALUE self, VALUE time)
 {
     gdk_pointer_ungrab(NUM2INT(time));
     return self;
 }
 
 static VALUE
-gdk_s_keyboard_grab(VALUE self, VALUE win, VALUE owner_events, VALUE time)
+rg_m_keyboard_grab(G_GNUC_UNUSED VALUE self, VALUE win, VALUE owner_events, VALUE time)
 {
     return GENUM2RVAL(gdk_keyboard_grab(GDK_WINDOW(RVAL2GOBJ(win)), 
                                         RVAL2CBOOL(owner_events), NUM2INT(time)), 
@@ -217,48 +363,48 @@ gdk_s_keyboard_grab(VALUE self, VALUE win, VALUE owner_events, VALUE time)
 }
 
 static VALUE
-gdk_s_keyboard_ungrab(VALUE self, VALUE time)
+rg_m_keyboard_ungrab(VALUE self, VALUE time)
 {
     gdk_keyboard_ungrab(NUM2INT(time));
     return self;
 }
 
 static VALUE
-gdk_s_pointer_is_grabbed(VALUE self)
+rg_m_pointer_is_grabbed_p(G_GNUC_UNUSED VALUE self)
 {
     return CBOOL2RVAL(gdk_pointer_is_grabbed());
 }
 
 static VALUE
-gdk_s_set_double_click_time(VALUE self, VALUE msec)
+rg_m_set_double_click_time(VALUE self, VALUE msec)
 {
     gdk_set_double_click_time(NUM2UINT(msec));
     return self;
 }
 
 static VALUE
-gdk_s_beep(VALUE self)
+rg_m_beep(VALUE self)
 {
     gdk_beep();
     return self;
 }
 
 static VALUE
-gdk_s_error_trap_push(VALUE self)
+rg_m_error_trap_push(VALUE self)
 {
     gdk_error_trap_push();
     return self;
 }
 
 static VALUE
-gdk_s_error_trap_pop(VALUE self)
+rg_m_error_trap_pop(VALUE self)
 {
     gdk_error_trap_pop();
     return self;
 }
 
 static VALUE
-gdk_s_windowing_x11(VALUE self)
+rg_m_windowing_x11_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef GDK_WINDOWING_X11
     return Qtrue;
@@ -268,7 +414,7 @@ gdk_s_windowing_x11(VALUE self)
 }
 
 static VALUE
-gdk_s_windowing_win32(VALUE self)
+rg_m_windowing_win32_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef GDK_WINDOWING_WIN32
     return Qtrue;
@@ -278,7 +424,7 @@ gdk_s_windowing_win32(VALUE self)
 }
 
 static VALUE
-gdk_s_windowing_fb(VALUE self)
+rg_m_windowing_fb_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef GDK_WINDOWING_FB
     return Qtrue;
@@ -288,7 +434,7 @@ gdk_s_windowing_fb(VALUE self)
 }
 
 static VALUE
-gdk_s_windowing_quartz(VALUE self)
+rg_m_windowing_quartz_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef GDK_WINDOWING_QUARTZ
     return Qtrue;
@@ -298,7 +444,7 @@ gdk_s_windowing_quartz(VALUE self)
 }
 
 static VALUE
-gdk_s_windowing_directfb(VALUE self)
+rg_m_windowing_directfb_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef GDK_WINDOWING_DIRECTFB
     return Qtrue;
@@ -308,57 +454,67 @@ gdk_s_windowing_directfb(VALUE self)
 }
 
 static VALUE
-gdk_m_target(VALUE self)
+rg_m_target(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(RUBY_GTK2_TARGET);
 }
 
+static VALUE
+rg_m_cairo_available_p(G_GNUC_UNUSED VALUE self)
+{
+#if CAIRO_AVAILABLE
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
 void
-Init_gtk_gdk()
+Init_gtk_gdk(void)
 {
-    mGdk = rb_define_module("Gdk");
+    RG_TARGET_NAMESPACE = rb_define_module("Gdk");
 
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_module_function(mGdk, "display_arg_name", gdk_s_get_display_arg_name, 0);
+    RG_DEF_MODFUNC(display_arg_name, 0);
 #endif
-    rb_define_module_function(mGdk, "set_locale", gdk_s_set_locale, 0);
-    rb_define_module_function(mGdk, "set_sm_client_id", gdk_s_set_sm_client_id, 1);
+    RG_DEF_MODFUNC(set_locale, 0);
+    RG_DEF_MODFUNC(set_sm_client_id, 1);
 #if GTK_CHECK_VERSION(2, 2, 0)
-    rb_define_module_function(mGdk, "notify_startup_complete",
-			      gdk_s_notify_startup_complete, -1);
+    RG_DEF_MODFUNC(notify_startup_complete, -1);
 #endif
-    rb_define_module_function(mGdk, "program_class", gdk_s_get_program_class, 0);
-    rb_define_module_function(mGdk, "set_program_class", gdk_s_set_program_class, 1);
-    rb_define_module_function(mGdk, "display", gdk_s_get_display, 0);
-
-    rb_define_module_function(mGdk, "set_x_error_handler", gdk_s_set_x_error_handler , 0);
-    rb_define_module_function(mGdk, "set_x_io_error_handler", gdk_s_set_x_io_error_handler , 0);
-    rb_define_module_function(mGdk, "screen_width", gdk_s_screen_width, 0);
-    rb_define_module_function(mGdk, "screen_width_mm", gdk_s_screen_width_mm, 0);
-    rb_define_module_function(mGdk, "screen_height", gdk_s_screen_height, 0);
-    rb_define_module_function(mGdk, "screen_height_mm", gdk_s_screen_height_mm, 0);
-    rb_define_module_function(mGdk, "beep", gdk_s_beep, 0);
-    rb_define_module_function(mGdk, "flush", gdk_s_flush, 0);
-    rb_define_module_function(mGdk, "set_double_click_time", gdk_s_set_double_click_time, 1);
-    rb_define_module_function(mGdk, "pointer_grab", gdk_s_pointer_grab, 6);
-    rb_define_module_function(mGdk, "pointer_ungrab", gdk_s_pointer_ungrab, 1);
-    rb_define_module_function(mGdk, "keyboard_grab", gdk_s_keyboard_grab, 3);
-    rb_define_module_function(mGdk, "keyboard_ungrab", gdk_s_keyboard_ungrab, 1);
-    rb_define_module_function(mGdk, "pointer_is_grabbed?", gdk_s_pointer_is_grabbed, 0);
-    rb_define_module_function(mGdk, "error_trap_push", gdk_s_error_trap_push, 0);
-    rb_define_module_function(mGdk, "error_trap_pop", gdk_s_error_trap_pop, 0);
-    rb_define_module_function(mGdk, "windowing_x11?", gdk_s_windowing_x11, 0);
-    rb_define_module_function(mGdk, "windowing_win32?", gdk_s_windowing_win32, 0);
-    rb_define_module_function(mGdk, "windowing_fb?", gdk_s_windowing_fb, 0);
-    rb_define_module_function(mGdk, "windowing_quartz?", gdk_s_windowing_quartz, 0);
-    rb_define_module_function(mGdk, "windowing_directfb?", gdk_s_windowing_directfb, 0);
-
-    rb_define_module_function(mGdk, "target", gdk_m_target, 0);
-    
-    /* GdkGrabStatus */
-    G_DEF_CLASS(GDK_TYPE_GRAB_STATUS, "GrabStatus", mGdk);
-    G_DEF_CONSTANTS(mGdk, GDK_TYPE_GRAB_STATUS, "GDK_");
+    RG_DEF_MODFUNC(program_class, 0);
+    RG_DEF_MODFUNC(set_program_class, 1);
+    RG_DEF_MODFUNC(display, 0);
+
+    RG_DEF_MODFUNC(set_x_error_handler, 0);
+    RG_DEF_MODFUNC(set_x_io_error_handler, 0);
+    RG_DEF_MODFUNC(screen_width, 0);
+    RG_DEF_MODFUNC(screen_width_mm, 0);
+    RG_DEF_MODFUNC(screen_height, 0);
+    RG_DEF_MODFUNC(screen_height_mm, 0);
+    RG_DEF_MODFUNC(beep, 0);
+    RG_DEF_MODFUNC(flush, 0);
+    RG_DEF_MODFUNC(set_double_click_time, 1);
+    RG_DEF_MODFUNC(pointer_grab, 6);
+    RG_DEF_MODFUNC(pointer_ungrab, 1);
+    RG_DEF_MODFUNC(keyboard_grab, 3);
+    RG_DEF_MODFUNC(keyboard_ungrab, 1);
+    RG_DEF_MODFUNC_P(pointer_is_grabbed, 0);
+    RG_DEF_MODFUNC(error_trap_push, 0);
+    RG_DEF_MODFUNC(error_trap_pop, 0);
+    RG_DEF_MODFUNC_P(windowing_x11, 0);
+    RG_DEF_MODFUNC_P(windowing_win32, 0);
+    RG_DEF_MODFUNC_P(windowing_fb, 0);
+    RG_DEF_MODFUNC_P(windowing_quartz, 0);
+    RG_DEF_MODFUNC_P(windowing_directfb, 0);
+
+    RG_DEF_MODFUNC(target, 0);
+
+    RG_DEF_MODFUNC_P(cairo_available, 0);
 
-    G_DEF_SETTERS(mGdk);
-}
+    /* GdkGrabStatus */
+    G_DEF_CLASS(GDK_TYPE_GRAB_STATUS, "GrabStatus", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_GRAB_STATUS, "GDK_");
 
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
+}