gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkplug.c

@@ -1,21 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkplug.c -
-
-  $Author: mutoh $
-  $Date: 2003/05/27 10:59:22 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 2002 Neil Conway
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002  Neil Conway
+ *
+ *  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"
 
 #ifdef HAVE_GTK_PLUG_GET_TYPE
 
+#define RG_TARGET_NAMESPACE cPlug
+
 static VALUE
-plug_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE socket_id;
     GdkNativeWindow id;
@@ -29,7 +41,7 @@ plug_initialize(int argc, VALUE *argv, VALUE self)
         id = NUM2UINT(socket_id);
 #endif
     }
-    
+
     RBGTK_INITIALIZE(self, gtk_plug_new(id));
     return Qnil;
 }
@@ -43,7 +55,7 @@ GdkDisplay *display,
 */
 
 static VALUE
-plug_construct(VALUE self, VALUE socket_id)
+rg_construct(VALUE self, VALUE socket_id)
 {
 #ifdef GDK_NATIVE_WINDOW_POINTER
     gtk_plug_construct(GTK_PLUG(RVAL2GOBJ(self)), GUINT_TO_POINTER(NUM2ULONG(socket_id)));
@@ -54,7 +66,7 @@ plug_construct(VALUE self, VALUE socket_id)
 }
 
 static VALUE
-plug_get_id(VALUE self)
+rg_id(VALUE self)
 {
     GdkNativeWindow id = gtk_plug_get_id(GTK_PLUG(RVAL2GOBJ(self)));
 #ifdef GDK_NATIVE_WINDOW_POINTER
@@ -67,13 +79,13 @@ plug_get_id(VALUE self)
 #endif /* HAVE_GTK_PLUG_GET_TYPE */
 
 void 
-Init_gtk_plug()
+Init_gtk_plug(VALUE mGtk)
 {
 #ifdef HAVE_GTK_PLUG_GET_TYPE
-    VALUE gPlug = G_DEF_CLASS(GTK_TYPE_PLUG, "Plug", mGtk);
-    
-    rb_define_method(gPlug, "initialize", plug_initialize, -1);
-    rb_define_method(gPlug, "construct", plug_construct, 1);
-    rb_define_method(gPlug, "id", plug_get_id, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PLUG, "Plug", mGtk);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(construct, 1);
+    RG_DEF_METHOD(id, 0);
 #endif
 }

data/ext/gtk2/rbgtkprintcontext.c

@@ -1,18 +1,29 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkprintcontext.c -
-
-  $Author: mutoh $
-  $Date: 2006/11/03 19:40:44 $
-
-  Copyright (C) 2006 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *
+ *  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,10,0)
 
+#define RG_TARGET_NAMESPACE cPrintContext
 #define _SELF(s) (GTK_PRINT_CONTEXT(RVAL2GOBJ(s)))
 
 #  ifdef HAVE_RB_CAIRO_H
@@ -20,57 +31,57 @@
 
 /* Rendering */
 static VALUE
-pc_get_cairo_context(VALUE self)
+rg_cairo_context(VALUE self)
 {
     return CRCONTEXT2RVAL(gtk_print_context_get_cairo_context(_SELF(self)));
 }
 #  endif
 
 static VALUE
-pc_get_page_setup(VALUE self)
+rg_page_setup(VALUE self)
 {
     return GOBJ2RVAL(gtk_print_context_get_page_setup(_SELF(self)));
 }
 
 static VALUE
-pc_get_width(VALUE self)
+rg_width(VALUE self)
 {
     return rb_float_new(gtk_print_context_get_width(_SELF(self)));
 }
 
 static VALUE
-pc_get_height(VALUE self)
+rg_height(VALUE self)
 {
     return rb_float_new(gtk_print_context_get_height(_SELF(self)));
 }
 
 static VALUE
-pc_get_dpi_x(VALUE self)
+rg_dpi_x(VALUE self)
 {
     return rb_float_new(gtk_print_context_get_dpi_x(_SELF(self)));
 }
 
 static VALUE
-pc_get_dpi_y(VALUE self)
+rg_dpi_y(VALUE self)
 {
     return rb_float_new(gtk_print_context_get_dpi_y(_SELF(self)));
 }
 
 /* Fonts */
 static VALUE
