goocanvas 1.0.3 → 1.1.0

data/ext/goocanvas/rbgoocanvaspoints.c

@@ -0,0 +1,88 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
+ *
+ *  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 "rbgoocanvasprivate.h"
+
+#define RG_TARGET_NAMESPACE cCanvasPoints
+#define _SELF(self) RVAL2GOOCANVASPOINTS(self)
+
+static VALUE
+rg_initialize(VALUE self, VALUE num_points)
+{
+    G_INITIALIZE(self, goo_canvas_points_new(NUM2INT(num_points)));
+    return Qnil;
+}
+
+static VALUE
+rg_operator_get(VALUE self, VALUE point)
+{
+    int i;
+    GooCanvasPoints *points;
+
+    i = NUM2INT(point);
+    points = _SELF(self);
+    if ((i < 0) || (i >= points->num_points))
+        rb_raise(rb_eArgError, "invalid point number %d", i);
+    return rb_ary_new3(2,
+                       rb_float_new(points->coords[i * 2]),
+                       rb_float_new(points->coords[i * 2 + 1]));
+}
+
+static VALUE
+rg_operator_set(VALUE self, VALUE point, VALUE new_coords)
+{
+    int i;
+    GooCanvasPoints *points;
+
+    i = NUM2INT(point);
+    points = _SELF(self);
+    if ((i < 0) || (i >= points->num_points))
+        rb_raise(rb_eArgError, "invalid point number %d", i);
+    if (TYPE(new_coords) != T_ARRAY)
+        rb_raise(rb_eArgError, "rb_goo_canvas_points_set should be given an array as new value");
+    if (RARRAY_LEN(new_coords) != 2)
+        rb_raise(rb_eArgError, "rb_goo_canvas_points_set should be given an array of length 2 as new value");
+    points->coords[i*2] = NUM2DBL(RARRAY_PTR(new_coords)[0]);
+    points->coords[i*2+1] = NUM2DBL(RARRAY_PTR(new_coords)[1]);
+    return self;
+}
+
+static VALUE
+rg_num_points(VALUE self)
+{
+    GooCanvasPoints *points;
+
+    points = _SELF(self);
+    return INT2NUM(points->num_points);
+}
+
+void
+Init_goocanvaspoints(VALUE mGoo)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GOO_TYPE_CANVAS_POINTS, "CanvasPoints", mGoo);
+
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_METHOD_OPERATOR("[]", get, 1);
+    RG_DEF_METHOD_OPERATOR("[]=", set, 2);
+    RG_DEF_METHOD(num_points, 0);
+}

data/ext/goocanvas/rbgoocanvaspolyline.c

