gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgdk.h

@@ -1,10 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkconversions.h -
-
-  Copyright (C) 2008 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  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
+ */
 
 #ifndef __RB_GDK_H__
 #define __RB_GDK_H__
@@ -17,6 +30,14 @@
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>
 #endif
+#ifdef GDK_WINDOWING_WIN32
+#  include <gdk/gdkwin32.h>
+#endif
+
+#define RVAL2GDKPOINTS(value, n) rbgdk_rval2gdkpoints(value, n)
+#define RVAL2GDKATOMS(value, n) rbgdk_rval2gdkatoms(value, n)
+
+#define RVAL2GDKPIXBUFGLIST(value) rbgdk_rval2gdkpixbufglist(value)
 
 #define GDK_BITMAP(b) ((GdkBitmap*)GDK_PIXMAP(b))
 
@@ -40,6 +61,11 @@ typedef struct {
     GdkAtom atom;
 } GdkAtomData;
 
+GdkPoint *rbgdk_rval2gdkpoints(VALUE value, long *n);
+GdkAtom *rbgdk_rval2gdkatoms(VALUE value, long *n);
+
+GList *rbgdk_rval2gdkpixbufglist(VALUE value);
+
 extern GType gdk_windowattr_get_type(void);
 extern GType gdk_atom_get_type(void);
 extern GType gdk_geometry_get_type(void);

data/ext/gtk2/rbgdkatom.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkatom.c -
-
-  $Author: sakai $
-  $Date: 2007/07/15 15:03:11 $
-
-  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"
+#include "rbgdk.h"
 
+#define RG_TARGET_NAMESPACE cAtom
 #define _SELF(a) (((GdkAtomData*)RVAL2BOXED(a, GDK_TYPE_ATOM))->atom)
 
 /*****************************************/
-GdkAtomData*
-gdk_atom_copy (const GdkAtom atom)
+static GdkAtomData *
+gdk_atom_copy(const GdkAtom atom)
 {
     GdkAtomData* data;
     data = g_new(GdkAtomData, 1);
@@ -25,7 +36,7 @@ gdk_atom_copy (const GdkAtom atom)
 }
 
 GType
-gdk_atom_get_type (void)
+gdk_atom_get_type(void)
 {
     static GType our_type = 0;
     if (our_type == 0)
@@ -35,7 +46,6 @@ gdk_atom_get_type (void)
     return our_type;
 }
 