-pc_get_pango_fontmap(VALUE self)
+rg_pango_fontmap(VALUE self)
 {
     return GOBJ2RVAL(gtk_print_context_get_pango_fontmap(_SELF(self)));
 }
 
 static VALUE
-pc_create_pango_context(VALUE self)
+rg_create_pango_context(VALUE self)
 {
     return GOBJ2RVALU(gtk_print_context_create_pango_context(_SELF(self)));
 }
 
 static VALUE
-pc_create_pango_layout(VALUE self)
+rg_create_pango_layout(VALUE self)
 {
     return GOBJ2RVALU(gtk_print_context_create_pango_layout(_SELF(self)));
 }
@@ -78,7 +89,7 @@ pc_create_pango_layout(VALUE self)
 /* Needed for preview implementations */
 #  ifdef HAVE_RB_CAIRO_H
 static VALUE
-pc_set_cairo_context(VALUE self, VALUE cr, VALUE dpi_x, VALUE dpi_y)
+rg_set_cairo_context(VALUE self, VALUE cr, VALUE dpi_x, VALUE dpi_y)
 {
     gtk_print_context_set_cairo_context(_SELF(self),
                                         RVAL2CRCONTEXT(cr),
@@ -90,35 +101,32 @@ pc_set_cairo_context(VALUE self, VALUE cr, VALUE dpi_x, VALUE dpi_y)
 #endif
 
 void
-Init_gtk_print_context()
+Init_gtk_print_context(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE gPrintContext = G_DEF_CLASS(GTK_TYPE_PRINT_CONTEXT,
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PRINT_CONTEXT,
                                       "PrintContext", mGtk);
 
     /* Rendering */
 #  ifdef HAVE_RB_CAIRO_H
-    rb_define_method(gPrintContext, "cairo_context", pc_get_cairo_context, 0);
+    RG_DEF_METHOD(cairo_context, 0);
 #  endif
-    rb_define_method(gPrintContext, "page_setup", pc_get_page_setup, 0);
-    rb_define_method(gPrintContext, "width", pc_get_width, 0);
-    rb_define_method(gPrintContext, "height", pc_get_height, 0);
-    rb_define_method(gPrintContext, "dpi_x", pc_get_dpi_x, 0);
-    rb_define_method(gPrintContext, "dpi_y", pc_get_dpi_y, 0);
+    RG_DEF_METHOD(page_setup, 0);
+    RG_DEF_METHOD(width, 0);
+    RG_DEF_METHOD(height, 0);
+    RG_DEF_METHOD(dpi_x, 0);
+    RG_DEF_METHOD(dpi_y, 0);
 
     /* Fonts */
-    rb_define_method(gPrintContext, "pango_fontmap", pc_get_pango_fontmap, 0);
-    rb_define_method(gPrintContext, "create_pango_context",
-                     pc_create_pango_context, 0);
-    rb_define_method(gPrintContext, "create_pango_layout",
-                     pc_create_pango_layout, 0);
+    RG_DEF_METHOD(pango_fontmap, 0);
+    RG_DEF_METHOD(create_pango_context, 0);
+    RG_DEF_METHOD(create_pango_layout, 0);
 
     /* Needed for preview implementations */
 #  ifdef HAVE_RB_CAIRO_H
-    rb_define_method(gPrintContext, "set_cairo_context",
-                     pc_set_cairo_context, 3);
+    RG_DEF_METHOD(set_cairo_context, 3);
 #  endif
 
-    G_DEF_SETTERS(gPrintContext);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/gtk2/rbgtkprinter.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkprinter.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:49 $
-
-  Copyright (C) 2006 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *
+ *  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"
 
@@ -20,10 +30,11 @@
 GType gtk_print_backend_get_type (void) G_GNUC_CONST;
 #endif
 
+#define RG_TARGET_NAMESPACE cPrinter
 #define _SELF(s) (GTK_PRINTER(RVAL2GOBJ(s)))
 
 static VALUE
-p_initialize(VALUE self, VALUE name, VALUE backend, VALUE rb_virtual)
+rg_initialize(VALUE self, VALUE name, VALUE backend, VALUE rb_virtual)
 {
     GtkPrinter *printer;
 
@@ -35,38 +46,26 @@ p_initialize(VALUE self, VALUE name, VALUE backend, VALUE rb_virtual)
     return Qnil;
 }
 
-/* Defined as properties
-gboolean    gtk_printer_accepts_ps          (GtkPrinter *printer);
-gboolean    gtk_printer_accepts_pdf         (GtkPrinter *printer);
-GtkPrintBackend* gtk_printer_get_backend    (GtkPrinter *printer);
-const gchar* gtk_printer_get_icon_name      (GtkPrinter *printer);
-gboolean    gtk_printer_is_virtual          (GtkPrinter *printer);
-const gchar* gtk_printer_get_name           (GtkPrinter *printer);
-const gchar* gtk_printer_get_state_message  (GtkPrinter *printer);
-const gchar* gtk_printer_get_location       (GtkPrinter *printer);
-gint        gtk_printer_get_job_count       (GtkPrinter *printer);
-*/
-
 static VALUE
-p_get_description(VALUE self)
+rg_description(VALUE self)
 {
     return CSTR2RVAL(gtk_printer_get_description(_SELF(self)));
 }
 
 static VALUE
-p_is_active(VALUE self)
+rg_active_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_printer_is_default(_SELF(self)));
 }
 
 static VALUE
-p_is_default(VALUE self)
+rg_default_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_printer_is_default(_SELF(self)));
 }
 
 static VALUE