@@ -1,102 +1,45 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgoocanvaspolyline.c 3426 2008-11-01 14:20:52Z ktou $ */
-/* GooCanvasPolyline and GooCanvasPoints
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
  *
- * 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 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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "rbgoocanvas.h"
+#include "rbgoocanvasprivate.h"
+
+#define RG_TARGET_NAMESPACE cCanvasPolyline
 
 static VALUE
-rb_goo_canvas_polyline_new(VALUE self, VALUE parent, VALUE close_path)
+rg_initialize(VALUE self, VALUE parent, VALUE close_path)
 {
     GooCanvasItem *item;
-    item = goo_canvas_polyline_new(RVAL2GCI(parent), RTEST(close_path), 0, NULL);
+    item = goo_canvas_polyline_new(RVAL2GOOCANVASITEM(parent), RTEST(close_path), 0, NULL);
     RB_GOO_CANVAS_ITEM_INITIALIZE(self, item);
     G_CHILD_ADD(parent, self);
     return Qnil;
 }
 
-static VALUE
-rb_goo_canvas_points_new(VALUE self, VALUE num_points)
-{
-    G_INITIALIZE(self, goo_canvas_points_new(NUM2INT(num_points)));
-    return Qnil;
-}
-
-static VALUE
-rb_goo_canvas_points_get(VALUE self, VALUE point)
-{
-    int i;
-    GooCanvasPoints *points;
-    
-    i = NUM2INT(point);
-    points = RVAL2GCPOINTS(self);
-    if ((i < 0) || (i >= points->num_points))
-        rb_raise(rb_eArgError, "invalid point number %d", i);
-    return rb_ary_new3(2,
-                       rb_float_new(points->coords[i * 2]),
-                       rb_float_new(points->coords[i * 2 + 1]));
-}
-
-static VALUE
-rb_goo_canvas_points_set(VALUE self, VALUE point, VALUE new_coords)
-{
-    int i;
-    GooCanvasPoints *points;
-    
-    i = NUM2INT(point);
-    points = RVAL2GCPOINTS(self);
-    if ((i < 0) || (i >= points->num_points))
-        rb_raise(rb_eArgError, "invalid point number %d", i);
-    if (TYPE(new_coords) != T_ARRAY)
-        rb_raise(rb_eArgError, "rb_goo_canvas_points_set should be given an array as new value");
-    if (RARRAY_LEN(new_coords) != 2)
-        rb_raise(rb_eArgError, "rb_goo_canvas_points_set should be given an array of length 2 as new value");
-    points->coords[i*2] = NUM2DBL(RARRAY_PTR(new_coords)[0]);
-    points->coords[i*2+1] = NUM2DBL(RARRAY_PTR(new_coords)[1]);
-    return self;
-}
-
-static VALUE
-rb_goo_canvas_points_get_num_points(VALUE self)
-{
-    GooCanvasPoints *points;
-    
-    points = RVAL2GCPOINTS(self);
-    return INT2NUM(points->num_points);
-}
-
 void
-Init_goocanvaspolyline(void)
+Init_goocanvaspolyline(VALUE mGoo)
 {
-    VALUE GooCanvasPolyline;
-    VALUE GooCanvasPoints;
+    VALUE RG_TARGET_NAMESPACE;
 
-    GooCanvasPolyline = G_DEF_CLASS(GOO_TYPE_CANVAS_POLYLINE,
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GOO_TYPE_CANVAS_POLYLINE,
                                     "CanvasPolyline", mGoo);
 
-    rb_define_method(GooCanvasPolyline, "initialize",
-                     rb_goo_canvas_polyline_new, 2);
-
-    GooCanvasPoints = G_DEF_CLASS(GOO_TYPE_CANVAS_POINTS, "CanvasPoints", mGoo);
-
-    rb_define_method(GooCanvasPoints, "initialize", rb_goo_canvas_points_new, 1);
-    rb_define_method(GooCanvasPoints, "[]", rb_goo_canvas_points_get, 1);
-    rb_define_method(GooCanvasPoints, "[]=", rb_goo_canvas_points_set, 2);
-    rb_define_method(GooCanvasPoints, "num_points",
-                     rb_goo_canvas_points_get_num_points, 0);
+    RG_DEF_METHOD(initialize, 2);
 }

data/ext/goocanvas/rbgoocanvasprivate.h

@@ -0,0 +1,43 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  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 __RBGOOCANVASPRIVATE_H__
+#define __RBGOOCANVASPRIVATE_H__
+
+#include <rbgdk-pixbuf.h>
+#include "rbgoocanvas.h"
+
+void Init_goocanvas(void); /* Goo::Canvas */
+G_GNUC_INTERNAL void Init_goocanvasitem(VALUE mGoo); /* Goo::CanvasItem */
+G_GNUC_INTERNAL void Init_goocanvastext(VALUE mGoo); /* Goo::CanvasText */
+G_GNUC_INTERNAL void Init_goocanvasrect(VALUE mGoo); /* Goo::CanvasRect */
+G_GNUC_INTERNAL void Init_goocanvasellipse(VALUE mGoo); /* Goo::CanvasEllipse */
+G_GNUC_INTERNAL void Init_goocanvaspolyline(VALUE mGoo); /* Goo::CanvasPolyline */
+G_GNUC_INTERNAL void Init_goocanvaspoints(VALUE mGoo); /* Goo::CanvasPoints */
+G_GNUC_INTERNAL void Init_goocanvasimage(VALUE mGoo); /* Goo::CanvasImage */
+G_GNUC_INTERNAL void Init_goocanvastable(VALUE mGoo); /* Goo::CanvasTable */
+G_GNUC_INTERNAL void Init_goocanvaswidget(VALUE mGoo); /* Goo::CanvasWidget */
+G_GNUC_INTERNAL void Init_goocanvasstyle(VALUE mGoo); /* Goo::CanvasStyle */
+G_GNUC_INTERNAL void Init_goocanvasgroup(VALUE mGoo); /* Goo::CanvasGroup */
+G_GNUC_INTERNAL void Init_goo(void);
+G_GNUC_INTERNAL void Init_goocairopattern(VALUE mCairo);
+G_GNUC_INTERNAL void Init_goocairomatrix(VALUE mCairo);
+
+#endif /* __RBGOOCANVASPRIVATE_H__ */

data/ext/goocanvas/rbgoocanvasrect.c