-
 GdkAtom
 get_gdkatom(VALUE atom)
 {
@@ -46,11 +56,11 @@ get_gdkatom(VALUE atom)
 /*****************************************/
 
 static VALUE
-gdkatom_s_intern(int argc, VALUE *argv, VALUE self)
+rg_s_intern(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE name;
     VALUE exist;
-  
+
     rb_scan_args(argc, argv, "11", &name, &exist);
 
     return BOXED2RVAL(gdk_atom_intern(RVAL2CSTR(name), RVAL2CBOOL(exist)), 
@@ -62,7 +72,7 @@ GdkAtom gdk_atom_intern_static_string(const gchar *atom_name);
  */
 
 static VALUE
-gdkatom_initialize(VALUE self, VALUE num)
+rg_initialize(VALUE self, VALUE num)
 {
     guint atom = FIX2INT(num);
     if (atom == 0){
@@ -77,38 +87,38 @@ gdkatom_initialize(VALUE self, VALUE num)
 }
 
 static VALUE
-gdkatom_name(VALUE self)
+rg_name(VALUE self)
 {
     return CSTR2RVAL_FREE(gdk_atom_name(_SELF(self)));
 }
 
 static VALUE
-gdkatom_to_i(VALUE self)
+rg_to_i(VALUE self)
 {
     return UINT2NUM(GPOINTER_TO_UINT(_SELF(self)));
 }
 
 static VALUE
-gdkatom_eq(VALUE self, VALUE other)
+rg_operator_equal(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(_SELF(self) == _SELF(other));
 }
 
 void
-Init_gtk_gdk_atom()
+Init_gtk_gdk_atom(VALUE mGdk)
 {
     VALUE none;
-    VALUE gdkAtom = G_DEF_CLASS(GDK_TYPE_ATOM, "Atom", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_ATOM, "Atom", mGdk);
 
-    rb_define_singleton_method(gdkAtom, "intern", gdkatom_s_intern, -1);
+    RG_DEF_SMETHOD(intern, -1);
 
-    rb_define_method(gdkAtom, "initialize", gdkatom_initialize, 1);
-    rb_define_method(gdkAtom, "name", gdkatom_name, 0);
-    rb_define_method(gdkAtom, "to_i", gdkatom_to_i, 0);
-    rb_define_method(gdkAtom, "==", gdkatom_eq, 1);
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(to_i, 0);
+    RG_DEF_METHOD_OPERATOR("==", equal, 1);
 
     /* This is a trick to define GDK_NONE as a BOXED object */
     none = BOXED2RVAL((gpointer)1, GDK_TYPE_ATOM);
-    rb_define_const(gdkAtom, "NONE", none);
+    rb_define_const(RG_TARGET_NAMESPACE, "NONE", none);
     _SELF(none) = GDK_NONE;
 }           

data/ext/gtk2/rbgdkcairo.c

@@ -1,30 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkcairo.c -
-
-  $Author: ktou $
-  $Date: 2007/08/13 11:09:22 $
-
-  Copyright (C) 2005 Kouhei Sutou
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  Kouhei Sutou
+ *
+ *  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,8,0) && defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#else
-#  define CAIRO_AVAILABLE 0
-#endif
-
 #if CAIRO_AVAILABLE
 #include <gdk/gdkcairo.h>
 #include <rb_cairo.h>
 
+#define RG_TARGET_NAMESPACE rb_cCairo_Context
 #define _SELF(self) RVAL2CRCONTEXT(self)
 
 static VALUE
-gdkdraw_cairo_set_source_color(VALUE self, VALUE color)
+rg_set_source_gdk_color(VALUE self, VALUE color)
 {
     gdk_cairo_set_source_color(_SELF(self), RVAL2GDKCOLOR(color));
     rb_cairo_check_status(cairo_status(_SELF(self)));
@@ -32,7 +37,7 @@ gdkdraw_cairo_set_source_color(VALUE self, VALUE color)
 }
 
 static VALUE
-gdkdraw_cairo_set_source_pixbuf(int argc, VALUE *argv, VALUE self)
+rg_set_source_pixbuf(int argc, VALUE *argv, VALUE self)
 {
     VALUE pixbuf, pixbuf_x, pixbuf_y;
 
@@ -48,7 +53,7 @@ gdkdraw_cairo_set_source_pixbuf(int argc, VALUE *argv, VALUE self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-gdkdraw_cairo_set_source_pixmap(VALUE self, VALUE pixmap, VALUE pixmap_x, VALUE pixmap_y)
+rg_set_source_pixmap(VALUE self, VALUE pixmap, VALUE pixmap_x, VALUE pixmap_y)
 {
     gdk_cairo_set_source_pixmap(_SELF(self), GDK_PIXMAP(RVAL2GOBJ(pixmap)),
                                 NUM2DBL(pixmap_x), NUM2DBL(pixmap_y));
@@ -58,7 +63,7 @@ gdkdraw_cairo_set_source_pixmap(VALUE self, VALUE pixmap, VALUE pixmap_x, VALUE
 #endif
 
 static VALUE
-gdkdraw_cairo_rectangle(VALUE self, VALUE rectangle)
+rg_gdk_rectangle(VALUE self, VALUE rectangle)
 {
     gdk_cairo_rectangle(_SELF(self), 
                         (GdkRectangle*)RVAL2BOXED(rectangle, GDK_TYPE_RECTANGLE));
@@ -67,7 +72,7 @@ gdkdraw_cairo_rectangle(VALUE self, VALUE rectangle)
 }
 
 static VALUE
-gdkdraw_cairo_region(VALUE self, VALUE region)
+rg_gdk_region(VALUE self, VALUE region)
 {
     gdk_cairo_region(_SELF(self), (GdkRegion*)RVAL2BOXED(region, GDK_TYPE_REGION));
     rb_cairo_check_status(cairo_status(_SELF(self)));
@@ -75,33 +80,18 @@ gdkdraw_cairo_region(VALUE self, VALUE region)
 }
 #endif
 
-static VALUE
-cairo_available_p(VALUE self)
-{
-#if CAIRO_AVAILABLE
-    return Qtrue;
-#else
-    return Qfalse;
-#endif
-}
-
 void
-Init_gtk_gdk_cairo()
+Init_gtk_gdk_cairo(void)
 {
 #if CAIRO_AVAILABLE
-    rb_define_method(rb_cCairo_Context, "set_source_gdk_color",
-                     gdkdraw_cairo_set_source_color, 1);
-    rb_define_method(rb_cCairo_Context, "set_source_pixbuf",
-                     gdkdraw_cairo_set_source_pixbuf, -1);
+    RG_DEF_METHOD(set_source_gdk_color, 1);
+    RG_DEF_METHOD(set_source_pixbuf, -1);
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_method(rb_cCairo_Context, "set_source_pixmap", gdkdraw_cairo_set_source_pixmap, 3);
+    RG_DEF_METHOD(set_source_pixmap, 3);
 #endif
-    rb_define_method(rb_cCairo_Context, "gdk_rectangle", gdkdraw_cairo_rectangle, 1);
-    rb_define_method(rb_cCairo_Context, "gdk_region", gdkdraw_cairo_region, 1);
+    RG_DEF_METHOD(gdk_rectangle, 1);
+    RG_DEF_METHOD(gdk_region, 1);
 
-    G_DEF_SETTERS(rb_cCairo_Context);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
-
-    rb_define_module_function(mGdk, "cairo_available?", cairo_available_p, 0);
 }
-

data/ext/gtk2/rbgdkcolor.c

@@ -1,25 +1,36 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkcolor.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"
 
+#define RG_TARGET_NAMESPACE rb_cGdkColor
 #define _SELF(c) (RVAL2GDKCOLOR(c))
 
-VALUE rb_cGdkColor = Qnil;
+VALUE RG_TARGET_NAMESPACE = Qnil;
 
 static VALUE
-gdkcolor_initialize(VALUE self, VALUE red, VALUE green, VALUE blue)
+rg_initialize(VALUE self, VALUE red, VALUE green, VALUE blue)
 {
     GdkColor c;
     c.pixel = 0;
@@ -33,7 +44,7 @@ gdkcolor_initialize(VALUE self, VALUE red, VALUE green, VALUE blue)
 }
 
 static VALUE
-gdkcolor_s_parse(VALUE self, VALUE name)
+rg_s_parse(G_GNUC_UNUSED VALUE self, VALUE name)
 {
     GdkColor c;
     if (! gdk_color_parse(RVAL2CSTR(name), &c)) {
@@ -43,53 +54,53 @@ gdkcolor_s_parse(VALUE self, VALUE name)
 }
 
 static VALUE
-gdkcolor_pixel(VALUE self)
+rg_pixel(VALUE self)
 {
     return INT2NUM(_SELF(self)->pixel);
 }
 
 static VALUE
-gdkcolor_red(VALUE self)
+rg_red(VALUE self)
 {
 
     return INT2FIX(_SELF(self)->red);
 }
 
 static VALUE
-gdkcolor_set_red(VALUE self, VALUE red)
+rg_set_red(VALUE self, VALUE red)
 {
     _SELF(self)->red = NUM2INT(red);
     return self;
 }
 
 static VALUE
-gdkcolor_green(VALUE self)
+rg_green(VALUE self)
 {
     return INT2FIX(_SELF(self)->green);
 }
 
 static VALUE
-gdkcolor_set_green(VALUE self, VALUE green)
+rg_set_green(VALUE self, VALUE green)
 {
     _SELF(self)->green = NUM2INT(green);
     return self;
 }
 
 static VALUE
-gdkcolor_blue(VALUE self)
+rg_blue(VALUE self)
 {
     return INT2FIX(_SELF(self)->blue);
 }
 
 static VALUE
-gdkcolor_set_blue(VALUE self, VALUE blue)
+rg_set_blue(VALUE self, VALUE blue)
 {
     _SELF(self)->blue = NUM2INT(blue);
     return self;
 }
 
 static VALUE
-gdkcolor_to_a(VALUE self)
+rg_to_a(VALUE self)
 {
     GdkColor *c = _SELF(self);
     return rb_ary_new3(3, INT2FIX(c->red), 
@@ -97,39 +108,38 @@ gdkcolor_to_a(VALUE self)
 }
 
 static VALUE
-gdkcolor_equal(VALUE self, VALUE other)
+rg_operator_gdkcolor_equal(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(gdk_color_equal(_SELF(self), _SELF(other)));
 }
 
 #if GTK_CHECK_VERSION(2, 12, 0)
 static VALUE
-gdkcolor_to_string(VALUE self, VALUE other)
+rg_to_s(VALUE self)
 {
     return CSTR2RVAL_FREE(gdk_color_to_string(_SELF(self)));
 }
 #endif
 
 void
-Init_gtk_gdk_color()
+Init_gtk_gdk_color(VALUE mGdk)
 {
-    rb_cGdkColor = G_DEF_CLASS(GDK_TYPE_COLOR, "Color", mGdk);
-
-    rb_define_singleton_method(rb_cGdkColor, "parse", gdkcolor_s_parse, 1);
-    rb_define_method(rb_cGdkColor, "initialize", gdkcolor_initialize, 3);
-    rb_define_method(rb_cGdkColor, "pixel", gdkcolor_pixel, 0);
-    rb_define_method(rb_cGdkColor, "red", gdkcolor_red, 0);
-    rb_define_method(rb_cGdkColor, "set_red", gdkcolor_set_red, 1);
-    rb_define_method(rb_cGdkColor, "green", gdkcolor_green, 0);
-    rb_define_method(rb_cGdkColor, "set_green", gdkcolor_set_green, 1);
-    rb_define_method(rb_cGdkColor, "blue", gdkcolor_blue, 0);
-    rb_define_method(rb_cGdkColor, "set_blue", gdkcolor_set_blue, 1);
-    rb_define_method(rb_cGdkColor, "to_a", gdkcolor_to_a, 0);
-    rb_define_method(rb_cGdkColor, "==", gdkcolor_equal, 1);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_COLOR, "Color", mGdk);
+
+    RG_DEF_SMETHOD(parse, 1);
+    RG_DEF_METHOD(initialize, 3);
+    RG_DEF_METHOD(pixel, 0);
+    RG_DEF_METHOD(red, 0);
+    RG_DEF_METHOD(set_red, 1);
+    RG_DEF_METHOD(green, 0);
+    RG_DEF_METHOD(set_green, 1);
+    RG_DEF_METHOD(blue, 0);
+    RG_DEF_METHOD(set_blue, 1);
+    RG_DEF_METHOD(to_a, 0);
+    RG_DEF_METHOD_OPERATOR("==", gdkcolor_equal, 1);
 #if GTK_CHECK_VERSION(2, 12, 0)
-    rb_define_method(rb_cGdkColor, "to_s", gdkcolor_to_string, 0);
+    RG_DEF_METHOD(to_s, 0);
 #endif
 
-    G_DEF_SETTERS(rb_cGdkColor);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }
-