-p_compare(VALUE self, VALUE other)
+rg_operator_p_compare(VALUE self, VALUE other)
 {
     if (rb_obj_is_kind_of(other, GTYPE2CLASS(GTK_TYPE_PRINTER))){
         return INT2NUM(gtk_printer_compare(_SELF(self), _SELF(other)));
@@ -115,7 +114,7 @@ remove_callback_reference(gpointer data)
 }
 
 static VALUE
-p_s_enumerate_printers(int argc, VALUE *argv, VALUE self)
+rg_s_each(int argc, VALUE *argv, VALUE self)
 {
     VALUE wait, block;
     rb_scan_args(argc, argv, "01", &wait);
@@ -130,26 +129,26 @@ p_s_enumerate_printers(int argc, VALUE *argv, VALUE self)
 #endif
 
 void
-Init_gtk_printer()
+Init_gtk_printer(VALUE mGtk)
 {
 #ifdef HAVE_GTK_UNIX_PRINT
-    VALUE gPrinter = G_DEF_CLASS(GTK_TYPE_PRINTER, "Printer", mGtk);
-    rb_include_module(gPrinter, rb_mComparable);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PRINTER, "Printer", mGtk);
+    rb_include_module(RG_TARGET_NAMESPACE, rb_mComparable);
 
     G_DEF_CLASS(GTK_TYPE_PRINT_BACKEND, "PrintBackend", mGtk);
 
-    rb_define_singleton_method(gPrinter, "each", p_s_enumerate_printers, -1);
+    RG_DEF_SMETHOD(each, -1);
 
-    rb_define_method(gPrinter, "initialize", p_initialize, 3);
-    rb_define_method(gPrinter, "description", p_get_description, 0);
-    rb_define_method(gPrinter, "active?", p_is_active, 0);
-    rb_define_method(gPrinter, "default?", p_is_default, 0);
-    rb_define_method(gPrinter, "<=>", p_compare, 1);
+    RG_DEF_METHOD(initialize, 3);
+    RG_DEF_METHOD(description, 0);
+    RG_DEF_METHOD_P(active, 0);
+    RG_DEF_METHOD_P(default, 0);
+    RG_DEF_METHOD_OPERATOR("<=>", p_compare, 1);
 
     G_DEF_CLASS3("GtkPrintBackendCups", "PrintBackendCups", mGtk);
     G_DEF_CLASS3("GtkPrintBackendFile", "PrintBackendFile", mGtk);
     G_DEF_CLASS3("GtkPrintBackendLpr", "PrintBackendLpr", mGtk);
 
-    G_DEF_SETTERS(gPrinter);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/gtk2/rbgtkprintjob.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkprintjob.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:49 $
-
-  Copyright (C) 2006 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *
+ *  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"
 
@@ -21,12 +31,13 @@
 #  include <rb_cairo.h>
 #endif
 
+#define RG_TARGET_NAMESPACE cPrintJob
 #define _SELF(s) (GTK_PRINT_JOB(RVAL2GOBJ(s)))
 
-static VALUE gPrintJob;
+static VALUE RG_TARGET_NAMESPACE;
 
 static VALUE
-pj_initialize(VALUE self, VALUE title, VALUE printer,
+rg_initialize(VALUE self, VALUE title, VALUE printer,
               VALUE settings, VALUE page_setup)
 {
     GtkPrintJob *job;
@@ -40,26 +51,14 @@ pj_initialize(VALUE self, VALUE title, VALUE printer,
     return Qnil;
 }
 
-/* Defined as properties.
-GtkPrintSettings* gtk_print_job_get_settings
-                                            (GtkPrintJob *job);
-GtkPrinter* gtk_print_job_get_printer       (GtkPrintJob *job);
-const gchar* gtk_print_job_get_title        (GtkPrintJob *job);
-void        gtk_print_job_set_track_print_status
-                                            (GtkPrintJob *job,
-                                             gboolean track_status);
-gboolean    gtk_print_job_get_track_print_status
-                                            (GtkPrintJob *job);
-*/
-
 static VALUE
-pj_get_status(VALUE self)
+rg_status(VALUE self)
 {
     return GENUM2RVAL(gtk_print_job_get_status(_SELF(self)), GTK_TYPE_PRINT_STATUS);
 }
 
 static VALUE
-pj_set_source_file(VALUE self, VALUE filename)
+rg_set_source_file(VALUE self, VALUE filename)
 {
     GError *error = NULL;
     gboolean result;
@@ -75,7 +74,7 @@ pj_set_source_file(VALUE self, VALUE filename)
 
 #ifdef HAVE_RB_CAIRO_H
 static VALUE
-pj_get_surface(VALUE self)
+rg_surface(VALUE self)
 {
     cairo_surface_t *surface;
     GError *error = NULL;
@@ -117,14 +116,14 @@ complete_func(GtkPrintJob *job, gpointer data, GError *error)
 static void
 remove_callback_reference(gpointer data)
 {
-    G_CHILD_REMOVE(gPrintJob, (VALUE)data);
+    G_CHILD_REMOVE(RG_TARGET_NAMESPACE, (VALUE)data);
 }
 
 static VALUE
-pj_send(VALUE self)
+rg_send(VALUE self)
 {
     VALUE block = rb_block_proc();
-    G_CHILD_ADD(gPrintJob, block);
+    G_CHILD_ADD(RG_TARGET_NAMESPACE, block);
     gtk_print_job_send(_SELF(self), complete_func, (gpointer)block,
                        remove_callback_reference);
     return self;
@@ -132,19 +131,19 @@ pj_send(VALUE self)
 #endif
 
 void
-Init_gtk_print_job()
+Init_gtk_print_job(VALUE mGtk)
 {
 #ifdef HAVE_GTK_UNIX_PRINT
-    gPrintJob = G_DEF_CLASS(GTK_TYPE_PRINT_JOB, "PrintJob", mGtk);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PRINT_JOB, "PrintJob", mGtk);
     G_DEF_CLASS(GTK_TYPE_PRINT_CAPABILITIES, "PrintCapabilities", mGtk);
 
-    rb_define_method(gPrintJob, "initialize", pj_initialize, 4);
-    rb_define_method(gPrintJob, "status", pj_get_status, 0);
-    rb_define_method(gPrintJob, "set_source_file", pj_set_source_file, 1);
-    G_DEF_SETTER(gPrintJob, "source_file");
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(status, 0);
+    RG_DEF_METHOD(set_source_file, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "source_file");
 #ifdef HAVE_RB_CAIRO_H
-    rb_define_method(gPrintJob, "surface", pj_get_surface, 0);
+    RG_DEF_METHOD(surface, 0);
 #endif
-    rb_define_method(gPrintJob, "send", pj_send, 0);
+    RG_DEF_METHOD(send, 0);
 #endif
 }