@@ -1,31 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgoocanvasrect.c 3288 2008-09-13 10:07:44Z ktou $ */
-/* GooCanvasRect
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
  *
- * 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 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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "rbgoocanvas.h"
+#include "rbgoocanvasprivate.h"
+
+#define RG_TARGET_NAMESPACE cCanvasRect
 
 static VALUE
-rb_goo_canvas_rect_new(VALUE self, VALUE parent, VALUE x, VALUE y,
+rg_initialize(VALUE self, VALUE parent, VALUE x, VALUE y,
                        VALUE width, VALUE height)
 {
     GooCanvasItem *item;
-    item = goo_canvas_rect_new(RVAL2GCI(parent),
+    item = goo_canvas_rect_new(RVAL2GOOCANVASITEM(parent),
                                NUM2DBL(x),
                                NUM2DBL(y),
                                NUM2DBL(width),
@@ -37,11 +40,11 @@ rb_goo_canvas_rect_new(VALUE self, VALUE parent, VALUE x, VALUE y,
 }
 
 void
-Init_goocanvasrect(void)
+Init_goocanvasrect(VALUE mGoo)
 {
-    VALUE GooCanvasRect;
+    VALUE RG_TARGET_NAMESPACE;
 
-    GooCanvasRect = G_DEF_CLASS(GOO_TYPE_CANVAS_RECT, "CanvasRect", mGoo);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GOO_TYPE_CANVAS_RECT, "CanvasRect", mGoo);
 
-    rb_define_method(GooCanvasRect, "initialize", rb_goo_canvas_rect_new, 5);
+    RG_DEF_METHOD(initialize, 5);
 }

data/ext/goocanvas/rbgoocanvasstyle.c

@@ -1,27 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgoocanvasstyle.c 3288 2008-09-13 10:07:44Z ktou $ */
-/* GooCanvasStyle
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
  *
- * 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 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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "rbgoocanvas.h"
+#include "rbgoocanvasprivate.h"
+
+#define RG_TARGET_NAMESPACE cCanvasStyle
+#define _SELF(self) RVAL2GOOCANVASSTYLE(self)
 
 static VALUE
-rb_goo_canvas_style_new(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, goo_canvas_style_new());
     return Qnil;
@@ -29,7 +33,7 @@ rb_goo_canvas_style_new(VALUE self)
 
 /* TODO: make it more generic, with maybe some part in Ruby */
 static VALUE
-rb_goo_canvas_style_set_fill_pattern(VALUE self, VALUE value)
+rg_set_fill_pattern(VALUE self, VALUE value)
 {
     GValue gval = {0,};
     cairo_pattern_t *pattern;
@@ -37,7 +41,7 @@ rb_goo_canvas_style_set_fill_pattern(VALUE self, VALUE value)
     g_value_init(&gval, GOO_TYPE_CAIRO_PATTERN);
     pattern = RVAL2CRPATTERN(value);
     g_value_take_boxed(&gval, pattern);
-    goo_canvas_style_set_property(RVAL2GCS(self),
+    goo_canvas_style_set_property(_SELF(self),
                                   goo_canvas_style_fill_pattern_id,
                                   &gval);
     g_value_unset(&gval);
@@ -47,15 +51,14 @@ rb_goo_canvas_style_set_fill_pattern(VALUE self, VALUE value)
 }
 
 void
-Init_goocanvasstyle(void)
+Init_goocanvasstyle(VALUE mGoo)
 {
-    VALUE GooCanvasStyle;
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GOO_TYPE_CANVAS_STYLE, "CanvasStyle", mGoo);
 
-    GooCanvasStyle = G_DEF_CLASS(GOO_TYPE_CANVAS_STYLE, "CanvasStyle", mGoo);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(set_fill_pattern, 1);
 
-    rb_define_method(GooCanvasStyle, "initialize", rb_goo_canvas_style_new, 0);
-    rb_define_method(GooCanvasStyle, "set_fill_pattern",
-                     rb_goo_canvas_style_set_fill_pattern, 1);
-    
-    G_DEF_SETTERS(GooCanvasStyle);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/goocanvas/rbgoocanvastable.c

@@ -1,41 +1,44 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/* $Id: rbgoocanvastable.c 3288 2008-09-13 10:07:44Z ktou $ */
-/* GooCanvasTable
- * Copyright (C) 2007 Vincent Isambart <vincent.isambart@gmail.com>
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007  Vincent Isambart <vincent.isambart@gmail.com>
  *
- * 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 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.
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  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 "rbgoocanvas.h"
+#include "rbgoocanvasprivate.h"
+
+#define RG_TARGET_NAMESPACE cCanvasTable
 
 static VALUE
-rb_goo_canvas_table_new(VALUE self, VALUE parent)
+rg_initialize(VALUE self, VALUE parent)
 {
     GooCanvasItem *item;
-    item = goo_canvas_table_new(RVAL2GCI(parent), NULL);
+    item = goo_canvas_table_new(RVAL2GOOCANVASITEM(parent), NULL);
     RB_GOO_CANVAS_ITEM_INITIALIZE(self, item);
     G_CHILD_ADD(parent, self);
     return Qnil;
 }
 
 void
-Init_goocanvastable(void)
+Init_goocanvastable(VALUE mGoo)
 {
-    VALUE GooCanvasTable;
+    VALUE RG_TARGET_NAMESPACE;
 
-    GooCanvasTable = G_DEF_CLASS(GOO_TYPE_CANVAS_TABLE, "CanvasTable", mGoo);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GOO_TYPE_CANVAS_TABLE, "CanvasTable", mGoo);
 
-    rb_define_method(GooCanvasTable, "initialize", rb_goo_canvas_table_new, 1);
+    RG_DEF_METHOD(initialize, 1);
 }